1.调整pms国网主配网监测点功能

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

@@ -540,6 +540,17 @@ public enum DicDataEnum {
     ELECTRIFIED_RAILWAY("电气化铁路","1300"),
 
 
+    /**
+     * 所属站别类型
+     */
+    Trans_Sub("变电站","Trans_Sub"),
+    Converter("换流站","Converter"),
+    Ele_Railways("电气化铁路","Ele_Railways"),
+    Wind_Farms("风电场","Wind_Farms"),
+    Power_Station("光伏电站","Power_Station"),
+    Smelting_Load("冶炼负荷","Smelting_Load"),
+    Imp_Users("重要敏感用户","Imp_Users"),
+    Station_Other("其他","Other"),
 
 
 
@@ -562,7 +573,8 @@ public enum DicDataEnum {
     DicDataEnum(String name, String code) {
         this.name = name;
         this.code = code;
-        this.value = null;
+        this.value =
+                null;
     }
 
     public static DicDataEnum getDicDataEnumValue(String code) {

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

@@ -105,6 +105,8 @@ public enum DicDataTypeEnum {
     file_type("附件分类"," file_type"),
     problem_level_type("问题等级"," problem_level_type"),
 
+    Station_Type("所属站别类型","Station_Type"),
+
 
     APP_BASE_INFORMATION_TYPE("app基础信息类型","appInformationType"),
 

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

@@ -0,0 +1,43 @@
+package com.njcn.system.enums;
+
+import lombok.Getter;
+
+
+/**
+ *
+ * @author cdf
+ * @date 2024/2/23
+ */
+@Getter
+public enum DicTreeEnum {
+    /**
+     * 字典树
+     */
+    Trans_Sub("各类重要变电站","2100"),
+    Converter("换流站","1200"),
+    Ele_Railways("电气化铁路","1300"),
+    Wind_Farms("风电场","1401"),
+    Power_Station("光伏电站","1402"),
+    Smelting_Load("冶炼负荷","2600"),
+    Imp_Users("敏感/重要/高危用户","2400"),
+
+
+
+
+
+            ;
+
+
+
+
+
+    private final String name;
+    private final String code;
+
+
+    DicTreeEnum(String name, String code){
+        this.name=name;
+        this.code=code;
+    }
+
+}

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

@@ -67,7 +67,7 @@ public class SysDicTreePOServiceImpl extends ServiceImpl<SysDicTreePOMapper, Sys
             collect = resultList.stream().map(temp -> {
                 DictTreeVO resultVO = new DictTreeVO();
                 BeanUtils.copyProperties(temp, resultVO);
-                resultVO.setPname(byId.getName());
+                resultVO.setPname(Objects.nonNull(byId)?byId.getName():"最高级");
                 return resultVO;
             }).collect(Collectors.toList());
         }