字典表接口返参调整

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcCoverageCategoryDictListResultDTO.java

@@ -8,7 +8,7 @@ import lombok.Data;
 @Data
 public class IcCoverageCategoryDictListResultDTO {
 
-    private String categoryKey;
-    private String categoryName;
+    private String label;
+    private String value;
 
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcCityManagementExcelImportListener.java

@@ -110,7 +110,7 @@ public class IcCityManagementExcelImportListener implements ReadListener<IcCityM
     private void execPersist() {
         try {
             List<IcCoverageCategoryDictListResultDTO> dictList = coverageService.dictMap(currentCustomerId, "city_management");
-            Map<String, String> dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getCategoryKey, IcCoverageCategoryDictListResultDTO::getCategoryName));
+            Map<String, String> dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getValue, IcCoverageCategoryDictListResultDTO::getLabel));
             datas.forEach(d -> {
                 d.setCategory(dictMap.get(d.getCategory()));
             });

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcPublicServiceExcelImportListener.java

@@ -110,7 +110,7 @@ public class IcPublicServiceExcelImportListener implements ReadListener<IcPublic
     private void execPersist() {
         try {
             List<IcCoverageCategoryDictListResultDTO> dictList = coverageService.dictMap(currentCustomerId, "public_service");
-            Map<String, String> dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getCategoryKey, IcCoverageCategoryDictListResultDTO::getCategoryName));
+            Map<String, String> dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getValue, IcCoverageCategoryDictListResultDTO::getLabel));
             datas.forEach(d -> {
                 d.setCategory(dictMap.get(d.getCategory()));
             });

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcSuperiorResourceExcelImportListener.java

@@ -112,7 +112,7 @@ public class IcSuperiorResourceExcelImportListener implements ReadListener<IcSup
     private void execPersist() {
         try {
             List<IcCoverageCategoryDictListResultDTO> dictList = coverageService.dictMap(currentCustomerId, "superior_resource");
-            Map<String, String> dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getCategoryKey, IcCoverageCategoryDictListResultDTO::getCategoryName));
+            Map<String, String> dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getValue, IcCoverageCategoryDictListResultDTO::getLabel));
             datas.forEach(d -> {
                 d.setCategory(dictMap.get(d.getCategory()));
             });

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/DangerousChemicalsImportListener.java

@@ -124,7 +124,7 @@ public class DangerousChemicalsImportListener extends AnalysisEventListener<Dang
                 Map<String, String> statusMap = statusRes.success() && MapUtils.isNotEmpty(statusRes.getData()) ? statusRes.getData() : new HashMap<>(16);
                 //企业类别字典数据
                 List<IcCoverageCategoryDictListResultDTO> dictList = coverageService.dictMap(agencyInfo.getCustomerId(), "dangerous_chemicals");
