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-16 16:20:54 +08:00
parent 78054f3e6e
commit 7e2d095c41
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zfipc-server/zfipc-datasyn/src/main/java/com/inspur/datasyn/modbus/IPCData2SyncThread.java
View File

@ -176,7 +176,7 @@ public class IPCData2SyncThread implements Runnable {
//报警处理 //报警处理
List<IpcAlarmRules> rulesList = alarmRulesService.selectIpcAlarmRulesByEquipId(EQUIP_ID); List<IpcAlarmRules> rulesList = alarmRulesService.selectIpcAlarmRulesByEquipId(EQUIP_ID);
alarmRecordList.addAll(ipcUtil.dealRealTimeData(fields,tags, Constant.RUNNING,rulesList,1)); alarmRecordList.addAll(ipcUtil.dealRealTimeData(fields,tags, Constant.RUNNING,rulesList));
if (!alarmRecordList.isEmpty()){//运行需放开 if (!alarmRecordList.isEmpty()){//运行需放开
// alarmRecordService.batchInsertIpcAlarmRecord(alarmRecordList); // alarmRecordService.batchInsertIpcAlarmRecord(alarmRecordList);
} }

2
zfipc-server/zfipc-datasyn/src/main/java/com/inspur/datasyn/modbus/IPCData3SyncThread.java
View File

@ -152,7 +152,7 @@ public class IPCData3SyncThread implements Runnable {
// fields.put("insertTime",format); // fields.put("insertTime",format);
//报警处理 //报警处理
List<IpcAlarmRules> rulesList = alarmRulesService.selectIpcAlarmRulesByEquipId(EQUIP_ID); List<IpcAlarmRules> rulesList = alarmRulesService.selectIpcAlarmRulesByEquipId(EQUIP_ID);
alarmRecordList.addAll(ipcUtil.dealRealTimeData(fields,tags, Constant.RUNNING,rulesList, 1)); alarmRecordList.addAll(ipcUtil.dealRealTimeData(fields,tags, Constant.RUNNING,rulesList));
if (!alarmRecordList.isEmpty()){//运行需放开 if (!alarmRecordList.isEmpty()){//运行需放开
// alarmRecordService.batchInsertIpcAlarmRecord(alarmRecordList); // alarmRecordService.batchInsertIpcAlarmRecord(alarmRecordList);
} }

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

