合并代码

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;

pqs-system/system-boot/src/main/java/com/njcn/system/controller/DictDataController.java

@@ -162,6 +162,16 @@ public class DictDataController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @GetMapping("/getDicDataByCode")
+    @ApiOperation("根据字典code查询字典数据")
+    @ApiImplicitParam(name = "code", value = "查询参数", required = true)
+    public HttpResult<DictData> getDicDataByCode(@RequestParam("code") String code) {
+        String methodDescribe = getMethodDescribe("getDicDataByCode");
+        DictData result = dictDataService.getDicDataByCode(code);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
     /**
      * 根据系统类型获取不同指标参数
      */

pqs-system/system-boot/src/main/java/com/njcn/system/mapper/DictDataMapper.java

@@ -36,6 +36,7 @@ public interface DictDataMapper extends BaseMapper<DictData> {
 
     DictData getDicDataByName(@Param("dicName")String dicName);
 
+    DictData getDicDataByCode(@Param("code")String code);
     /**
      * 根据字典类型名称&数据名称获取字典数据
      *
@@ -50,4 +51,5 @@ public interface DictDataMapper extends BaseMapper<DictData> {
      * @return 根据字典类型名称查询字典数据
      */
     List<DictData> getDicDataByTypeCode(@Param("dictTypeCode")String dictTypeCode);
+
 }

pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/DictDataMapper.xml

@@ -29,6 +29,13 @@
         WHERE sys_dict_data.name = #{dicName}
     </select>
 
+    <!-- 根据字典名称查询字典数据-->
+    <select id="getDicDataByCode" resultType="DictData">
+        SELECT sys_dict_data.*
+        FROM sys_dict_data sys_dict_data
+        WHERE sys_dict_data.code = #{code}
+    </select>
+
     <select id="getDicDataByNameAndTypeName" resultType="DictData">
         SELECT
             T2.*

pqs-system/system-boot/src/main/java/com/njcn/system/service/IDictDataService.java

@@ -83,6 +83,13 @@ public interface IDictDataService extends IService<DictData> {
      */
     DictData getDicDataByName(String dicName);
 
+    /**
+     *
+     * @param cpde 字典code
+     * @return 根据字典code查询字典数据
+     */
+    DictData getDicDataByCode(String code);
+
     /**
      * 根据系统获取指标参数
      * @return 操作结果
@@ -107,4 +114,5 @@ public interface IDictDataService extends IService<DictData> {
     DictData addDictData(String dicTypeName, String dicDataName);
 
 
+
 }

pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/DictDataServiceImpl.java

@@ -144,6 +144,11 @@ public class DictDataServiceImpl extends ServiceImpl<DictDataMapper, DictData> i
         return this.baseMapper.getDicDataByName(dicName);
     }
 
+    @Override
+    public DictData getDicDataByCode(String code) {
+        return this.baseMapper.getDicDataByCode(code);
+    }
+
     @Override
     public List<DictData> getLoadTypeBySys() {
         List<DictData> list = new ArrayList<>();