添加按字典类型code查询字典数据

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

@@ -31,6 +31,9 @@ public interface DicDataFeignClient {
     @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);
 

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

@@ -43,6 +43,12 @@ public class DicDataFeignClientFallbackFactory implements FallbackFactory<DicDat
                 throw new BusinessException(finalExceptionEnum);
             }
 
+            @Override
+            public HttpResult<List<DictData>> getDicDataByTypeCode(String dictTypeCode) {
+                log.error("{}异常，降级处理，异常为：{}","根据字典类型code获取字典数据集合",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
             @Override
             public HttpResult<DictData> getDicDataByName(String dicName) {
                 log.error("{}异常，降级处理，异常为：{}","根据字典名称获取字典数据",cause.toString());

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

@@ -36,7 +36,9 @@ public enum DicDataTypeEnum {
     ELE_STATISTICAL_TYPE("用能统计类型","Ele_Statistical_Type"),
     REPORT_TYPE("自定义报表类型","Report_Type"),
     LINE_MARK("监测点评分等级","Line_Grade"),
-    LINE_TYPE("监测点类型","Line_Type")
+    LINE_TYPE("监测点类型","Line_Type"),
+    STEADY_STATIS("稳态指标","Steady_Statis"),
+    EVENT_STATIS("暂态指标","Event_Statis")
     ;
 
 

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

@@ -208,6 +208,17 @@ public class DictDataController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, dictDataService.getDicDataByNameAndTypeName(dicTypeName,dicDataName), methodDescribe);
     }
 
+    @ApiIgnore
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @GetMapping("/getDicDataByTypeCode")
+    @ApiOperation("根据字典类型code查询字典数据")
+    @ApiImplicitParam(name = "dictTypeCode", value = "查询参数", required = true)
+    public HttpResult<List<DictData>> getDicDataByTypeCode(@RequestParam("dictTypeCode") String dictTypeCode) {
+        String methodDescribe = getMethodDescribe("getDicDataByTypeCode");
+        List<DictData> result = dictDataService.getDicDataByTypeCode(dictTypeCode);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
 
 }
 

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

@@ -44,4 +44,10 @@ public interface DictDataMapper extends BaseMapper<DictData> {
      * @return 字典数据
      */
     DictData getDicDataByNameAndTypeName(@Param("dicTypeName")String dicTypeName, @Param("dicDataName")String dicDataName);
+
+    /**
+     * @param dictTypeCode 字典类型名称
+     * @return 根据字典类型名称查询字典数据
+     */
+    List<DictData> getDicDataByTypeCode(@Param("dictTypeCode")String dictTypeCode);
 }

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

@@ -42,4 +42,14 @@
           AND t1.NAME = #{dicTypeName}
           AND t2.NAME = #{dicDataName}
     </select>
+
+    <!-- 根据字典类型名称查询字典数据-->
+    <select id="getDicDataByTypeCode" resultType="DictData">
+        SELECT sys_dict_data.*
+        FROM sys_dict_data sys_dict_data,
+             sys_dict_type sys_dict_type
+        WHERE sys_dict_data.type_id = sys_dict_type.id
+          AND sys_dict_type.code = #{dictTypeCode}
+        order by sort
+    </select>
 </mapper>

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

@@ -69,6 +69,13 @@ public interface IDictDataService extends IService<DictData> {
      */
     List<DictData> getDicDataByTypeName(String dictypeName);
 
+    /**
+     *
+     * @param dictTypeCode 字典类型code
+     * @return 根据字典类型名称查询字典数据
+     */
+    List<DictData> getDicDataByTypeCode(String dictTypeCode);
+
     /**
      *
      * @param dicName 字典名称
@@ -99,4 +106,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

@@ -134,6 +134,11 @@ public class DictDataServiceImpl extends ServiceImpl<DictDataMapper, DictData> i
         return this.baseMapper.getDicDataByTypeName(dictTypeName);
     }
 
+    @Override
+    public List<DictData> getDicDataByTypeCode(String dictTypeCode) {
+        return this.baseMapper.getDicDataByTypeCode(dictTypeCode);
+    }
+
     @Override
     public DictData getDicDataByName(String dicName) {
         return this.baseMapper.getDicDataByName(dicName);