合并代码

pqs-system/system-api/src/main/java/com/njcn/system/api/DicDataFeignClient.java

@@ -28,15 +28,12 @@ public interface DicDataFeignClient {
     @GetMapping("/getDicDataById")
     HttpResult<DictData> getDicDataById(@RequestParam("dicIndex") String dicIndex);
 
-    @GetMapping("/getDicDataByTypeName")
-    HttpResult<List<DictData>> getDicDataByTypeName(@RequestParam("dictTypeName") String dictTypeName);
-
-    @GetMapping("/getDicDataByTypeCode")
-    HttpResult<List<DictData>> getDicDataByTypeCode(@RequestParam("dictTypeCode") String dictTypeCode);
-
     @GetMapping("/getDicDataByName")
     HttpResult<DictData> getDicDataByName(@RequestParam("dicName") String dicName);
 
+    @GetMapping("/getDicDataByCode")
+    HttpResult<DictData> getDicDataByCode(@RequestParam("code") String code);
+
     @GetMapping("/getLoadTypeBySys")
     HttpResult<List<DictData>> getLoadTypeBySys();
 
@@ -59,4 +56,15 @@ public interface DicDataFeignClient {
      */
     @GetMapping("/getDicDataByNameAndTypeName")
     HttpResult<DictData> getDicDataByNameAndTypeName(@RequestParam("dicTypeName") String dicTypeName, @RequestParam("dicDataName") String dicDataName);
+
+
+
+    /***
+     * 字典类型
+     */
+    @GetMapping("/getDicDataByTypeName")
+    HttpResult<List<DictData>> getDicDataByTypeName(@RequestParam("dictTypeName") String dictTypeName);
+
+    @GetMapping("/getDicDataByTypeCode")
+    HttpResult<List<DictData>> getDicDataByTypeCode(@RequestParam("dictTypeCode") String dictTypeCode);
 }

pqs-system/system-api/src/main/java/com/njcn/system/api/fallback/DicDataFeignClientFallbackFactory.java

@@ -55,6 +55,12 @@ public class DicDataFeignClientFallbackFactory implements FallbackFactory<DicDat
                 throw new BusinessException(finalExceptionEnum);
             }
 
+            @Override
+            public HttpResult<DictData> getDicDataByCode(String code) {
+                log.error("{}异常，降级处理，异常为：{}","根据字典code获取字典数据",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
             @Override
             public HttpResult<List<DictData>> getLoadTypeBySys() {
                 log.error("{}异常，降级处理，异常为：{}","根据系统类型获取不同指标参数",cause.toString());

pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java

@@ -39,6 +39,11 @@ public enum DicDataEnum {
     DEV_QUALITY("电能质量监测终端","Dev_Quality"),
     DEV_SMART("智能电表","Dev_Smart"),
     DEV_MIX("智能融合终端","Dev_Mix"),
+
+    /***
+     * 告警类型
+     */
+    COMM_ERR("通讯异常","Comm_Err")
     ;
 
     private final String name;