运行监盘未处理问题处理

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/initdata/StationCacheDataInit.java

@@ -43,34 +43,34 @@ public class StationCacheDataInit implements CommandLineRunner {
     Logger logger = LoggerFactory.getLogger(StationCacheDataInit.class);
 
     public void run(String... args) throws Exception {
-//        List<StationCacheInfoDto> stationCacheInfoDtos = new ArrayList<>();
-//        redisTemplate.delete("station_info_cache");
-//        List<Region> regionList = regionMapper.selectList(new QueryWrapper<Region>().eq("LEVEL", 1));
-//        List<MapRegion> mapRegionList = mapRegionMapper.selectList(new QueryWrapper<MapRegion>().isNotNull("name"));
-//        List<StationBasic> stationBasicList = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().isNotNull("belong_area").isNotNull("fan_gateway_id"));
-//        stationBasicList.forEach(stationBasic -> {
-//            StationCacheInfoDto stationCacheInfoDto = new StationCacheInfoDto();
-//            stationCacheInfoDto.setStationId(stationBasic.getSequenceNbr().toString());
-//            stationCacheInfoDto.setStationName(stationBasic.getStationName());
-//            stationCacheInfoDto.setStationType(stationBasic.getStationType());
-//            stationCacheInfoDto.setBelongProvince(regionList.stream().filter(region -> region.getRegionCode().toString().equals(stationBasic.getBelongArea().replace("[", "").split(",")[0])).map(region -> region.getRegionName()).collect(Collectors.toList()).get(0));
-//            stationCacheInfoDto.setBelongArea(mapRegionList.stream().filter(mapRegion -> mapRegion.getProvince().contains(stationCacheInfoDto.getBelongProvince().substring(0, 2)) || mapRegion.getProvince().contains(stationCacheInfoDto.getBelongProvince().substring(0, 3))).map(mapRegion -> mapRegion.getName()).collect(Collectors.toList()).get(0));
-//            stationCacheInfoDto.setInstalledCapacity(String.format("%.2f", sjglZsjZsbtzMapper.getStationCapactityByStationWerks(stationBasic.getStationNumber())));
-//            try {
-//                List<QueryDto> queryDtoList = new ArrayList<>();
-//                queryDtoList.add(new QueryDto("gatewayId", stationBasic.getFanGatewayId()));
-//                queryDtoList.add(new QueryDto("equipmentIndexName.keyword", "有功功率"));
-//                if (!stationBasic.getStationType().equals("FDZ")) {
-//                    queryDtoList.add(new QueryDto("frontModule", "逆变器"));
-//                }
-//                stationCacheInfoDto.setEquipmentNumbers(commonServiceImpl.getCount(queryDtoList, "equipmentNumber.Keyword", ESEquipments.class).toString());
-//            } catch (Exception exception) {
-//              logger.info("--------------------查询ES错误---------------------------");
-//            }
-//            stationCacheInfoDto.setFanGatewayId(stationBasic.getFanGatewayId());
-//            stationCacheInfoDto.setBoosterGatewayId(stationBasic.getBoosterGatewayId());
-//            stationCacheInfoDtos.add(stationCacheInfoDto);
-//        });
-//        redisTemplate.opsForList().leftPushAll("station_info_cache", stationCacheInfoDtos);
+        List<StationCacheInfoDto> stationCacheInfoDtos = new ArrayList<>();
+        redisTemplate.delete("station_info_cache");
+        List<Region> regionList = regionMapper.selectList(new QueryWrapper<Region>().eq("LEVEL", 1));
+        List<MapRegion> mapRegionList = mapRegionMapper.selectList(new QueryWrapper<MapRegion>().isNotNull("name"));
+        List<StationBasic> stationBasicList = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().isNotNull("belong_area").isNotNull("fan_gateway_id"));
+        stationBasicList.forEach(stationBasic -> {
+            StationCacheInfoDto stationCacheInfoDto = new StationCacheInfoDto();
+            stationCacheInfoDto.setStationId(stationBasic.getSequenceNbr().toString());
+            stationCacheInfoDto.setStationName(stationBasic.getStationName());
+            stationCacheInfoDto.setStationType(stationBasic.getStationType());
+            stationCacheInfoDto.setBelongProvince(regionList.stream().filter(region -> region.getRegionCode().toString().equals(stationBasic.getBelongArea().replace("[", "").split(",")[0])).map(region -> region.getRegionName()).collect(Collectors.toList()).get(0));
+            stationCacheInfoDto.setBelongArea(mapRegionList.stream().filter(mapRegion -> mapRegion.getProvince().contains(stationCacheInfoDto.getBelongProvince().substring(0, 2)) || mapRegion.getProvince().contains(stationCacheInfoDto.getBelongProvince().substring(0, 3))).map(mapRegion -> mapRegion.getName()).collect(Collectors.toList()).get(0));
+            stationCacheInfoDto.setInstalledCapacity(String.format("%.2f", sjglZsjZsbtzMapper.getStationCapactityByStationWerks(stationBasic.getStationNumber())));
+            try {
+                List<QueryDto> queryDtoList = new ArrayList<>();
+                queryDtoList.add(new QueryDto("gatewayId", stationBasic.getFanGatewayId()));
+                queryDtoList.add(new QueryDto("equipmentIndexName.keyword", "有功功率"));
+                if (!stationBasic.getStationType().equals("FDZ")) {
+                    queryDtoList.add(new QueryDto("frontModule", "逆变器"));
+                }
+                stationCacheInfoDto.setEquipmentNumbers(commonServiceImpl.getCount(queryDtoList, "equipmentNumber.Keyword", ESEquipments.class).toString());
+            } catch (Exception exception) {
+              logger.info("--------------------查询ES错误---------------------------");
+            }
+            stationCacheInfoDto.setFanGatewayId(stationBasic.getFanGatewayId());
+            stationCacheInfoDto.setBoosterGatewayId(stationBasic.getBoosterGatewayId());
+            stationCacheInfoDtos.add(stationCacheInfoDto);
+        });
+        redisTemplate.opsForList().leftPushAll("station_info_cache", stationCacheInfoDtos);
     }
 }

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

