bug 修改、

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/MonitorFanIdxController.java

@@ -884,10 +884,11 @@ public class MonitorFanIdxController extends BaseController {
     public ResponseModel<ResultsData> getEventByEquipIndex(@RequestParam(value = "current") int current,
                                                            @RequestParam(value = "size") int size,
                                                            @RequestParam(value = "stationId") String stationId,
-                                                           @RequestParam(value = "equipIndex") String equipIndex) {
+                                                           @RequestParam(value = "equipIndex") String equipIndex,
+                                                           @RequestParam(value = "frontModule") String frontModule) {
         StationBasic stationBasic = stationBasicMapper.selectById(stationId);
         String gatewayId = stationBasic.getFanGatewayId();
-        ResultsData resultsData = equipAlarmEventService.getEventByEquipIndex(gatewayId, current, size, equipIndex);
+        ResultsData resultsData = equipAlarmEventService.getEventByEquipIndex(gatewayId, current, size, equipIndex, frontModule);
         return ResponseHelper.buildResponse(resultsData);
     }
 

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/EquipAlarmEvent.java

@@ -25,4 +25,9 @@ public class EquipAlarmEvent {
     private String equipName;
     @TableField("sort")
     private long sort;
+    /**
+     * 分类   逆变器、箱变、汇流箱
+     */
+    @TableField("frontModule")
+    private String frontModule;
 }

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

@@ -20,11 +20,12 @@ public class EquipAlarmEventServiceImpl extends BaseService<EquipAlarmEventDto,
     @Autowired
     EquipAlarmEventMapper equipAlarmEventMapper;
 
-   public ResultsData getEventByEquipIndex(String gatewayId, int current, int size, String equipIndex) {
+   public ResultsData getEventByEquipIndex(String gatewayId, int current, int size, String equipIndex, String frontModule) {
 
         LambdaQueryWrapper<EquipAlarmEvent> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(EquipAlarmEvent::getEquipIndex, equipIndex);
         queryWrapper.eq(EquipAlarmEvent::getGatewayId, gatewayId);
+        queryWrapper.eq(EquipAlarmEvent::getFrontModule, frontModule);
         queryWrapper.orderByDesc(EquipAlarmEvent::getCreatedTime);
         List<EquipAlarmEvent> equipAlarmEvents = equipAlarmEventMapper.selectList(queryWrapper);
 

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

@@ -885,7 +885,11 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         List<Map<String, Object>> statusMaps = new ArrayList<>();
         for (IndicatorsDto listDatum : listData) {
             Map<String, Object> statusMap = new HashMap<>();
-            statusMap.put("title", listDatum.getValue().equals("") ? 0.00 : keepTwoDecimalPlaces(listDatum.getValue()) + " " + listDatum.getUnit() == null ? "" : keepTwoDecimalPlaces(listDatum.getValue()) + " " + listDatum.getUnit());
+            if (StringUtils.isEmpty(listDatum.getValue())) {
+                statusMap.put("title", 0.00 + (StringUtils.isNotEmpty(listDatum.getUnit()) ? listDatum.getUnit() : ""));
+            } else {
+                statusMap.put("title", keepTwoDecimalPlaces(listDatum.getValue()) + " " + (StringUtils.isNotEmpty(listDatum.getUnit()) ? listDatum.getUnit() : ""));
+            }
             statusMap.put("title1", listDatum.getDisplayName());
             statusMaps.add(statusMap);
         }
@@ -2052,36 +2056,65 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         return deaviationRateDtoPage;
     }
 
-    public void addNbqAlarmEvent(String gatewayId) {
-        String sql = " SELECT * FROM indicators_" + gatewayId + " WHERE (equipmentIndexName ='待机' or equipmentIndexName ='停机' or equipmentIndexName ='告警运行' or equipmentIndexName ='限额运行' or equipmentIndexName ='降额运行' or equipmentIndexName ='故障停机'or equipmentIndexName ='通讯故障'or equipmentIndexName ='运行') and value = 'true'";
-        List<IndicatorsDto> indicatorsDtoList = influxDButils.getListData(sql, IndicatorsDto.class);
-        List<EquipAlarmEvent> newEquipAlarmEvents = new ArrayList<>();
-        List<EquipAlarmEvent> newEquipAlarmEvent = new ArrayList<>();
-        long time = new Date().getTime();
-        for (IndicatorsDto indicatorsDto : indicatorsDtoList) {
-            EquipAlarmEvent equipAlarmEvent = new EquipAlarmEvent();
-            equipAlarmEvent.setEquipIndex(indicatorsDto.getEquipmentNumber());
-            equipAlarmEvent.setAlarmDesc(AlarmDesc.getCode(indicatorsDto.getEquipmentIndexName()));
-            equipAlarmEvent.setCreatedTime(DateUtils.longStr2Date(indicatorsDto.getCreatedTime()));
-            equipAlarmEvent.setGatewayId(gatewayId);
-            equipAlarmEvent.setSort(time);
-            newEquipAlarmEvents.add(equipAlarmEvent);
-            newEquipAlarmEvent.add(equipAlarmEvent);
-        }
 
-        String lastSort = equipAlarmEventMapper.getLastDataBySort(gatewayId);
-        if (null != lastSort ) {
-            List<EquipAlarmEvent> oldEquipAlarmEvents = equipAlarmEventMapper.getOldDataBySort(lastSort,gatewayId);
-            for (EquipAlarmEvent oldEquipAlarmEvent : oldEquipAlarmEvents) {
-                for (EquipAlarmEvent equipAlarmEvent : newEquipAlarmEvents) {
-                    if (oldEquipAlarmEvent.getEquipIndex().equals(equipAlarmEvent.getEquipIndex()) && oldEquipAlarmEvent.getAlarmDesc().equals(equipAlarmEvent.getAlarmDesc())){
-                        newEquipAlarmEvent.remove(equipAlarmEvent);
+    public void addNbqAlarmEvent() {
+
+        LambdaQueryWrapper<StationBasic> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(BaseEntity::getIsDelete, false);
+        List<StationBasic> stationBasics = stationBasicMapper.selectList(wrapper);
+        for (StationBasic stationBasic : stationBasics) {
+            /**
+             * 逆变器
+             */
+            String sql = " SELECT * FROM indicators_" + stationBasic.getFanGatewayId() + " WHERE (equipmentIndexName ='待机' or equipmentIndexName ='停机' or equipmentIndexName ='告警运行' or equipmentIndexName ='限额运行' or equipmentIndexName ='降额运行' or equipmentIndexName ='故障停机'or equipmentIndexName ='通讯故障'or equipmentIndexName ='运行') and value = 'true'";
+            List<IndicatorsDto> indicatorsDtoList = influxDButils.getListData(sql, IndicatorsDto.class);
+
+            /**
+             * 汇流箱
+             */
+            String sql2 = " SELECT * FROM indicators_" + stationBasic.getFanGatewayId() + " WHERE frontModule =~/.*汇流箱.*/ and dataType = 'state' ";
+            List<IndicatorsDto> indicatorsDtoListHLX = influxDButils.getListData(sql2, IndicatorsDto.class);
+
+            /**
+             * 箱变
+             */
+            String sql3 = " SELECT * FROM indicators_" + stationBasic.getFanGatewayId() + " WHERE frontModule =~/.*箱变.*/ and dataType = 'state' ";
+            List<IndicatorsDto> indicatorsDtoListXB = influxDButils.getListData(sql3, IndicatorsDto.class);
+
+            indicatorsDtoList.addAll(indicatorsDtoListHLX);
+            indicatorsDtoList.addAll(indicatorsDtoListXB);
+
+            List<EquipAlarmEvent> newEquipAlarmEvents = new ArrayList<>();
+            List<EquipAlarmEvent> newEquipAlarmEvent = new ArrayList<>();
+            long time = new Date().getTime();
+            for (IndicatorsDto indicatorsDto : indicatorsDtoList) {
+                EquipAlarmEvent equipAlarmEvent = new EquipAlarmEvent();
+                equipAlarmEvent.setEquipIndex(indicatorsDto.getEquipmentNumber());
+                equipAlarmEvent.setAlarmDesc(AlarmDesc.getCode(indicatorsDto.getEquipmentIndexName()));
+                equipAlarmEvent.setCreatedTime(DateUtils.longStr2Date(indicatorsDto.getCreatedTime()));
+                equipAlarmEvent.setGatewayId(stationBasic.getFanGatewayId());
+                equipAlarmEvent.setSort(time);
+                equipAlarmEvent.setFrontModule(indicatorsDto.getFrontModule());
+                newEquipAlarmEvents.add(equipAlarmEvent);
+                newEquipAlarmEvent.add(equipAlarmEvent);
+            }
+
+            String lastSort = equipAlarmEventMapper.getLastDataBySort(stationBasic.getFanGatewayId());
+            if (null != lastSort) {
+                List<EquipAlarmEvent> oldEquipAlarmEvents = equipAlarmEventMapper.getOldDataBySort(lastSort, stationBasic.getFanGatewayId());
+                for (EquipAlarmEvent oldEquipAlarmEvent : oldEquipAlarmEvents) {
+                    for (EquipAlarmEvent equipAlarmEvent : newEquipAlarmEvents) {
+                        if (oldEquipAlarmEvent.getEquipIndex().equals(equipAlarmEvent.getEquipIndex()) && oldEquipAlarmEvent.getAlarmDesc().equals(equipAlarmEvent.getAlarmDesc())) {
+                            newEquipAlarmEvent.remove(equipAlarmEvent);
+                        }
                     }
                 }
             }
+            equipAlarmEventService.saveBatch(newEquipAlarmEvent);
+
         }
-        equipAlarmEventService.saveBatch(newEquipAlarmEvent);
     }
 
+
 }