TuringsMachine/imt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

报警流程功能更新

Browse Source
This commit is contained in:
zhangjunwen 2024-09-20 15:20:48 +08:00
parent 9b1acdd46e
commit 6603fc3acb
2 changed files with 44 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
imt-server/imt-module-data/imt-module-data-biz/src/main/java/com/inspur/module/data/service/task/DataProducerTask.java
View File

@ -23,45 +23,45 @@ public class DataProducerTask implements ApplicationRunner {
@Override @Override
public void run(ApplicationArguments args) throws Exception { public void run(ApplicationArguments args) throws Exception {
// Timer timer1 = new Timer(); Timer timer1 = new Timer();
// timer1.schedule(new TimerTask() { timer1.schedule(new TimerTask() {
// @Override @Override
// public void run() { public void run() {
// threadPoolTaskExecutor.execute(new Channel1DataProcess()); threadPoolTaskExecutor.execute(new Channel1DataProcess());
// } }
// },1000,10000); },1000,10000);
//
// Timer timer2 = new Timer(); Timer timer2 = new Timer();
// timer2.schedule(new TimerTask() { timer2.schedule(new TimerTask() {
// @Override @Override
// public void run() { public void run() {
// threadPoolTaskExecutor.execute(new Channel2DataProcess()); threadPoolTaskExecutor.execute(new Channel2DataProcess());
// } }
// },5000,10000); },5000,10000);
//
// Timer timer3 = new Timer(); Timer timer3 = new Timer();
// timer3.schedule(new TimerTask() { timer3.schedule(new TimerTask() {
// @Override @Override
// public void run() { public void run() {
// threadPoolTaskExecutor.execute(new Channel3DataProcess()); threadPoolTaskExecutor.execute(new Channel3DataProcess());
// } }
// },10000,10000); },10000,10000);
//
// Timer timer4 = new Timer(); Timer timer4 = new Timer();
// timer4.schedule(new TimerTask() { timer4.schedule(new TimerTask() {
// @Override @Override
// public void run() { public void run() {
// threadPoolTaskExecutor.execute(new Channel4DataProcess()); threadPoolTaskExecutor.execute(new Channel4DataProcess());
// } }
// },14000,10000); },14000,10000);
//
// Timer timer5 = new Timer(); Timer timer5 = new Timer();
// timer5.schedule(new TimerTask() { timer5.schedule(new TimerTask() {
// @Override @Override
// public void run() { public void run() {
// threadPoolTaskExecutor.execute(new Channel5DataProcess()); threadPoolTaskExecutor.execute(new Channel5DataProcess());
// } }
// },19000,10000); },19000,10000);
} }
} }

9
imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/api/alarm/AlarmRulesApiImpl.java
View File

@ -158,7 +158,7 @@ public class AlarmRulesApiImpl implements AlarmRulesApi{
updateData.setAlarmDataId(alarmData.getAlarmDataId()); updateData.setAlarmDataId(alarmData.getAlarmDataId());
updateData.setAlarmValue(value); updateData.setAlarmValue(value);
updateData.setLastAlarmTime(LocalDateTime.now()); updateData.setLastAlarmTime(LocalDateTime.now());
updateData.setAlarmLevel(rule.getAlarmLevel()); updateData.setAlarmLevel(rule.getAlarmLevel() < alarmData.getAlarmLevel() ? rule.getAlarmLevel() : alarmData.getAlarmLevel());
updateData.setEquipId(rule.getEquipId()); updateData.setEquipId(rule.getEquipId());
updateData.setReasonDescription(rule.getReasonDescription()); updateData.setReasonDescription(rule.getReasonDescription());
alarmDataService.updateAlarmData(updateData); alarmDataService.updateAlarmData(updateData);
@ -168,7 +168,8 @@ public class AlarmRulesApiImpl implements AlarmRulesApi{
* 设备报警数据更新 * 设备报警数据更新
*/ */
private String refreshEquipAlarmData(AlarmRulesRespDTO rule){ private String refreshEquipAlarmData(AlarmRulesRespDTO rule){
List<EquipAlarmDataDO> equipAlarmData = equipAlarmDataService.getEquipAlarmDataByEquipId(rule.getEquipId(),null); //TODO 查询时要查询趋势报警信息
List<EquipAlarmDataDO> equipAlarmData = equipAlarmDataService.getEquipAlarmDataByEquipId(rule.getEquipId(),0);
if(equipAlarmData == null || equipAlarmData.size() == 0){ if(equipAlarmData == null || equipAlarmData.size() == 0){
return equipAlarmDataService.createEquipAlarmData(new EquipAlarmDataSaveReqVO(null,rule.getEquipId(), return equipAlarmDataService.createEquipAlarmData(new EquipAlarmDataSaveReqVO(null,rule.getEquipId(),
rule.getComponentId(),rule.getAlarmLevel(),0,LocalDateTime.now(),LocalDateTime.now(),0,null)); rule.getComponentId(),rule.getAlarmLevel(),0,LocalDateTime.now(),LocalDateTime.now(),0,null));
@ -176,7 +177,7 @@ public class AlarmRulesApiImpl implements AlarmRulesApi{
//如果没有则新增 //如果没有则新增
EquipAlarmDataSaveReqVO updateData = new EquipAlarmDataSaveReqVO(); EquipAlarmDataSaveReqVO updateData = new EquipAlarmDataSaveReqVO();
updateData.setEquipAlarmId(equipAlarmData.get(0).getEquipAlarmId()); updateData.setEquipAlarmId(equipAlarmData.get(0).getEquipAlarmId());
updateData.setAlarmLevel(rule.getAlarmLevel()); updateData.setAlarmLevel(rule.getAlarmLevel() < equipAlarmData.get(0).getAlarmLevel() ? rule.getAlarmLevel() : equipAlarmData.get(0).getAlarmLevel());
updateData.setLatestAlarmTime(LocalDateTime.now()); updateData.setLatestAlarmTime(LocalDateTime.now());
equipAlarmDataService.updateEquipAlarmData(updateData); equipAlarmDataService.updateEquipAlarmData(updateData);
return equipAlarmData.get(0).getEquipAlarmId(); return equipAlarmData.get(0).getEquipAlarmId();
@ -195,7 +196,7 @@ public class AlarmRulesApiImpl implements AlarmRulesApi{
//如果没有则新增 //如果没有则新增
EquipAlarmDataSaveReqVO updateData = new EquipAlarmDataSaveReqVO(); EquipAlarmDataSaveReqVO updateData = new EquipAlarmDataSaveReqVO();
updateData.setEquipAlarmId(equipAlarmData.get(0).getEquipAlarmId()); updateData.setEquipAlarmId(equipAlarmData.get(0).getEquipAlarmId());
updateData.setAlarmLevel(rule.getAlarmLevel()); updateData.setAlarmLevel(rule.getAlarmLevel() < equipAlarmData.get(0).getAlarmLevel() ? rule.getAlarmLevel() : equipAlarmData.get(0).getAlarmLevel());
updateData.setLatestAlarmTime(LocalDateTime.now()); updateData.setLatestAlarmTime(LocalDateTime.now());
// updateData.setEquipAnalyseStatus(judgeEquipAnalyzeStatusByAlarmLevel(rule.getAlarmLevel())); // updateData.setEquipAnalyseStatus(judgeEquipAnalyzeStatusByAlarmLevel(rule.getAlarmLevel()));
equipAlarmDataService.updateEquipAlarmData(updateData); equipAlarmDataService.updateEquipAlarmData(updateData);