-                Map<String, String> dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getCategoryKey, IcCoverageCategoryDictListResultDTO::getCategoryName));
+                Map<String, String> dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getLabel, IcCoverageCategoryDictListResultDTO::getValue));
                 insertList.forEach(i -> {
                     statusMap.forEach((k,v) -> {
                         if (i.getDangerTypeName().equals(v)){

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcCityManagementServiceImpl.java

@@ -91,7 +91,7 @@ public class IcCityManagementServiceImpl extends BaseServiceImpl<IcCityManagemen
         //封装类别数据
         if (!CollectionUtils.isEmpty(list)) {
             List<IcCoverageCategoryDictListResultDTO> dictList = coverageService.dictMap(formDTO.getCustomerId(), "city_management");
-            Map<String, String> dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getCategoryKey, IcCoverageCategoryDictListResultDTO::getCategoryName));
+            Map<String, String> dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getLabel, IcCoverageCategoryDictListResultDTO::getValue));
             for (IcCityManagementListResultDTO v : list) {
                 if (StringUtils.isNotBlank(v.getCategory())) {
                     v.setCategoryName(dictMap.get(v.getCategory()));
@@ -181,7 +181,7 @@ public class IcCityManagementServiceImpl extends BaseServiceImpl<IcCityManagemen
         //封装类别数据
         if (!CollectionUtils.isEmpty(list)) {
             List<IcCoverageCategoryDictListResultDTO> dictList = coverageService.dictMap(formDTO.getCustomerId(), "city_management");
-            Map<String, String> dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getCategoryKey, IcCoverageCategoryDictListResultDTO::getCategoryName));
+            Map<String, String> dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getLabel, IcCoverageCategoryDictListResultDTO::getValue));
             for (IcCityManagementListResultDTO v : list) {
                 if (StringUtils.isNotBlank(v.getCategory())) {
                     v.setCategoryName(dictMap.get(v.getCategory()));

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java

@@ -102,7 +102,7 @@ public class IcDangerousChemicalsServiceImpl extends BaseServiceImpl<IcDangerous
             Map<String, String> statusMap = statusRes.success() && MapUtils.isNotEmpty(statusRes.getData()) ? statusRes.getData() : new HashMap<>();
             //企业类别字典数据
             List<IcCoverageCategoryDictListResultDTO> dictList = coverageService.dictMap(formDTO.getCustomerId(), "city_management");
-            Map<String, String> dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getCategoryKey, IcCoverageCategoryDictListResultDTO::getCategoryName));
+            Map<String, String> dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getLabel, IcCoverageCategoryDictListResultDTO::getValue));
             for (IcDangerousChemicalsListResultDTO v : list) {
                 if (StringUtils.isNotBlank(v.getCategory())) {
                     v.setCategoryName(dictMap.get(v.getCategory()));
@@ -199,7 +199,7 @@ public class IcDangerousChemicalsServiceImpl extends BaseServiceImpl<IcDangerous
             Map<String, String> statusMap = statusRes.success() && MapUtils.isNotEmpty(statusRes.getData()) ? statusRes.getData() : new HashMap<>();
             //企业类别字典数据
             List<IcCoverageCategoryDictListResultDTO> dictList = coverageService.dictMap(formDTO.getCustomerId(), "city_management");
-            Map<String, String> dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getCategoryKey, IcCoverageCategoryDictListResultDTO::getCategoryName));
+            Map<String, String> dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getLabel, IcCoverageCategoryDictListResultDTO::getValue));
             for (IcDangerousChemicalsListResultDTO v : list) {
                 if (StringUtils.isNotBlank(v.getCategory())) {
                     v.setCategoryName(dictMap.get(v.getCategory()));

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPublicServiceServiceImpl.java

@@ -91,7 +91,7 @@ public class IcPublicServiceServiceImpl extends BaseServiceImpl<IcPublicServiceD
         //封装类别数据
         if (!CollectionUtils.isEmpty(list)) {
             List<IcCoverageCategoryDictListResultDTO> dictList = coverageService.dictMap(formDTO.getCustomerId(), "public_service");
-            Map<String, String> dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getCategoryKey, IcCoverageCategoryDictListResultDTO::getCategoryName));
+            Map<String, String> dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getLabel, IcCoverageCategoryDictListResultDTO::getValue));
             for (IcPublicServiceListResultDTO v : list) {
                 if (StringUtils.isNotBlank(v.getCategory())) {
                     v.setCategoryName(dictMap.get(v.getCategory()));
@@ -181,7 +181,7 @@ public class IcPublicServiceServiceImpl extends BaseServiceImpl<IcPublicServiceD
         //封装类别数据
         if (!CollectionUtils.isEmpty(list)) {
             List<IcCoverageCategoryDictListResultDTO> dictList = coverageService.dictMap(formDTO.getCustomerId(), "public_service");
-            Map<String, String> dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getCategoryKey, IcCoverageCategoryDictListResultDTO::getCategoryName));
+            Map<String, String> dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getLabel, IcCoverageCategoryDictListResultDTO::getValue));
             for (IcPublicServiceListResultDTO v : list) {
                 if (StringUtils.isNotBlank(v.getCategory())) {
                     v.setCategoryName(dictMap.get(v.getCategory()));

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcSuperiorResourceServiceImpl.java

@@ -91,7 +91,7 @@ public class IcSuperiorResourceServiceImpl extends BaseServiceImpl<IcSuperiorRes
         //封装类别数据
         if (!CollectionUtils.isEmpty(list)) {
             List<IcCoverageCategoryDictListResultDTO> dictList = coverageService.dictMap(formDTO.getCustomerId(), "superior_resource");
-            Map<String, String> dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getCategoryKey, IcCoverageCategoryDictListResultDTO::getCategoryName));
+            Map<String, String> dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getLabel, IcCoverageCategoryDictListResultDTO::getValue));
             for (IcSuperiorResourceListResultDTO v : list) {
                 if (StringUtils.isNotBlank(v.getCategory())) {
                     v.setCategoryName(dictMap.get(v.getCategory()));
@@ -181,7 +181,7 @@ public class IcSuperiorResourceServiceImpl extends BaseServiceImpl<IcSuperiorRes
         //封装类别数据
         if (!CollectionUtils.isEmpty(list)) {
             List<IcCoverageCategoryDictListResultDTO> dictList = coverageService.dictMap(formDTO.getCustomerId(), "superior_resource");
-            Map<String, String> dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getCategoryKey, IcCoverageCategoryDictListResultDTO::getCategoryName));
+            Map<String, String> dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getLabel, IcCoverageCategoryDictListResultDTO::getValue));
             for (IcSuperiorResourceListResultDTO v : list) {
                 if (StringUtils.isNotBlank(v.getCategory())) {
                     v.setCategoryName(dictMap.get(v.getCategory()));

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCoverageCategoryDictDao.xml

@@ -6,8 +6,8 @@
 
     <select id="dictMap" resultType="com.epmet.dto.result.IcCoverageCategoryDictListResultDTO">
         SELECT
-            category_key categoryKey,
-            category_name categoryName
+            category_key label,
+            category_name value
         FROM
             ic_coverage_category_dict
         WHERE