From 1cc7231bab6d4af58ea89f4484e9da9ac76170c5 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 17 二月 2025 10:49:31 +0800
Subject: [PATCH] 管理后台bug修改
---
ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/HomeController.java | 11 ++++++-----
ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverOnlineServiceImpl.java | 2 +-
ManagementOKTravel/guns-admin/src/main/resources/application.yml | 29 +++++++++--------------------
3 files changed, 16 insertions(+), 26 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 bb168bb..5e00527 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
@@ -152,14 +152,15 @@
// }
// 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"));
+// List<Map<String, Object>> list = driverOnlineMapper.queryOnlineDriver(null, null, 1, 9999);
+ System.err.println("执行queryOnlineDriver========》"+tDrivers);
+ for(TDriver tDriver : tDrivers){
+ String value1 = redisUtil.getValue("DRIVER" + tDriver.getId());
if(ToolUtil.isEmpty(value1)){
continue;
}
System.err.println("添加-"+value1);
- i++;
+ size++;
}
// int size = driverOnlineService.queryOnlineDriverCount(null, null);
map1.put("netcardriver", size); //在线司机
@@ -399,7 +400,7 @@
if(companyId == null && user.getRoleType() != 1){
companyId = user.getObjectId();
}
- Wrapper<TDriver> ne = new EntityWrapper<TDriver>().eq("authState", 2).eq("state", 2).ne("flag", 3);
+ Wrapper<TDriver> ne = new EntityWrapper<TDriver>().eq("authState", 2).ne("state", 1).ne("flag", 3);
if(companyId != null){
ne.eq("companyId", companyId).or().eq("franchiseeId", companyId);
}
diff --git a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverOnlineServiceImpl.java b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverOnlineServiceImpl.java
index 4590635..7bc5ee5 100644
--- a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverOnlineServiceImpl.java
+++ b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverOnlineServiceImpl.java
@@ -41,7 +41,7 @@
List<Map<String, Object>> list = driverOnlineMapper.queryOnlineDriver(name, phone, offset, limit);
int i = 0 ;
List<Map<String, Object>> res = new ArrayList<>();
- System.err.println("执行");
+ System.err.println("执行queryOnlineDriver==============》"+list);
for (Map<String, Object> stringObjectMap : list) {
String value1 = redisUtil.getValue("DRIVER" + stringObjectMap.get("id"));
if(ToolUtil.isEmpty(value1)){
diff --git a/ManagementOKTravel/guns-admin/src/main/resources/application.yml b/ManagementOKTravel/guns-admin/src/main/resources/application.yml
index 0add695..921489c 100644
--- a/ManagementOKTravel/guns-admin/src/main/resources/application.yml
+++ b/ManagementOKTravel/guns-admin/src/main/resources/application.yml
@@ -58,18 +58,7 @@
spring:
profiles: local
datasource:
-# url: jdbc:mysql://116.169.59.170:3306/ziang?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
-# username: root
-# password: fVa%egqp_1du
-# url: jdbc:mysql://116.169.59.170:3306/ziang?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
-# username: root
-# password: fVa%egqp_1du
-# url: jdbc:mysql://127.0.0.1:3306/ziang?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
-# username: root
-# password: fVa%egqp_1du
-# url: jdbc:mysql://127.0.0.1:3306/xianning?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
-# username: root
-# password: 123456
+ db-name: xianning #用来搜集数据库的所有表
# db-name: guns #用来搜集数据库的所有表
# filters: wall,mergeStat
# url: jdbc:mysql://36.134.221.234:10633/xianning?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
@@ -77,16 +66,16 @@
# password: XianNing@2024!
# db-name: guns #用来搜集数据库的所有表
# filters: wall,mergeStat
-# url: jdbc:mysql://127.0.0.1:10633/xianning?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
-# username: root
-# password: XianNing@2024!
+ url: jdbc:mysql://127.0.0.1:10633/xianning?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
+ username: root
+ password: XianNing@2024!
# db-name: guns #用来搜集数据库的所有表
# filters: wall,mergeStat
- url: jdbc:mysql://192.168.110.34:3306/xianning?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
- username: root
- password: 123456
- db-name: guns #用来搜集数据库的所有表
- filters: wall,mergeStat
+# url: jdbc:mysql://192.168.110.34:3306/xianning?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
+# username: root
+# password: 123456
+# db-name: guns #用来搜集数据库的所有表
+# filters: wall,mergeStat
#spring:
--
Gitblit v1.7.1