From 566c44cc5712ab9c997424ee5a5438e0a81a016e Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 17 五月 2023 18:49:38 +0800
Subject: [PATCH] BUG修改
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/THomePageController.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/THomePageController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/THomePageController.java
index a4789e6..e966706 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/THomePageController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/THomePageController.java
@@ -28,6 +28,7 @@
import java.time.LocalDate;
import java.time.Period;
import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
/**
@@ -130,7 +131,15 @@
}
model.addAttribute("allList",list);
List<List<String>> list1 = new ArrayList<>();
+ AtomicInteger count = new AtomicInteger(0);
for (TDriver tDriver : onLineDriver) {
+
+ String value1 = redisUtil.getValue("DRIVER_" + tDriver.getPhone());
+ String value2 = redisUtil.getValue(value1);
+ if(ToolUtil.isNotEmpty(value2)){
+ count.addAndGet(1);
+ }
+
List<String> obj = new ArrayList<>(3);
String value = redisUtil.getValue("DRIVER" + tDriver.getId());
if(ToolUtil.isEmpty(value)){
@@ -141,7 +150,7 @@
obj.add(String.valueOf(tDriver.getServerStatus()));// 服务状态
list1.add(obj);
}
- model.addAttribute("onLineDriverCount",list1.size());
+ model.addAttribute("onLineDriverCount",count.get());
// 拿到所有在线司机地址
model.addAttribute("onLineDriver",list1);
return PREFIX + "tHomePageMap.html";
@@ -150,7 +159,7 @@
@RequestMapping("/getMap")
@ResponseBody
public Object getMap(Integer agentId,Integer type,Model model) {
- Integer objectId = ShiroKit.getUser().getObjectId();
+ Integer objectId = Objects.requireNonNull(ShiroKit.getUser()).getObjectId();
Integer roleType = ShiroKit.getUser().getRoleType();
if(roleType == 3 && Objects.nonNull(objectId)){
agentId = objectId;
--
Gitblit v1.7.1