加密断面字典字段处理

src/main/java/com/tofly/river/common/GlobalConstantTypeEnum.java

@@ -65,6 +65,7 @@ public enum GlobalConstantTypeEnum {
     AQUATIC("AQUATIC","水产"),
     AQUATIC_TYPE("AQUATIC_TYPE","水产种类"),
     INLINE_ENTERPRISE("INLINE_ENTERPRISE","直排企业"),
+    ENCRYPT_SECTION("ENCRYPT_SECTION","加密断面"),
 
     ;
     private String code;

src/main/java/com/tofly/river/service/data/impl/DictionaryBaseInfoServiceImpl.java

@@ -1739,6 +1739,15 @@ public class DictionaryBaseInfoServiceImpl implements IDictionaryBaseInfoService
                 addDictionaryList(addList, v, codeMap, vo);
 
             }
+            // 加墨断面
+            if (GlobalConstantTypeEnum.ENCRYPT_SECTION.getCode().equals(k)) {
+                Map<String, String> codeMap = globalConstantTypeEnumMap.get(GlobalConstantTypeEnum.ENCRYPT_SECTION.getCode());
+                DictionaryBaseInfoVo vo = new DictionaryBaseInfoVo();
+                vo.setDictionaryTypeCode(GlobalConstantTypeEnum.ENCRYPT_SECTION.getCode());
+                vo.setDictionaryTypeName(GlobalConstantTypeEnum.getNameForValue(GlobalConstantTypeEnum.ENCRYPT_SECTION.getCode()));
+                addDictionaryList(addList, v, codeMap, vo);
+
+            }
 
         });
         if (addList.size() > 0) {

src/main/java/com/tofly/river/service/data/impl/EncryptSectionBaseInfoImpl.java

@@ -67,7 +67,7 @@ public class EncryptSectionBaseInfoImpl extends ServiceImpl<EncryptSectionBaseIn
         infoList.forEach(encryptSectionBaseInfo -> {
                     EncryptSectionBaseInfoVo encryptSectionBaseInfoVo = JSON.parseObject(JSON.toJSONString(encryptSectionBaseInfo), EncryptSectionBaseInfoVo.class);
                     encryptSectionBaseInfoVo.setRiverName(globalConstantTypeEnumMap.get(GlobalConstantTypeEnum.RIVER.getCode()).get(encryptSectionBaseInfo.getRiverCode()));
-                    encryptSectionBaseInfoVo.setSectionName(globalConstantTypeEnumMap.get(GlobalConstantTypeEnum.SECTION.getCode()).get(encryptSectionBaseInfo.getSectionCode()));
+                    encryptSectionBaseInfoVo.setSectionName(globalConstantTypeEnumMap.get(GlobalConstantTypeEnum.ENCRYPT_SECTION.getCode()).get(encryptSectionBaseInfo.getSectionCode()));
                     encryptSectionBaseInfoVo.setSectionType(globalConstantTypeEnumMap.get(GlobalConstantTypeEnum.SECTION_TYPE.getCode()).get(encryptSectionBaseInfo.getSectionType()));
                     String province = regionNameCodeMap.get(encryptSectionBaseInfo.getProvince()) == null ? "" : regionNameCodeMap.get(encryptSectionBaseInfo.getProvince());
                     String city = regionNameCodeMap.get(encryptSectionBaseInfo.getCity()) == null ? "" : regionNameCodeMap.get(encryptSectionBaseInfo.getCity());
@@ -86,10 +86,10 @@ public class EncryptSectionBaseInfoImpl extends ServiceImpl<EncryptSectionBaseIn
     public void indexUpdate(List<EncryptSectionBaseInfo> infoList) {
         Map<String, List<String>> indexMap = new HashMap<>(12);
         List<String> codeList = infoList.stream().map(EncryptSectionBaseInfo::getSectionCode).collect(Collectors.toList());
-        indexMap.put(GlobalConstantTypeEnum.SECTION.getCode(), codeList);
+        indexMap.put(GlobalConstantTypeEnum.ENCRYPT_SECTION.getCode(), codeList);
         log.info("断面数据索引更新 list= {} ", JSON.toJSONString(codeList));
         iDictionaryBaseInfoService.indexUpdate(indexMap);
-        Map<String, String> stringMap = iDictionaryBaseInfoService.getGlobalConstantTypeEnumMap().get(GlobalConstantTypeEnum.SECTION.getCode()).entrySet().stream().collect(Collectors.toMap(Map.Entry::getValue, Map.Entry::getKey));
+        Map<String, String> stringMap = iDictionaryBaseInfoService.getGlobalConstantTypeEnumMap().get(GlobalConstantTypeEnum.ENCRYPT_SECTION.getCode()).entrySet().stream().collect(Collectors.toMap(Map.Entry::getValue, Map.Entry::getKey));
         ;
         infoList.forEach(info -> {
             String code = info.getSectionCode();

src/main/java/com/tofly/river/service/monitor/impl/EncryptSectionMonitorInfoServiceImpl.java

@@ -65,11 +65,11 @@ public class EncryptSectionMonitorInfoServiceImpl extends ServiceImpl<EncryptSec
     public List<EncryptSectionMonitorInfoVo> viewConversion(List<EncryptSectionMonitorInfo> infoList) {
         List<EncryptSectionMonitorInfoVo> infoVoList = new ArrayList<>();
         Map<String, Map<String, String>> globalConstantTypeEnumMap = iDictionaryBaseInfoService.getGlobalConstantTypeEnumMap();
-        // 需要添加(河流名称/断面名称/监测名称) 转换(断面类型/实测类型/是否达标/主要超标项目/数据来源)
+        // 需要添加(河流名称/加密断面名称/监测名称) 转换(断面类型/实测类型/是否达标/主要超标项目/数据来源)
         infoList.forEach(info -> {
             EncryptSectionMonitorInfoVo baseInfoVo = JSON.parseObject(JSON.toJSONString(info), EncryptSectionMonitorInfoVo.class);
             baseInfoVo.setRiverName(globalConstantTypeEnumMap.get(GlobalConstantTypeEnum.RIVER.getCode()).get(info.getRiverCode()));
-            baseInfoVo.setSectionName(globalConstantTypeEnumMap.get(GlobalConstantTypeEnum.SECTION.getCode()).get(info.getSectionCode()));
+            baseInfoVo.setSectionName(globalConstantTypeEnumMap.get(GlobalConstantTypeEnum.ENCRYPT_SECTION.getCode()).get(info.getSectionCode()));
             baseInfoVo.setMonitorSiteName(globalConstantTypeEnumMap.get(GlobalConstantTypeEnum.MONITOR_SITE.getCode()).get(info.getMonitorSiteCode()));
 
             baseInfoVo.setSectionType(globalConstantTypeEnumMap.get(GlobalConstantTypeEnum.SECTION_TYPE.getCode()).get(info.getSectionType()));