From cb1569cffd54edb9b0f6d7c36978d875a00b04df Mon Sep 17 00:00:00 2001 From: hongawen <83944980@qq.com> Date: Thu, 13 Oct 2022 19:42:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8C=89=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E7=B1=BB=E5=9E=8Bcode=E6=9F=A5=E8=AF=A2=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/njcn/system/api/DicDataFeignClient.java | 3 +++ .../fallback/DicDataFeignClientFallbackFactory.java | 6 ++++++ .../java/com/njcn/system/enums/DicDataTypeEnum.java | 4 +++- .../njcn/system/controller/DictDataController.java | 11 +++++++++++ .../java/com/njcn/system/mapper/DictDataMapper.java | 6 ++++++ .../com/njcn/system/mapper/mapping/DictDataMapper.xml | 10 ++++++++++ .../com/njcn/system/service/IDictDataService.java | 8 ++++++++ .../njcn/system/service/impl/DictDataServiceImpl.java | 5 +++++ 8 files changed, 52 insertions(+), 1 deletion(-) diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/api/DicDataFeignClient.java b/pqs-system/system-api/src/main/java/com/njcn/system/api/DicDataFeignClient.java index 64952535c..6a8a87def 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/api/DicDataFeignClient.java +++ b/pqs-system/system-api/src/main/java/com/njcn/system/api/DicDataFeignClient.java @@ -31,6 +31,9 @@ public interface DicDataFeignClient { @GetMapping("/getDicDataByTypeName") HttpResult> getDicDataByTypeName(@RequestParam("dictTypeName") String dictTypeName); + @GetMapping("/getDicDataByTypeCode") + HttpResult> getDicDataByTypeCode(@RequestParam("dictTypeCode") String dictTypeCode); + @GetMapping("/getDicDataByName") HttpResult getDicDataByName(@RequestParam("dicName") String dicName); diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/api/fallback/DicDataFeignClientFallbackFactory.java b/pqs-system/system-api/src/main/java/com/njcn/system/api/fallback/DicDataFeignClientFallbackFactory.java index 49ff568f9..d4608d8d5 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/api/fallback/DicDataFeignClientFallbackFactory.java +++ b/pqs-system/system-api/src/main/java/com/njcn/system/api/fallback/DicDataFeignClientFallbackFactory.java @@ -43,6 +43,12 @@ public class DicDataFeignClientFallbackFactory implements FallbackFactory> getDicDataByTypeCode(String dictTypeCode) { + log.error("{}异常，降级处理，异常为：{}","根据字典类型code获取字典数据集合",cause.toString()); + throw new BusinessException(finalExceptionEnum); + } + @Override public HttpResult getDicDataByName(String dicName) { log.error("{}异常，降级处理，异常为：{}","根据字典名称获取字典数据",cause.toString()); diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataTypeEnum.java b/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataTypeEnum.java index 27089d7c2..414051eea 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataTypeEnum.java +++ b/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") ; diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/DictDataController.java b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/DictDataController.java index 497df0248..0e00243a0 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/DictDataController.java +++ b/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> getDicDataByTypeCode(@RequestParam("dictTypeCode") String dictTypeCode) { + String methodDescribe = getMethodDescribe("getDicDataByTypeCode"); + List result = dictDataService.getDicDataByTypeCode(dictTypeCode); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + } + } diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/DictDataMapper.java b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/DictDataMapper.java index f5b724cc9..b9532d743 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/DictDataMapper.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/DictDataMapper.java @@ -44,4 +44,10 @@ public interface DictDataMapper extends BaseMapper { * @return 字典数据 */ DictData getDicDataByNameAndTypeName(@Param("dicTypeName")String dicTypeName, @Param("dicDataName")String dicDataName); + + /** + * @param dictTypeCode 字典类型名称 + * @return 根据字典类型名称查询字典数据 + */ + List getDicDataByTypeCode(@Param("dictTypeCode")String dictTypeCode); } diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/DictDataMapper.xml b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/DictDataMapper.xml index 8a5686862..33f3a4844 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/DictDataMapper.xml +++ b/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} + + + diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/IDictDataService.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/IDictDataService.java index 3fec09e81..4960731e1 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/IDictDataService.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/IDictDataService.java @@ -69,6 +69,13 @@ public interface IDictDataService extends IService { */ List getDicDataByTypeName(String dictypeName); + /** + * + * @param dictTypeCode 字典类型code + * @return 根据字典类型名称查询字典数据 + */ + List getDicDataByTypeCode(String dictTypeCode); + /** * * @param dicName 字典名称 @@ -99,4 +106,5 @@ public interface IDictDataService extends IService { */ DictData addDictData(String dicTypeName, String dicDataName); + } diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/DictDataServiceImpl.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/DictDataServiceImpl.java index 977ec8228..29f79eddc 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/DictDataServiceImpl.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/DictDataServiceImpl.java @@ -134,6 +134,11 @@ public class DictDataServiceImpl extends ServiceImpl i return this.baseMapper.getDicDataByTypeName(dictTypeName); } + @Override + public List getDicDataByTypeCode(String dictTypeCode) { + return this.baseMapper.getDicDataByTypeCode(dictTypeCode); + } + @Override public DictData getDicDataByName(String dicName) { return this.baseMapper.getDicDataByName(dicName);