文档问题处理

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/TreeDto.java

@@ -34,6 +34,11 @@ public class TreeDto {
     private Integer isOnClick;
 
     /**
+     * 风机首页-配置页面场景ID
+     */
+    private String sceneId;
+
+    /**
      * 子节点
      */
     private List<TreeDto> children;

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resources/mapper/StationBasicMapper.xml

@@ -160,7 +160,8 @@
             sequence_nbr as code,
             station_type as parentCode,
             sequence_nbr as id,
-            '1' as isOnclick
+            '1' as isOnclick,
+            scene_id as sceneId
         from station_basic
         <where>
             <if test="regionCode != null and regionCode != ''">

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitorFanIndicatorImpl.java

@@ -222,6 +222,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         treeDto.setId(String.valueOf(region.getSequenceNbr()));
         treeDto.setParentCode("0");
         treeDto.setIsOnClick(0);
+        treeDto.setSceneId("987654321");
         List<TreeDto> stationListByRegionCode = stationBasicMapper.getStationListByRegionCode(String.valueOf(region.getRegionCode()));
 
 
@@ -230,6 +231,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         fdzTreeDto.setCode("FDZ");
         fdzTreeDto.setParentCode(String.valueOf(region.getRegionCode()));
         fdzTreeDto.setIsOnClick(0);
+        fdzTreeDto.setSceneId("12345678910");
         List<TreeDto> fdz = stationListByRegionCode.stream().filter(t -> t.getParentCode().contains("FDZ") && t.getParentCode().length() < 4).collect(Collectors.toList());
         fdzTreeDto.setChildren(fdz);
 
@@ -238,6 +240,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         gfzTreeDto.setCode("GFZ");
         gfzTreeDto.setParentCode(String.valueOf(region.getRegionCode()));
         gfzTreeDto.setIsOnClick(0);
+        gfzTreeDto.setSceneId("1234567891011");
         List<TreeDto> gfz = stationListByRegionCode.stream().filter(t -> t.getParentCode().contains("GFDZ")).collect(Collectors.toList());
         gfzTreeDto.setChildren(gfz);
         List<TreeDto> treeDtos = Arrays.asList(fdzTreeDto, gfzTreeDto);
@@ -1226,7 +1229,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
             queryCondition.put(CommonConstans.QueryStringSystemTypeKeyword, Arrays.asList("模拟量"));
             List<ESEquipments> esEquipmentsList = commonServiceImpl.getListDataByCondtions(queryCondition, null, ESEquipments.class);
             // 10kVⅡ段母线数据
-            List<ESEquipments> xianData = esEquipmentsList.stream().filter(esEquipments -> esEquipments.getFrontModule().equals("35kVⅠ母PT")).collect(Collectors.toList());
+            List<ESEquipments> xianData = esEquipmentsList.stream().filter(esEquipments -> esEquipments.getFrontModule().contains("35kVⅠ母PT")).collect(Collectors.toList());
             HashMap<String, Object> resultMap = new HashMap<>();
             xianData.forEach(item -> resultMap.put(item.getDisplayName(), keepTwoDecimalPlaces(item.getValueDouble().toString())));
 
@@ -1251,6 +1254,9 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
             List<Map<String, String>> boosterStationInfo = monitorFanIndicatorregionMapper.getMajorBoosterStationInfo(gatewayId, "ASC", 5);
             ArrayList<Map<String, String>> resultList = new ArrayList<>();
             for (Map<String, String> map : boosterStationInfo) {
+                if (map.get("boosterName").equals("35kVⅠ母PT")) {
+                    continue;
+                }
                 List<ESEquipments> listData = esEquipmentsList.stream().filter(esEquipments -> esEquipments.getFrontModule().contains(map.get("boosterName")) && xyxDisplayNameList.contains(esEquipments.getDisplayName())).collect(Collectors.toList());
                 HashMap<String, String> stringStringHashMap = new HashMap<>();
                 stringStringHashMap.put("value1", "0.0");