@ -239,7 +239,7 @@ public class IPCDataSyncTask implements ApplicationRunner {
fields.put("driven_bottom_dis", (float) 0 + Math.random()); fields.put("driven_bottom_dis", (float) 0 + Math.random());
//报警处理 //报警处理
List<IpcAlarmRules> rulesList = alarmRulesService.selectIpcAlarmRulesByEquipId(equipId); List<IpcAlarmRules> rulesList = alarmRulesService.selectIpcAlarmRulesByEquipId(equipId);
alarmRecordList.addAll(ipcUtil.dealRealTimeData(fields, tags, Constant.RUNNING, rulesList, 1)); alarmRecordList.addAll(ipcUtil.dealRealTimeData(fields, tags, Constant.RUNNING, rulesList));
i.insert(measurement, tags, fields); i.insert(measurement, tags, fields);
if (!alarmRecordList.isEmpty()) {//运行需放开 if (!alarmRecordList.isEmpty()) {//运行需放开
@ -334,7 +334,7 @@ public class IPCDataSyncTask implements ApplicationRunner {
//报警处理 //报警处理
List<IpcAlarmRules> rulesList = alarmRulesService.selectIpcAlarmRulesByEquipId(equipId); List<IpcAlarmRules> rulesList = alarmRulesService.selectIpcAlarmRulesByEquipId(equipId);
alarmRecordList.addAll(ipcUtil.dealRealTimeData(fields, tags, Constant.RUNNING, rulesList, 1)); alarmRecordList.addAll(ipcUtil.dealRealTimeData(fields, tags, Constant.RUNNING, rulesList));
if (!alarmRecordList.isEmpty()) {//运行需放开 if (!alarmRecordList.isEmpty()) {//运行需放开
// alarmRecordService.batchInsertIpcAlarmRecord(alarmRecordList); // alarmRecordService.batchInsertIpcAlarmRecord(alarmRecordList);
} }

4
zfipc-server/zfipc-datasyn/src/main/java/com/inspur/datasyn/modbus/IpcDataProcess.java
View File

@ -187,7 +187,7 @@ public class IpcDataProcess implements Runnable {
fields.put("driven_bottom_dis", (float) 0 + Math.random()); fields.put("driven_bottom_dis", (float) 0 + Math.random());
//报警处理 //报警处理
List<IpcAlarmRules> rulesList = alarmRulesService.selectIpcAlarmRulesConfigListByCache(equipId); List<IpcAlarmRules> rulesList = alarmRulesService.selectIpcAlarmRulesConfigListByCache(equipId);
alarmRecordList.addAll(ipcUtil.dealRealTimeData(fields, tags, Constant.RUNNING, rulesList, 1));//TODO 根据运行状态确定规则 alarmRecordList.addAll(ipcUtil.dealRealTimeData(fields, tags, Constant.RUNNING, rulesList));//TODO 根据运行状态确定规则
i.insert(measurement, tags, fields); i.insert(measurement, tags, fields);
if (!alarmRecordList.isEmpty()) {//运行需放开 if (!alarmRecordList.isEmpty()) {//运行需放开
@ -282,7 +282,7 @@ public class IpcDataProcess implements Runnable {
//报警处理 //报警处理
List<IpcAlarmRules> rulesList = alarmRulesService.selectIpcAlarmRulesConfigListByCache(equipId); List<IpcAlarmRules> rulesList = alarmRulesService.selectIpcAlarmRulesConfigListByCache(equipId);
alarmRecordList.addAll(ipcUtil.dealRealTimeData(fields, tags, Constant.RUNNING, rulesList, 1));//TODO 根据运行状态确定规则 alarmRecordList.addAll(ipcUtil.dealRealTimeData(fields, tags, Constant.RUNNING, rulesList));//TODO 根据运行状态确定规则
if (!alarmRecordList.isEmpty()) {//运行需放开 if (!alarmRecordList.isEmpty()) {//运行需放开
// alarmRecordService.batchInsertIpcAlarmRecord(alarmRecordList); // alarmRecordService.batchInsertIpcAlarmRecord(alarmRecordList);
} }

6
zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/utils/IpcUtil.java
View File

@ -64,11 +64,11 @@ public class IpcUtil {
/** /**
* 批量处理实时数据 * 批量处理实时数据
*/ */
public List<IpcAlarmRecord> dealRealTimeData(Map<String, Object> map, Map<String, String> tags,int type, List<IpcAlarmRules> rulesList, int status) { public List<IpcAlarmRecord> dealRealTimeData(Map<String, Object> map, Map<String, String> tags,int type, List<IpcAlarmRules> rulesList) {
List<IpcAlarmRecord> returnList = new ArrayList<>(); List<IpcAlarmRecord> returnList = new ArrayList<>();
for (IpcAlarmRules rule : rulesList) { for (IpcAlarmRules rule : rulesList) {
// 判断是否当前参数类型 0:待 // 判断是否当前参数类型 0:开机
if (type == rule.getType()) { if (type == rule.getType()) {
if (judgeAlarm(map.get(rule.getAlarmNameKey()), rule.getAlertLowerBound(), rule.getAlertUpperBound(), rule.getReferenceCon())) { if (judgeAlarm(map.get(rule.getAlarmNameKey()), rule.getAlertLowerBound(), rule.getAlertUpperBound(), rule.getReferenceCon())) {
// 报警数据 // 报警数据
@ -82,7 +82,7 @@ public class IpcUtil {
double value = (double) map.get(name); double value = (double) map.get(name);
ipcAlarmRecord.setAlarmValue(BigDecimal.valueOf(value)); ipcAlarmRecord.setAlarmValue(BigDecimal.valueOf(value));
ipcAlarmRecord.setNameKey(name); ipcAlarmRecord.setNameKey(name);
ipcAlarmRecord.setContent(status == 2 || status == 3 ? "(开机监测)" + rule.getReferenceName() : rule.getReferenceName()); ipcAlarmRecord.setContent(type == 0 ? "(开机监测)" + rule.getReferenceName() : rule.getReferenceName());
ipcAlarmRecord.setStatus(0); ipcAlarmRecord.setStatus(0);
ipcAlarmRecord.setOperator(1L); ipcAlarmRecord.setOperator(1L);
ipcAlarmRecord.setAlarmLevel(rule.getAlarmLevel()); ipcAlarmRecord.setAlarmLevel(rule.getAlarmLevel());

4
zfipc-ui/src/views/zf/cydg/yxjk.vue
View File

@ -1339,7 +1339,7 @@ export default {
}, },
async queryDataInit() { async queryDataInit() {
const { data } = await listBottomCylData(); const { data } = await listBottomCylData();
console.log("数据：", data); // console.log("数据：", data);
this.showdata = data; this.showdata = data;
this.XDATA = data.timelist; this.XDATA = data.timelist;
this.xtyl = parseFloat(data.sysprs).toFixed(2); //压力 this.xtyl = parseFloat(data.sysprs).toFixed(2); //压力
@ -1402,7 +1402,7 @@ export default {
}, },
async queryData() { async queryData() {
const { data } = await listBottomCylData(); const { data } = await listBottomCylData();
console.log("数据：", data); // console.log("数据：", data);
this.showdata = data; this.showdata = data;
this.XDATA = data.timelist; this.XDATA = data.timelist;
this.xtyl = parseFloat(data.sysprs).toFixed(2); //压力 this.xtyl = parseFloat(data.sysprs).toFixed(2); //压力