From 6971c195601ecc91b2b7b52af83efed9956dcfe0 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 09 Apr 2021 09:22:49 +0800
Subject: [PATCH] 接口提供：根据设备编码
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/ServerHandler.java | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 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 82fef67..dc37ce7 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
@@ -14,6 +14,7 @@
import org.springblade.jfpt.equipment.service.IEquipmentService;
import org.springblade.jfpt.operation.service.IOperationService;
import org.springblade.jfpt.operation.vo.OperationVO;
+import org.springblade.jfpt.webscoket.service.IPushMsgService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -50,6 +51,9 @@
@Autowired
private IAlarmService alarmService;
+
+ @Autowired
+ private IPushMsgService pushMsgService;
@Autowired
private IOperationService operationService;
@@ -1720,16 +1724,30 @@
//查询所有闲置的接警员
List<Map<String, Object>> policeList = serverHandler.alarmService.queryPolice();
List<Map<String, Object>> online_police = new ArrayList<>();
+ List<Map<String, Object>> zx_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));
+ //System.out.println(policeList.get(i).get("real_name"));
+ if(policeList.get(i).get("online_status").equals(1)){
+ zx_police.add(policeList.get(i));
+ if (policeList.get(i).get("work_status").equals(0)){
+ online_police.add(policeList.get(i));
+ }
}
}
+ //如果无在线闲置人员
if (online_police.size() == 0){
- online_police = policeList;
+
+ //判断是否有在线人员
+ if (zx_police.size() == 0){
+ //无在线人员，选取所有接警员
+ online_police = policeList;
+ }else{
+ //有在线人员
+ online_police = zx_police;
+ }
+
}
List policeIdArr = new ArrayList();
@@ -1772,6 +1790,9 @@
operation.setZc("接警");
operation.setZctime(alarm.getJjTime());
serverHandler.operationService.save(operation);
+
+ //通过websocket给前端接警员发送信息
+ //serverHandler.pushMsgService.pushMsg(alarm.getAlarmId(), alarm.getId().toString());
}
outData.add("LEOK#@");
--
Gitblit v1.9.3