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 |   95 +++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 79 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 e8285aa..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
@@ -100,6 +100,7 @@
 	 */
 	@Override
 	public void channelRead(ChannelHandlerContext channelHandlerContext, Object info) throws Exception {
+		long startTime1 = System.currentTimeMillis();
 		System.out.println("接收到了:" + info);
 		ByteBuf buf = (ByteBuf) info;
 		byte[] req = new byte[buf.readableBytes()];
@@ -140,6 +141,7 @@
 			List<String> outData = new ArrayList<>();
 			switch (content.substring(0, 2)) {
 				case "LA": {
+					System.out.println("按下按钮+++++++++++++++++++++++++++++++++");
 					String devId = content.substring(10, 22);
 					//String fqbm = content.substring(24, 26);
 					String d = content.substring(26, 27);
@@ -455,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("扩展模块低电压");
@@ -485,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":
@@ -511,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("远距离无线通讯");
@@ -1352,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("系统故障");
@@ -1364,6 +1370,7 @@
 							else if (fqbm.equals("3")) {
 								alarm.setWaringType("系统故障");
 								alarm.setContent("警号/继电器故障-通讯故障(转发)");
+
 							}
 							else if (fqbm.equals("4")) {
 								alarm.setWaringType("系统故障");
@@ -1380,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("系统故障-恢复");
@@ -1392,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("系统故障");
@@ -1408,6 +1423,8 @@
 							else if (fqbm.equals("F")) {
 								alarm.setWaringType("系统故障-恢复");
 								alarm.setContent("无线监控故障恢复-通讯故障(转发)");
+								reason="";
+								serverHandler.equipmentService.updateExstate("",reason,devId);
 							}
 							break;
 						case "9B":
@@ -1692,9 +1709,55 @@
 							break;
 					}
 
+					//警情分发测试代码
+					//查询所有闲置的接警员
+					List<Map<String, Object>> policeList = serverHandler.alarmService.queryPolice();
+					List<Map<String, Object>> online_police = new ArrayList<>();
+					for (int i = 0; i < policeList.size(); i++) {
+						if (policeList.get(i).get("work_status").equals(0)){
+							//System.out.println(policeList.get(i).get("real_name"));
+							online_police.add(policeList.get(i));
+						}
+					}
+
+
+					if (online_police.size() == 0){
+						online_police = policeList;
+					}
+
+					List policeIdArr = new ArrayList();
+
+					//将闲置状态的人员id存入数组
+					for (int i = 0; i < online_police.size(); i++) {
+						policeIdArr.add(online_police.get(i).get("id"));
+					}
+
+					//通过id计算接警员最后一次接警时间,倒序返回闲置最久的人员,派发任务
+					List<Map<String, Object>> police = serverHandler.alarmService.queryPoliceTime(policeIdArr);
+
+					if (police.size() != 0){
+						alarm.setAlarmId( police.get(0).get("alarmId").toString());
+						alarm.setAlarmPeople( police.get(0).get("alarmPeople").toString());
+//						Date date = new Date();
+//						SimpleDateFormat dateFormat=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//						alarm.setJjTime(dateFormat.format(date));
+
+						serverHandler.alarmService.updatePoliceStatus( police.get(0).get("alarmId").toString(),"1");
+					}else {
+						alarm.setAlarmId( online_police.get(0).get("id").toString());
+						alarm.setAlarmPeople(online_police.get(0).get("name").toString());
+//						Date date = new Date();
+//						SimpleDateFormat dateFormat=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//						alarm.setJjTime(dateFormat.format(date));
+
+						serverHandler.alarmService.updatePoliceStatus(online_police.get(0).get("id").toString(),"1");
+					}
+
 					serverHandler.alarmService.s(alarm);
 					outData.add("LEOK#@");
+					long endTime1 = System.currentTimeMillis();    //获取结束时间
 
+					System.out.println("代码运行时间:" + (endTime1 - startTime1) + "ms");    //输出程序运行时间
 					break;
 				}
 				case "LD": {

--
Gitblit v1.9.3