From ad7b7464780debdbcd76542b34aa4eaf8344930d Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 30 Mar 2021 17:19:54 +0800
Subject: [PATCH] 分发接口调整
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/ServerHandler.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 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 ceaee90..60b2c77 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
@@ -1720,9 +1720,11 @@
//查询所有闲置的接警员
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++) {
//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));
}
@@ -1730,8 +1732,18 @@
}
+ //如果无在线闲置人员
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();
--
Gitblit v1.9.3