From a388a2b5d0104eb832d956840090bdcb9689394e Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 14 二月 2025 18:48:17 +0800
Subject: [PATCH] 补充
---
ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/HomeController.java | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/HomeController.java b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/HomeController.java
index 9fde100..bb168bb 100644
--- a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/HomeController.java
+++ b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/HomeController.java
@@ -7,6 +7,7 @@
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.util.SinataUtil;
import com.stylefeng.guns.core.util.ToolUtil;
+import com.stylefeng.guns.modular.system.dao.DriverOnlineMapper;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.DateUtil;
@@ -20,6 +21,7 @@
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
+import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.*;
@@ -85,11 +87,13 @@
}
+ @Resource
+ private DriverOnlineMapper driverOnlineMapper;
@ResponseBody
@PostMapping("/getSumData")
- public Object getSumData(Integer companyId, Date addDate, Date start, Date end){
+ public Object getSumData(Integer companyId, Date addDate, Date start, Date end) throws Exception {
Integer id = ShiroKit.getUser().getId();
User user = userService.selectById(id);
if(companyId == null && user.getRoleType() != 1){
@@ -142,15 +146,23 @@
ne1.eq("companyId", companyId).or().eq("franchiseeId", companyId);
}
List<TDriver> tDrivers = tDriverService.selectList(ne1);
- String keys = "";
- for(TDriver driver : tDrivers){
- keys += "DRIVER" + driver.getId() + ",";
+// String keys = "";
+// for(TDriver driver : tDrivers){
+// keys += "DRIVER" + driver.getId() + ",";
+// }
+// String value = redisUtil.getValues(keys.substring(0, keys.length() - 1));
+ int size = 0;
+ List<Map<String, Object>> list = driverOnlineMapper.queryOnlineDriver(null, null, 1, 9999);
+ for (Map<String, Object> stringObjectMap : list) {
+ String value1 = redisUtil.getValue("DRIVER" + stringObjectMap.get("id"));
+ if(ToolUtil.isEmpty(value1)){
+ continue;
+ }
+ System.err.println("添加-"+value1);
+ i++;
}
- String value = redisUtil.getValues(keys.substring(0, keys.length() - 1));
- JSONArray jsonArray = JSON.parseArray(value);
// int size = driverOnlineService.queryOnlineDriverCount(null, null);
- map1.put("netcardriver", jsonArray.size()); //在线司机
-
+ map1.put("netcardriver", size); //在线司机
Wrapper<TOrderTaxi> travelTime1 = new EntityWrapper<TOrderTaxi>().between("travelTime", calendar1.getTime(), calendar2.getTime());
if(companyId != null){
travelTime1.eq("companyId", companyId);
--
Gitblit v1.7.1