1.运行监盘首页装机容量接口调整。

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

@@ -953,9 +953,8 @@ public class MonitoringServiceImpl {
 
         List<StationBasic> stationBasicListAll = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().isNotNull("fan_gateway_id"));
         List<StationBasic> fdzList = stationBasicListAll.stream().filter(stationBasic -> stationBasic.getStationType().equals("FDZ")).collect(Collectors.toList());
-        List<StationBasic> jzsgfdzList = stationBasicListAll.stream().filter(stationBasic -> stationBasic.getStationType().equals("JZSGFDZ")).collect(Collectors.toList());
-        List<StationBasic> fbsgfdzList = stationBasicListAll.stream().filter(stationBasic -> stationBasic.getStationType().equals("FBSGFDZ")).collect(Collectors.toList());
-        List<StationBasic> gfList = stationBasicListAll.stream().filter(stationBasic -> !stationBasic.getStationType().equals("FDZ")).collect(Collectors.toList());
+        List<StationBasic> gfList = stationBasicListAll.stream().filter(stationBasic -> stationBasic.getStationType().contains("GFDZ")).collect(Collectors.toList());
+        List<StationBasic> cnList = stationBasicListAll.stream().filter(stationBasic -> stationBasic.getStationType().equals("CNDZ")).collect(Collectors.toList());
         Page<HashMap<String, String>> page = new Page<>(1, 10);
         Page<HashMap<String, String>> page1 = new Page<>(1, 10);
         Page<HashMap<String, String>> page2 = new Page<>(1, 10);
@@ -974,17 +973,17 @@ public class MonitoringServiceImpl {
         stringHashMap1.put("title", fdzInstall.toString());
         stringHashMap1.put("data", String.valueOf(fdzList.size()));
         list.add(stringHashMap1);
-        //集中式光伏电站
+        //光伏电站
         HashMap<String, String> stringHashMap2 = new HashMap<>();
-        BigDecimal jzsInstall = new BigDecimal(getInstallCapity(jzsgfdzList));
+        BigDecimal jzsInstall = new BigDecimal(getInstallCapity(gfList));
         stringHashMap2.put("title", jzsInstall.toString());
-        stringHashMap2.put("data", String.valueOf(jzsgfdzList.size()));
+        stringHashMap2.put("data", String.valueOf(gfList.size()));
         list.add(stringHashMap2);
-        //分布式光伏电站
+        //储能站
         HashMap<String, String> stringHashMap3 = new HashMap<>();
-        BigDecimal fbsInstall = new BigDecimal(getInstallCapity(fbsgfdzList));
+        BigDecimal fbsInstall = new BigDecimal(getInstallCapity(cnList));
         stringHashMap3.put("title", fbsInstall.toString());
-        stringHashMap3.put("data", String.valueOf(fbsgfdzList.size()));
+        stringHashMap3.put("data", String.valueOf(cnList.size()));
         list.add(stringHashMap3);
         page.setRecords(list);
         BigDecimal gfInstall = new BigDecimal(getInstallCapity(gfList));