xuhy
2025-02-17 1cc7231bab6d4af58ea89f4484e9da9ac76170c5
管理后台bug修改
3个文件已修改
42 ■■■■■ 已修改文件
ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/HomeController.java 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverOnlineServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementOKTravel/guns-admin/src/main/resources/application.yml 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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);
        }
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)){
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: