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 |   65 ++++++++++++++++++++++++++++++++
 1 files changed, 65 insertions(+), 0 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 18bf84c..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
@@ -108,6 +108,8 @@
 		String body = new String(req, "UTF-8");
 		String content = body;
 		System.out.println("接收客户端数据:" + body);
+		String state="系统故障"; //设备故障状态
+		String reason=null; //故障原因
 		//获取字符串的长度
 		int length = content.length();
 		//当字符串长度大于200时,采集体温数据,小于则采集报警数据
@@ -363,36 +365,56 @@
 							} else if (fqbm.equals("1")) {
 								alarm.setWaringType("系统故障");
 								alarm.setContent("交流电故障");
+								reason="交流电故障";
+								serverHandler.equipmentService.updateExstate(state,reason,devId);
 							} else if (fqbm.equals("2")) {
 								alarm.setWaringType("系统故障");
 								alarm.setContent("备电偏低");
+								reason="备电偏低";
+								serverHandler.equipmentService.updateExstate(state,reason,devId);
 							} else if (fqbm.equals("3")) {
 								alarm.setWaringType("系统故障");
 								alarm.setContent("RAM校验错误");
+								reason="RAM校验错误";
+								serverHandler.equipmentService.updateExstate(state,reason,devId);
 							} else if (fqbm.equals("4")) {
 								alarm.setWaringType("系统故障");
 								alarm.setContent("ROM校验错误");
+								reason="ROM校验错误";
+								serverHandler.equipmentService.updateExstate(state,reason,devId);
 							} else if (fqbm.equals("5")) {
 								alarm.setWaringType("系统故障");
 								alarm.setContent("远程编程");
+								reason="远程编程";
+								serverHandler.equipmentService.updateExstate(state,reason,devId);
 							} else if (fqbm.equals("6")) {
 								alarm.setWaringType("系统故障");
 								alarm.setContent("主机设置更改");
+								reason="主机设置更改";
+								serverHandler.equipmentService.updateExstate(state,reason,devId);
 							} else if (fqbm.equals("7")) {
 								alarm.setWaringType("系统故障");
 								alarm.setContent("自检失败");
+								reason="自检失败";
+								serverHandler.equipmentService.updateExstate(state,reason,devId);
 							} else if (fqbm.equals("8")) {
 								alarm.setWaringType("系统故障");
 								alarm.setContent("系统关闭");
+								reason="系统关闭";
+								serverHandler.equipmentService.updateExstate(state,reason,devId);
 							} else if (fqbm.equals("9")) {
 								alarm.setWaringType("系统故障");
 								alarm.setContent("备电故障");
+								reason="备电故障";
+								serverHandler.equipmentService.updateExstate(state,reason,devId);
 							}
 							break;
 						case "31":
 							if (fqbm.equals("0")) {
 								alarm.setWaringType("系统故障");
 								alarm.setContent("接地故障");
+								reason="接地故障";
+								serverHandler.equipmentService.updateExstate(state,reason,devId);
 							}
 							break;
 						case "32":
@@ -420,51 +442,79 @@
 							if (fqbm.equals("0")) {
 								alarm.setWaringType("系统故障");
 								alarm.setContent("系统周边");
+								reason="系统周边";
+								serverHandler.equipmentService.updateExstate(state,reason,devId);
 							} else if (fqbm.equals("1")) {
 								alarm.setWaringType("系统故障");
 								alarm.setContent("回路断开");
+								reason="回路断开";
+								serverHandler.equipmentService.updateExstate(state,reason,devId);
 							} else if (fqbm.equals("2")) {
 								alarm.setWaringType("系统故障");
 								alarm.setContent("回路短路");
+								reason="回路短路";
+								serverHandler.equipmentService.updateExstate(state,reason,devId);
 							} else if (fqbm.equals("3")) {
 								alarm.setWaringType("系统故障");
 								alarm.setContent("扩展模块故障");
+//								reason="扩展模块故障";
+//								serverHandler.equipmentService.updateExstate(state,reason,devId);
 							} else if (fqbm.equals("4")) {
 								alarm.setWaringType("系统故障");
 								alarm.setContent("中继器故障");
+//								reason="中继器故障";
+//								serverHandler.equipmentService.updateExstate(state,reason,devId);
 							} else if (fqbm.equals("5")) {
 								alarm.setWaringType("系统故障");
 								alarm.setContent("打印机缺纸");
+//								reason="打印机缺纸";
+//								serverHandler.equipmentService.updateExstate(state,reason,devId);
 							} else if (fqbm.equals("6")) {
 								alarm.setWaringType("系统故障");
 								alarm.setContent("打印机故障");
+//								reason="打印机故障";
+//								serverHandler.equipmentService.updateExstate(state,reason,devId);
 							} else if (fqbm.equals("7")) {
 								alarm.setWaringType("系统故障");
 								alarm.setContent("扩展模块无直流");
+//								reason="扩展模块无直流";
+//								serverHandler.equipmentService.updateExstate(state,reason,devId);
 							} else if (fqbm.equals("8")) {
 								alarm.setWaringType("系统故障");
 								alarm.setContent("扩展模块低电压");
+								reason="扩展模块低电压";
+								serverHandler.equipmentService.updateExstate(state,reason,devId);
 							} else if (fqbm.equals("9")) {
 								alarm.setWaringType("系统故障");
 								alarm.setContent("扩展模块复位");
+//								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);
 							}
 							break;
 						case "35":
 							if (fqbm.equals("0")) {
 								alarm.setWaringType("系统故障");
 								alarm.setContent("通讯故障");
+								reason="通讯故障";
+								serverHandler.equipmentService.updateExstate(state,reason,devId);
 							} else if (fqbm.equals("1")) {
 								alarm.setWaringType("系统故障");
 								alarm.setContent("电话线故障");
+								reason="电话线故障";
+								serverHandler.equipmentService.updateExstate(state,reason,devId);
 							} else if (fqbm.equals("2")) {
 								alarm.setWaringType("系统故障");
 								alarm.setContent("电话接口2故障");
+//								reason="电话接口2故障";
+//								serverHandler.equipmentService.updateExstate(state,reason,devId);
 							} else if (fqbm.equals("3")) {
 								alarm.setWaringType("通讯故障");
 								alarm.setContent("远距离无线通讯");
@@ -1304,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("系统故障");
@@ -1316,6 +1370,7 @@
 							else if (fqbm.equals("3")) {
 								alarm.setWaringType("系统故障");
 								alarm.setContent("警号/继电器故障-通讯故障(转发)");
+
 							}
 							else if (fqbm.equals("4")) {
 								alarm.setWaringType("系统故障");
@@ -1332,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("系统故障-恢复");
@@ -1344,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("系统故障");
@@ -1360,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