更新告警手动消除

whycxzp

2023-08-17 7523dd4fff40aa8c8cc178a683213261a883e5be

更新告警手动消除

 src/main/java/com/whyc/pojo/PwrDevAlarmVerify.java

@@ -118,4 +118,6 @@
    @TableField("alm_severity")
    private Integer almSeverity;

    private Integer almTrigger;

}

 src/main/java/com/whyc/pojo/PwrdevAlarmHistory.java

@@ -114,6 +114,8 @@
    @TableField("alm_severity")
    private Integer almSeverity;

    private Integer almTrigger;

    @TableField(exist = false)
    private Integer limitStart;


 src/main/java/com/whyc/service/AlarmManualClearService.java

@@ -7,9 +7,7 @@
import com.whyc.dto.AlarmDaoFactory;
import com.whyc.dto.Response;
import com.whyc.mapper.AlarmManualClearMapper;
import com.whyc.pojo.AlarmManualClear;
import com.whyc.pojo.BattalarmData;
import com.whyc.pojo.DevalarmData;
import com.whyc.pojo.*;
import com.whyc.util.ActionUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -33,19 +31,19 @@
    private PowerInfService powerInfService;

    @Autowired
    private BattalarmDataService battAlarmService;
    private BattAlarmDataVerifyService battAlarmService;

    @Autowired
    private BattalarmDataHistoryService battAlarmHistoryService;

    @Autowired
    private DevalarmDataService devAlarmService;
    private DevAlarmDataVerifyService devAlarmService;

    @Autowired
    private DevalarmDataHistoryService devAlarmHistoryService;

    @Autowired
    private PwrdevAlarmService powerAlarmService;
    private PwrDevAlarmVerifyService powerAlarmService;

    @Autowired
    private PwrdevAlarmHistoryService powerAlarmHistoryService;
@@ -61,16 +59,21 @@
        Integer num = clear.getNum();
        if(alarmType == 1){ //电池告警
            stationId = battInfService.getStationIdByBattGroupId(clear.getBattGroupId());
            //添加到历史告警,移除实时告警
            BattalarmData data = battAlarmService.getById(num);
            //添加到历史告警,移除告警确认数据
            BattAlarmDataVerify data = battAlarmService.getById(num);
            battAlarmHistoryService.add(data);
            battAlarmService.delete(num);
        } else if (alarmType == 2) { //设备告警
            stationId = battInfService.getStationIdByDeviceId(clear.getDeviceId());
            DevalarmData data = devAlarmService.getById(num);
            DevAlarmDataVerify data = devAlarmService.getById(num);
            devAlarmHistoryService.add(data);
            devAlarmService.delete(num);

        }else{ //电源告警
            stationId = powerInfService.getStationIdByPowerDeviceId(clear.getPowerDeviceId());
            PwrDevAlarmVerify data = powerAlarmService.getById(num);
            powerAlarmHistoryService.add(data);
            powerAlarmService.delete(num);
        }
        clear.setStationId(stationId);
        mapper.insert(clear);

 src/main/java/com/whyc/service/BattAlarmDataVerifyService.java

@@ -27,4 +27,12 @@
        PageInfo<BattAlarmDataVerify> pageInfo = new PageInfo<>(list);
        return new Response<>().set(1,pageInfo);
    }

    public BattAlarmDataVerify getById(Integer num) {
        return mapper.selectById(num);
    }

    public void delete(Integer num) {
        mapper.deleteById(num);
    }
}

 src/main/java/com/whyc/service/BattalarmDataHistoryService.java

@@ -10,7 +10,7 @@
import com.whyc.dto.result.AlarmRes;
import com.whyc.mapper.BattalarmDataHistoryMapper;
import com.whyc.mapper.CommonMapper;
import com.whyc.pojo.BattalarmData;
import com.whyc.pojo.BattAlarmDataVerify;
import com.whyc.pojo.BattalarmDataHistory;
import com.whyc.pojo.UserInf;
import com.whyc.util.ActionUtil;
@@ -23,7 +23,6 @@
import java.text.ParseException;
import java.util.ArrayList;
import java.util.Date;
import java.util.LinkedList;
import java.util.List;