@@ -247,7 +247,7 @@ public class CommonServiceImpl {
         } catch (Exception e) {
             return totalvalue;
         }
-        return Double.valueOf(String.format("%.2f", totalvalue*CommonConstans.pvGenPoweActor));
+        return Double.valueOf(String.format("%.4f", totalvalue*CommonConstans.pvGenPoweActor));
     }
 
     public Double getTotalByIndicatiorAndParams(String gatewayId, String indicator, String querySql) {

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

@@ -28,15 +28,14 @@ public class EquipAlarmEventServiceImpl extends BaseService<EquipAlarmEventDto,
 
     public ResultsData getEventByEquipIndex(String gatewayId, int current, int size, String equipIndex, String frontModule) {
         List<EquipAlarmEvent> equipAlarmEvents = new ArrayList<>();
-        //参数传递进来的实际上为场站id
-        StationBasic stationBasic = this.stationBasicMapper.selectById(gatewayId);
         LambdaQueryWrapper<EquipAlarmEvent> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(EquipAlarmEvent::getEquipIndex, equipIndex);
-        queryWrapper.eq(EquipAlarmEvent::getGatewayId, stationBasic.getFanGatewayId());
+        queryWrapper.eq(EquipAlarmEvent::getGatewayId, gatewayId);
         queryWrapper.eq(EquipAlarmEvent::getFrontModule, frontModule);
         queryWrapper.orderByDesc(EquipAlarmEvent::getCreatedTime);
         equipAlarmEvents = equipAlarmEventMapper.selectList(queryWrapper);
-        DataGridMock DataGridMock = new DataGridMock(current, equipAlarmEvents.size(), false, current, equipAlarmEvents);
+
+        DataGridMock DataGridMock = new DataGridMock(current, equipAlarmEvents.size(), false, current, equipAlarmEvents.subList((current - 1) * size, current * size));
         ColModel colModelEventMovement = new ColModel("equipName", "equipName", "设备名", "设备名", "dataGrid", "equipName");
         ColModel colModelStationName = new ColModel("alarmDesc", "alarmDesc", "事件描述", "事件描述", "dataGrid", "alarmDesc");
         ColModel colModelEventDesc = new ColModel("createdTime", "createdTime", "告警时间", "告警时间", "dataGrid", "createdTime");

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

@@ -911,7 +911,7 @@ public class MonitoringServiceImpl {
             powerOfAnnualGF.updateAndGet(v -> v + commonServiceImpl.getSumByEquipmentIndxName(result, "年发电量"));
         });
         HashMap<String, String> stringHashMap4 = new HashMap<>();
-        stringHashMap4.put("title", String.format(CommonConstans.Twodecimalplaces, powerOfDayFD.get()) + "/" + String.format(CommonConstans.Twodecimalplaces, powerOfDayGF.get() * CommonConstans.pvGenPoweActor));
+        stringHashMap4.put("title", String.format(CommonConstans.Twodecimalplaces, powerOfDayFD.get()) + "/" + String.format(CommonConstans.Twodecimalplaces, powerOfDayGF.get() * CommonConstans.pvGenPoweActor*CommonConstans.pvGenPoweActorDay));
         list1.add(stringHashMap4);
         HashMap<String, String> stringHashMap5 = new HashMap<>();
         stringHashMap5.put("title", String.format(CommonConstans.Twodecimalplaces, powerOfMonthFD.get()) + "/" + String.format(CommonConstans.Twodecimalplaces, powerOfMonthGF.get() * CommonConstans.pvGenPoweActor));