From 4bd007805ce8242320c9cf4e477ce87fe1896bb6 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 22 Mar 2021 09:38:01 +0800
Subject: [PATCH] 1.用户管理
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/ServerHandler.java | 47 +++++++++++++++++++++++++++++++----------------
1 files changed, 31 insertions(+), 16 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/ServerHandler.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/ServerHandler.java
index 91a096f..8c1c349 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/ServerHandler.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/ServerHandler.java
@@ -457,28 +457,28 @@
} else if (fqbm.equals("3")) {
alarm.setWaringType("系统故障");
alarm.setContent("扩展模块故障");
- reason="扩展模块故障";
- serverHandler.equipmentService.updateExstate(state,reason,devId);
+// reason="扩展模块故障";
+// serverHandler.equipmentService.updateExstate(state,reason,devId);
} else if (fqbm.equals("4")) {
alarm.setWaringType("系统故障");
alarm.setContent("中继器故障");
- reason="中继器故障";
- serverHandler.equipmentService.updateExstate(state,reason,devId);
+// reason="中继器故障";
+// serverHandler.equipmentService.updateExstate(state,reason,devId);
} else if (fqbm.equals("5")) {
alarm.setWaringType("系统故障");
alarm.setContent("打印机缺纸");
- reason="打印机缺纸";
- serverHandler.equipmentService.updateExstate(state,reason,devId);
+// reason="打印机缺纸";
+// serverHandler.equipmentService.updateExstate(state,reason,devId);
} else if (fqbm.equals("6")) {
alarm.setWaringType("系统故障");
alarm.setContent("打印机故障");
- reason="打印机故障";
- serverHandler.equipmentService.updateExstate(state,reason,devId);
+// reason="打印机故障";
+// serverHandler.equipmentService.updateExstate(state,reason,devId);
} else if (fqbm.equals("7")) {
alarm.setWaringType("系统故障");
alarm.setContent("扩展模块无直流");
- reason="扩展模块无直流";
- serverHandler.equipmentService.updateExstate(state,reason,devId);
+// reason="扩展模块无直流";
+// serverHandler.equipmentService.updateExstate(state,reason,devId);
} else if (fqbm.equals("8")) {
alarm.setWaringType("系统故障");
alarm.setContent("扩展模块低电压");
@@ -487,16 +487,16 @@
} else if (fqbm.equals("9")) {
alarm.setWaringType("系统故障");
alarm.setContent("扩展模块复位");
- reason="扩展模块复位";
- serverHandler.equipmentService.updateExstate(state,reason,devId);
+// reason="扩展模块复位";
+// serverHandler.equipmentService.updateExstate(state,reason,devId);
}
break;
case "34":
if (fqbm.equals("1")) {
alarm.setWaringType("系统故障");
alarm.setContent("扩展模块防拆触发");
- reason="扩展模块防拆触发";
- serverHandler.equipmentService.updateExstate(state,reason,devId);
+// reason="扩展模块防拆触发";
+// serverHandler.equipmentService.updateExstate(state,reason,devId);
}
break;
case "35":
@@ -513,8 +513,8 @@
} else if (fqbm.equals("2")) {
alarm.setWaringType("系统故障");
alarm.setContent("电话接口2故障");
- reason="电话接口2故障";
- serverHandler.equipmentService.updateExstate(state,reason,devId);
+// reason="电话接口2故障";
+// serverHandler.equipmentService.updateExstate(state,reason,devId);
} else if (fqbm.equals("3")) {
alarm.setWaringType("通讯故障");
alarm.setContent("远距离无线通讯");
@@ -1354,10 +1354,14 @@
if (fqbm.equals("0")) {
alarm.setWaringType("系统故障-恢复");
alarm.setContent("电话线故障-通讯故障（转发）");
+ reason="";
+ serverHandler.equipmentService.updateExstate("",reason,devId);
}
else if (fqbm.equals("1")) {
alarm.setWaringType("系统故障");
alarm.setContent("交流电故障-通讯故障（转发）");
+ reason="";
+ serverHandler.equipmentService.updateExstate("",reason,devId);
}
else if (fqbm.equals("2")) {
alarm.setWaringType("系统故障");
@@ -1366,6 +1370,7 @@
else if (fqbm.equals("3")) {
alarm.setWaringType("系统故障");
alarm.setContent("警号/继电器故障-通讯故障（转发）");
+
}
else if (fqbm.equals("4")) {
alarm.setWaringType("系统故障");
@@ -1382,6 +1387,8 @@
else if (fqbm.equals("7")) {
alarm.setWaringType("系统故障-恢复");
alarm.setContent("交流电故障恢复-通讯故障（转发）");
+ reason="";
+ serverHandler.equipmentService.updateExstate("",reason,devId);
}
else if (fqbm.equals("8")) {
alarm.setWaringType("系统故障-恢复");
@@ -1394,14 +1401,20 @@
else if (fqbm.equals("A")) {
alarm.setWaringType("系统故障-恢复");
alarm.setContent("电话线故障-通讯故障（转发）");
+ reason="";
+ serverHandler.equipmentService.updateExstate("",reason,devId);
}
else if (fqbm.equals("B")) {
alarm.setWaringType("系统故障-恢复");
alarm.setContent("回路短路故障恢复-通讯故障（转发）");
+ reason="";
+ serverHandler.equipmentService.updateExstate("",reason,devId);
}
else if (fqbm.equals("C")) {
alarm.setWaringType("系统故障-恢复");
alarm.setContent("无线监控恢复-通讯故障（转发）");
+ reason="";
+ serverHandler.equipmentService.updateExstate("",reason,devId);
}
else if (fqbm.equals("E")) {
alarm.setWaringType("系统故障");
@@ -1410,6 +1423,8 @@
else if (fqbm.equals("F")) {
alarm.setWaringType("系统故障-恢复");
alarm.setContent("无线监控故障恢复-通讯故障（转发）");
+ reason="";
+ serverHandler.equipmentService.updateExstate("",reason,devId);
}
break;
case "9B":
--
Gitblit v1.9.3