@Service
@@ -120,7 +119,7 @@
        mapper.delete(update);
    }

    public void add(BattalarmData data) {
    public void add(BattAlarmDataVerify data) {
        BattalarmDataHistory dataHistory = new BattalarmDataHistory();
        dataHistory.setAlmClearedType(data.getAlmClearedType());
        dataHistory.setAlmConfirmedTime(data.getAlmConfirmedTime());

 src/main/java/com/whyc/service/DevAlarmDataVerifyService.java

@@ -27,4 +27,12 @@
        PageInfo<DevAlarmDataVerify> pageInfo = new PageInfo<>(list);
        return new Response<>().set(1,pageInfo);
    }

    public DevAlarmDataVerify getById(Integer num) {
        return mapper.selectById(num);
    }

    public void delete(Integer num) {
        mapper.deleteById(num);
    }
}

 src/main/java/com/whyc/service/DevalarmDataHistoryService.java

@@ -8,6 +8,7 @@
import com.whyc.dto.paramter.DevAlarmPar;
import com.whyc.mapper.DevalarmDataHistoryMapper;
import com.whyc.pojo.BattalarmDataHistory;
import com.whyc.pojo.DevAlarmDataVerify;
import com.whyc.pojo.DevalarmDataHistory;
import com.whyc.pojo.UserInf;
import com.whyc.util.ActionUtil;
@@ -84,4 +85,24 @@
        update.lt("alm_start_time",retentionTime);
        mapper.delete(update);
    }

    public void add(DevAlarmDataVerify data) {
        DevalarmDataHistory dataHistory = new DevalarmDataHistory();
        dataHistory.setAlmClearedType(data.getAlmClearedType());
        dataHistory.setAlmConfirmedTime(data.getAlmConfirmedTime());
        dataHistory.setAlmEndTime(data.getAlmEndTime());
        dataHistory.setAlmIsConfirmed(data.getAlmIsConfirmed());
        dataHistory.setAlmLevel(data.getAlmLevel());
        dataHistory.setAlmSeverity(data.getAlmSeverity());
        dataHistory.setAlmStartTime(data.getAlmStartTime());
        dataHistory.setAlmType(data.getAlmType());
        dataHistory.setAlmValue(data.getAlmValue());
        dataHistory.setDevId(data.getDevId());
        dataHistory.setDevIp(data.getDevIp());
        dataHistory.setRecordId(data.getRecordId());
        dataHistory.setUsrId(data.getUsrId());

        mapper.insert(dataHistory);

    }
}

 src/main/java/com/whyc/service/PwrDevAlarmVerifyService.java

@@ -27,4 +27,12 @@
        PageInfo<PwrDevAlarmVerify> pageInfo = new PageInfo<>(list);
        return new Response<>().set(1,pageInfo);
    }

    public PwrDevAlarmVerify getById(Integer num) {
        return mapper.selectById(num);
    }

    public void delete(Integer num) {
        mapper.deleteById(num);
    }
}

 src/main/java/com/whyc/service/PwrdevAlarmHistoryService.java

@@ -8,6 +8,7 @@
import com.whyc.dto.Response;
import com.whyc.mapper.PwrdevAlarmHistoryMapper;
import com.whyc.mapper.PwrdevAlarmParamMapper;
import com.whyc.pojo.PwrDevAlarmVerify;
import com.whyc.pojo.PwrdevAlarmHistory;
import com.whyc.pojo.PwrdevAlarmParam;
import com.whyc.pojo.UserLog;
@@ -166,4 +167,25 @@
        update.lt("alm_start_time",retentionTime);
        mapper.delete(update);
    }

    public void add(PwrDevAlarmVerify data) {
        PwrdevAlarmHistory dataHistory = new PwrdevAlarmHistory();
        dataHistory.setAlmClearedType(data.getAlmClearedType());
        dataHistory.setAlmConfirmedTime(data.getAlmConfirmedTime());
        dataHistory.setAlmEndTime(data.getAlmEndTime());
        dataHistory.setAlmIndex(data.getAlmIndex());
        dataHistory.setAlmIsConfirmed(data.getAlmIsConfirmed());
        dataHistory.setAlmLevel(data.getAlmLevel());
        dataHistory.setAlmSeverity(data.getAlmSeverity());
        dataHistory.setAlmSource(data.getAlmSource());
        dataHistory.setAlmStartTime(data.getAlmStartTime());
        dataHistory.setAlmType(data.getAlmType());
        dataHistory.setAlmValue(data.getAlmValue());
        dataHistory.setPowerDeviceId(data.getPowerDeviceId());
        dataHistory.setRecordId(data.getRecordId());
        dataHistory.setUsrId(data.getUsrId());
        dataHistory.setAlmTrigger(data.getAlmTrigger());

        mapper.insert(dataHistory);
    }
}