bug 修改、定时任务提交

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

 package com.yeejoin.amos.boot.module.jxiop.biz.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -11,7 +15,7 @@ import java.util.Date;
 @Accessors(chain = true)
 @TableName("equip_alarm_event")
 public class EquipAlarmEvent {
-    @TableField("sequence_nbr")
+    @TableId(value = "sequence_nbr", type = IdType.ID_WORKER)
     private Long sequenceNumber;
     @TableField("created_time")
     private Date createdTime;
@@ -30,4 +34,6 @@ public class EquipAlarmEvent {
      */
     @TableField("frontModule")
     private String frontModule;
+    @TableField("value")
+    private String value;
 }

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

@@ -2072,7 +2072,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         return deaviationRateDtoPage;
     }
 
-
+    @Scheduled(cron = "0 */1 * * * ?")
     public void addNbqAlarmEvent() {
 
         LambdaQueryWrapper<StationBasic> wrapper = new LambdaQueryWrapper<>();
@@ -2106,11 +2106,14 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
             for (IndicatorsDto indicatorsDto : indicatorsDtoList) {
                 EquipAlarmEvent equipAlarmEvent = new EquipAlarmEvent();
                 equipAlarmEvent.setEquipIndex(indicatorsDto.getEquipmentNumber());
+                equipAlarmEvent.setEquipName(indicatorsDto.getEquipmentSpecificName());
                 equipAlarmEvent.setAlarmDesc(AlarmDesc.getCode(indicatorsDto.getEquipmentIndexName()));
+                equipAlarmEvent.setAlarmDesc(StringUtils.isEmpty(equipAlarmEvent.getAlarmDesc())? indicatorsDto.getEquipmentIndexName() : equipAlarmEvent.getAlarmDesc());
                 equipAlarmEvent.setCreatedTime(DateUtils.longStr2Date(indicatorsDto.getCreatedTime()));
                 equipAlarmEvent.setGatewayId(stationBasic.getFanGatewayId());
                 equipAlarmEvent.setSort(time);
                 equipAlarmEvent.setFrontModule(indicatorsDto.getFrontModule());
+                equipAlarmEvent.setValue(indicatorsDto.getValue());
                 newEquipAlarmEvents.add(equipAlarmEvent);
                 newEquipAlarmEvent.add(equipAlarmEvent);
             }
@@ -2120,7 +2123,9 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
                 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())) {
+                        if (oldEquipAlarmEvent.getEquipIndex().equals(equipAlarmEvent.getEquipIndex()) &&
+                                oldEquipAlarmEvent.getAlarmDesc().equals(equipAlarmEvent.getAlarmDesc()) &&
+                                oldEquipAlarmEvent.getValue().equals(equipAlarmEvent.getValue())) {
                             newEquipAlarmEvent.remove(equipAlarmEvent);
                         }
                     }