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

报警规则管理菜单功能更新

Browse Source
This commit is contained in:
zhangjunwen 2024-04-09 18:04:24 +08:00
parent 1c6ec0e292
commit b26b32fd00
3 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
zfipc-server/zfipc-datasyn/src/main/java/com/inspur/datasyn/modbus/IPCDataSyncTask.java
View File

@ -28,8 +28,8 @@ public class IPCDataSyncTask implements ApplicationRunner {
@Autowired @Autowired
private ThreadPoolTaskExecutor threadPoolTaskExecutor; private ThreadPoolTaskExecutor threadPoolTaskExecutor;
@Autowired // @Autowired
private IIpcAlarmRulesService ipcAlarmRulesService; // private IIpcAlarmRulesService ipcAlarmRulesService;
@Value("${datasyn.modbus.host}") @Value("${datasyn.modbus.host}")
private String host; private String host;
@ -81,7 +81,7 @@ public class IPCDataSyncTask implements ApplicationRunner {
} }
},1000,1000); },1000,1000);
ipcAlarmRulesService.tran(); // ipcAlarmRulesService.tran();
} }
} }
} }

2
zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/service/IIpcAlarmRulesService.java
View File

@ -27,7 +27,7 @@ public interface IIpcAlarmRulesService
*/ */
public List<IpcAlarmRules> selectIpcAlarmRulesList(IpcAlarmRules ipcAlarmRules); public List<IpcAlarmRules> selectIpcAlarmRulesList(IpcAlarmRules ipcAlarmRules);
public void tran(); // public void tran();
/** /**
* 新增设备报警规则 * 新增设备报警规则

48
zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/service/impl/IpcAlarmRulesServiceImpl.java
View File

@ -54,30 +54,30 @@ public class IpcAlarmRulesServiceImpl implements IIpcAlarmRulesService
return ipcAlarmRulesMapper.selectIpcAlarmRulesList(ipcAlarmRules); return ipcAlarmRulesMapper.selectIpcAlarmRulesList(ipcAlarmRules);
} }
public void tran(){ // public void tran(){
List<IpcMonitorDataInfo> list = ipcMonitorDataInfoService.selectIpcMonitorDataInfoList(null); // List<IpcMonitorDataInfo> list = ipcMonitorDataInfoService.selectIpcMonitorDataInfoList(null);
AtomicInteger num = new AtomicInteger(1); // AtomicInteger num = new AtomicInteger(1);
list.forEach(data ->{ // list.forEach(data ->{
for(int t = 0; t <=1; t++){ // for(int t = 0; t <=1; t++){
IpcAlarmRules ipcAlarmRules = new IpcAlarmRules(); // IpcAlarmRules ipcAlarmRules = new IpcAlarmRules();
ipcAlarmRules.setId(IdUtils.simpleUUID()); // ipcAlarmRules.setId(IdUtils.simpleUUID());
ipcAlarmRules.setAlarmName(data.getDataName()); // ipcAlarmRules.setAlarmName(data.getDataName());
ipcAlarmRules.setEquipId(data.getEquipId()); // ipcAlarmRules.setEquipId(data.getEquipId());
ipcAlarmRules.setAlarmInfoUnit(data.getDataUnit()); // ipcAlarmRules.setAlarmInfoUnit(data.getDataUnit());
ipcAlarmRules.setAlarmNameKey(data.getDataKey()); // ipcAlarmRules.setAlarmNameKey(data.getDataKey());
ipcAlarmRules.setAlertLowerBound(BigDecimal.valueOf(0.81)); // ipcAlarmRules.setAlertLowerBound(BigDecimal.valueOf(0.81));
ipcAlarmRules.setAlertUpperBound(BigDecimal.valueOf(1.52)); // ipcAlarmRules.setAlertUpperBound(BigDecimal.valueOf(1.52));
ipcAlarmRules.setReferenceCon("区间外"); // ipcAlarmRules.setReferenceCon("区间外");
ipcAlarmRules.setReferenceName(data.getDataName() + "超出 " + ipcAlarmRules.getAlertLowerBound() + "~" + ipcAlarmRules.getAlertUpperBound()); // ipcAlarmRules.setReferenceName(data.getDataName() + "超出 " + ipcAlarmRules.getAlertLowerBound() + "~" + ipcAlarmRules.getAlertUpperBound());
ipcAlarmRules.setAlarmLevel(1); // ipcAlarmRules.setAlarmLevel(1);
ipcAlarmRules.setType(t); // ipcAlarmRules.setType(t);
ipcAlarmRules.setSort(num.get()); // ipcAlarmRules.setSort(num.get());
ipcAlarmRulesMapper.insertIpcAlarmRules(ipcAlarmRules); // ipcAlarmRulesMapper.insertIpcAlarmRules(ipcAlarmRules);
} // }
num.getAndIncrement(); // num.getAndIncrement();
//
}); // });
} // }
/** /**
* 新增设备报警规则 * 新增设备报警规则