Merge branch 'wuhuyancao' of http://139.186.142.91:10010/r/productDev/dmvis...

doum

2026-06-08 fad0704afaf4ed07963d267142cc6f625a09909d

Merge branch 'wuhuyancao' of http://139.186.142.91:10010/r/productDev/dmvisit into wuhuyancao

 keyCabinet-android/app/build.gradle

@@ -10,8 +10,8 @@
        applicationId "com.doumee.keyCabinet"
        minSdkVersion build_versions.min_sdk
        targetSdkVersion build_versions.target_sdk
        versionCode 2
        versionName "1.0.2"
        versionCode 3
        versionName "1.0.3"

        //支持vectorDrawables矢量图
        vectorDrawables.useSupportLibrary = true

 keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/bean/DevConfigBean.java

@@ -16,6 +16,9 @@
    //是否双重验证 0否 1是
    private int doubleAuth;

    //归还钥匙双重验证 0否 1是
    private int returnDoubleAuth;

    //酒精检测开启：0=开启；1=关闭
    private int  alcoholStatus;

@@ -126,4 +129,12 @@
    public void setAlcoholStatus(int alcoholStatus) {
        this.alcoholStatus = alcoholStatus;
    }

    public int getReturnDoubleAuth() {
        return returnDoubleAuth;
    }

    public void setReturnDoubleAuth(int returnDoubleAuth) {
        this.returnDoubleAuth = returnDoubleAuth;
    }
}

 keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/face/FaceActivity.java

@@ -99,7 +99,11 @@
                statusFsm(2);
            }
        }else {
            statusFsm(7);
            if(MApplication.getConfigBean().getReturnDoubleAuth()==1){
                statusFsm(0);
            }else {
                statusFsm(7);
            }
        }
        getDB().tvDjs.setOnClickListener(new View.OnClickListener() {
            @Override
@@ -213,6 +217,7 @@
                getDB().tvTitle.setText("司机身份验证");
                getDB().clCard.setVisibility(View.GONE);
                getDB().clFace.setVisibility(View.VISIBLE);
                getDB().clSjXuan.setVisibility(View.GONE);
                setFaceModel(1);
                break;
            case 8:
@@ -268,11 +273,19 @@
                break;
            case 2:
                //切换司机刷卡
                statusFsm(3);
                if(flag==0) {
                    statusFsm(3);
                }else {
                    statusFsm(8);
                }
                break;
            case 3:
                //切换司机人脸
                statusFsm(2);
                if(flag==0) {
                    statusFsm(2);
                }else {
                    statusFsm(7);
                }
                break;
            case 4:
                //切换到人脸

 keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/face/OfflineActivationActivity.java

@@ -113,14 +113,17 @@
                getDB().accreditOffBtn.setBackgroundResource(R.mipmap.btn_less_normal);
            }
        }else {
            //删除激活文件
            FileUtils.deleteFile(filePath);
            getDB().btnDown.setText("待后台上传激活文件");
            getDB().btnDown.setClickable(false);
            getDB().btnDown.setBackgroundResource(R.mipmap.btn_less_normal);

            getDB().accreditOffBtn.setClickable(false);
            getDB().accreditOffBtn.setBackgroundResource(R.mipmap.btn_less_normal);
            if(FileUtil.FileIsExist(filePath)) {
                getDB().accreditOffBtn.setClickable(true);
                getDB().accreditOffBtn.setBackgroundResource(R.mipmap.btn_main_normal);
            }else {
                getDB().accreditOffBtn.setClickable(false);
                getDB().accreditOffBtn.setBackgroundResource(R.mipmap.btn_less_normal);
            }
        }
    }

@@ -133,6 +136,8 @@
                    ToastView.show(MApplication.mContext,"下载中...");
                    return;
                }
                //删除激活文件
                FileUtils.deleteFile(filePath);
                if(!TextUtils.isEmpty(MApplication.getConfigBean().getActivateFileUrl())){
                    isDownLoad = true;
                    startDownload(MApplication.getConfigBean().getActivateFileUrl());

 keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/KeyCabinetActivity.java

@@ -367,7 +367,7 @@
            }
            //获取卡号
            EventBus.getDefault().post(new GetKeyStatusEvent());
            keyTime = new Date().getTime()+300;
            keyTime = new Date().getTime()+500;
            if(handler.hasMessages(0)){
                handler.removeMessages(0);
            }

 keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/ManageCabinetActivity.java

@@ -570,7 +570,7 @@
            }
            //发送查询钥匙号
            EventBus.getDefault().post(new GetKeyStatusEvent());
            keyTime = new Date().getTime()+300;
            keyTime = new Date().getTime()+500;
            if(handler.hasMessages(0)){
                handler.removeMessages(0);
            }

 keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/main/MainActivity.java

@@ -339,6 +339,9 @@
                    if(devConfigBean.getBannerList()!=null) {
                        setBanner(devConfigBean.getBannerList());
                    }
                    if(!isFaceOk) {
                        initLicense();
                    }
                    setJiuConfig();
                    initPort();
                }
@@ -398,6 +401,10 @@
        switch (type){
            case 2:
            case 3: {
                if(!isFaceOk) {
                    initLicense();
                    return;
                }
                //校验是否登录
                if(MApplication.getConfigBean().getId()==null){
                    Toast.makeText(mContext, "设备未添加，无法操作", Toast.LENGTH_SHORT).show();
@@ -482,9 +489,6 @@
        mAPI.setNavigationBarVisibility(YNHAPI.NavigationBarVisibility.ALWAYS_INVISIBLE);
        mAPI.setBootLaunchApk("com.doumee.keyCabinet", true);
        showTime = System.currentTimeMillis();
        if(!isFaceOk) {
            initLicense();
        }
        if(isHavePermission) {
            checkUpdate();
        }
@@ -1294,9 +1298,6 @@
            if(bytes.length==0){
                return;
            }
            runOnUiThread(() -> {
                getVM().addInfo("获取到门数据:"+StringUtil.DateToStrSS(new Date())+"==>"+ SportUtils.bytesToHexSimple(bytes));
            });
            EventBus.getDefault().post(new CLGridEvent(SportUtils.bytesToHexSimple(bytes)));
        }
    };
@@ -1314,6 +1315,7 @@
            String data = e.getData();
            data = data.toUpperCase();
            data = data.replaceAll("\\s+", "");
            String finalData = data;
            if(data.startsWith("8A")){
                //开锁反馈
                String bh = data.substring(2,4);
@@ -1374,6 +1376,9 @@
                    }
                }
            }else if(data.startsWith("81")){
                runOnUiThread(() -> {
                    getVM().addInfo(">>>>>>>>>>>>>>>获取到关门数据:"+StringUtil.DateToStrSS(new Date())+"==>"+ finalData);
                });
                //主动关门 81 01 01 11 90
                String bh = data.substring(2,4);
                String tdh = data.substring(4,6);
@@ -1394,6 +1399,9 @@
                }
            }else if(data.startsWith("80")){
                //查询所有门状态
                runOnUiThread(() -> {
                    getVM().addInfo("<<<<<<<<<<<<<<<<<<<<获取到所有门状态数据:"+StringUtil.DateToStrSS(new Date())+"==>"+ finalData);
                });
                //80 01 00 00 FF FF 33 B2
                //80 02 00 00 00 F7 33 46
                if(data.length()>=14){
@@ -1767,9 +1775,9 @@
    private boolean isInitPort;
    //初始化串口
    private void initPort(){
        //SpUtil.setString("port_grid","/dev/ttyS7");
        //SpUtil.setString("port_key","/dev/ttyS1");
        //SpUtil.setString("port_jiu","/dev/ttyS2");
        SpUtil.setString("port_grid","/dev/ttyS7");
        SpUtil.setString("port_key","/dev/ttyS1");
        SpUtil.setString("port_jiu","/dev/ttyS2");
        gridPath = SpUtil.getString("port_grid");
        getVM().addInfo("门串口链接："+gridPath);
        keyPath = SpUtil.getString("port_key");

 server/meeting/meeting_admin/src/main/resources/bootstrap-dev.yml

@@ -10,11 +10,11 @@
        # 暂时关闭缓存
        enabled: false
    nacos:
      server-addr: http://192.168.0.7:8848 #配置Nacos地址
      server-addr: http://192.168.0.3:8848 #配置Nacos地址
      username: nacos
      password: nacos
      config:
        server-addr: http://192.168.0.7:8848 #配置Nacos地址
        server-addr: http://192.168.0.3:8848 #配置Nacos地址
        namespace: wuhu_visit_dev
#        namespace: dev_renkang
        username: nacos
@@ -23,7 +23,7 @@
#        group: dev
#        data-id: com.doumee.meeting.admin
      discovery:
        server-addr: http://192.168.0.7:8848 #配置Nacos地址
        server-addr: http://192.168.0.3:8848 #配置Nacos地址
#        namespace: dev_renkang
        namespace: dmvisit
        username: nacos

 server/meeting/meeting_admin/src/main/resources/bootstrap-pro.yml

@@ -14,7 +14,7 @@
      username: nacos
      password: Atwl@2024
      #      config:
      #        server-addr: http://192.168.0.7:8848 #配置Nacos地址
      #        server-addr: http://192.168.0.3:8848 #配置Nacos地址
      #        namespace: dmvisit
      #        username: nacos
      #        password: nacos

 server/meeting/meeting_admin/src/main/resources/bootstrap-self.yml

@@ -10,11 +10,11 @@
        # 暂时关闭缓存
        enabled: false
    nacos:
      server-addr: http://192.168.0.7:8848 #配置Nacos地址
      server-addr: http://192.168.0.3:8848 #配置Nacos地址
      username: nacos
      password: nacos
      config:
        server-addr: http://192.168.0.7:8848 #配置Nacos地址
        server-addr: http://192.168.0.3:8848 #配置Nacos地址
        namespace: wuhu_visit_dev
#        namespace: dev_renkang
        username: nacos
@@ -23,7 +23,7 @@
#        group: dev
#        data-id: com.doumee.meeting.admin
      discovery:
        server-addr: http://192.168.0.7:8848 #配置Nacos地址
        server-addr: http://192.168.0.3:8848 #配置Nacos地址
#        namespace: wuhu_visit_dev
        namespace: dmvisit_dev
        username: nacos

 server/meeting/meeting_admin/src/main/resources/bootstrap-test.yml

@@ -10,11 +10,11 @@
        # 暂时关闭缓存
        enabled: false
    nacos:
      server-addr: http://192.168.0.7:8848 #配置Nacos地址
      server-addr: http://192.168.0.3:8848 #配置Nacos地址
      username: nacos
      password: nacos
      config:
        server-addr: http://192.168.0.7:8848 #配置Nacos地址
        server-addr: http://192.168.0.3:8848 #配置Nacos地址
        namespace: wuhu_visit_test
        username: nacos
        password: nacos
@@ -22,7 +22,7 @@
#        group: dev
#        data-id: com.doumee.meeting.admin
      discovery:
        server-addr: http://192.168.0.7:8848 #配置Nacos地址
        server-addr: http://192.168.0.3:8848 #配置Nacos地址
        namespace: wuhu_visit_test
        username: nacos
        password: nacos

 server/system_gateway/src/main/resources/bootstrap-dev.yml

@@ -1,11 +1,11 @@
spring:
  cloud:
    nacos:
      server-addr: http://192.168.0.7:8848 #配置Nacos地址
      server-addr: http://192.168.0.3:8848 #配置Nacos地址
      username: nacos
      password: nacos
      discovery:
        server-addr: http://192.168.0.7:8848 #配置Nacos地址
        server-addr: http://192.168.0.3:8848 #配置Nacos地址
#        namespace: dmvisit
        namespace: wuhu_visit_dev
        username: nacos

 server/system_gateway/src/main/resources/bootstrap-self.yml

@@ -1,11 +1,11 @@
spring:
  cloud:
    nacos:
      server-addr: http://192.168.0.7:8848 #配置Nacos地址
      server-addr: http://192.168.0.3:8848 #配置Nacos地址
      username: nacos
      password: nacos
      discovery:
        server-addr: http://192.168.0.7:8848 #配置Nacos地址
        server-addr: http://192.168.0.3:8848 #配置Nacos地址
#        namespace: dmvisit
        namespace: wuhu_visit_dev
        username: nacos

 server/system_gateway/src/main/resources/bootstrap-test.yml

@@ -1,11 +1,11 @@
spring:
  cloud:
    nacos:
      server-addr: http://192.168.0.7:8848 #配置Nacos地址
      server-addr: http://192.168.0.3:8848 #配置Nacos地址
      username: nacos
      password: nacos
      discovery:
        server-addr: http://192.168.0.7:8848 #配置Nacos地址
        server-addr: http://192.168.0.3:8848 #配置Nacos地址
        #        namespace: dmvisit
        namespace: wuhu_visit_test
        username: nacos

 server/system_gateway/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
spring:
  profiles:
    active: pro
    active: dev
  application:
    name: system_gateway
  # 安全配置

 server/system_service/src/main/java/com/doumee/dao/business/model/Company.java

@@ -157,6 +157,20 @@
    @ExcelColumn(name="飞书最近同步时间")
    private Date fsDate;

    @ApiModelProperty(value = "相关方使用 对接组织")
    private Integer relationCompanyId;

    @ApiModelProperty(value = "相关方使用 对接人员")
    private Integer relationUserId;

    @ApiModelProperty(value = "相关方使用 对接组织名称")
    @TableField(exist = false)
    private String relationCompanyName;

    @ApiModelProperty(value = "相关方使用 对接人员名称")
    @TableField(exist = false)
    private String relationUserName;

    @ApiModelProperty(value = "分类编码名称")
    @TableField(exist = false)
    private String categoryName;

 server/system_timer/src/main/resources/bootstrap-dev.yml

@@ -12,11 +12,11 @@
        # 暂时关闭缓存
        enabled: false
    nacos:
      server-addr: http://192.168.0.7:8848 #配置Nacos地址
      server-addr: http://192.168.0.3:8848 #配置Nacos地址
      username: nacos
      password: nacos
      #      config:
      #        server-addr: http://192.168.0.7:8848 #配置Nacos地址
      #        server-addr: http://192.168.0.3:8848 #配置Nacos地址
      #        namespace: dmvisit
      #        username: nacos
      #        password: nacos
@@ -24,7 +24,7 @@
      #        group: dev
      #        data-id: com.doumee.meeting.admin
      discovery:
        server-addr: http://192.168.0.7:8848 #配置Nacos地址
        server-addr: http://192.168.0.3:8848 #配置Nacos地址
        namespace: wuhu_visit_dev
        username: nacos
        password: nacos

 server/system_timer/src/main/resources/bootstrap-pro.yml

@@ -16,7 +16,7 @@
      username: nacos
      password: nacos
      #      config:
      #        server-addr: http://192.168.0.7:8848 #配置Nacos地址
      #        server-addr: http://192.168.0.3:8848 #配置Nacos地址
      #        namespace: dmvisit
      #        username: nacos
      #        password: nacos

 server/system_timer/src/main/resources/bootstrap-self.yml

@@ -10,11 +10,11 @@
        # 暂时关闭缓存
        enabled: false
    nacos:
      server-addr: http://192.168.0.7:8848 #配置Nacos地址
      server-addr: http://192.168.0.3:8848 #配置Nacos地址
      username: nacos
      password: nacos
      #      config:
      #        server-addr: http://192.168.0.7:8848 #配置Nacos地址
      #        server-addr: http://192.168.0.3:8848 #配置Nacos地址
      #        namespace: dmvisit
      #        username: nacos
      #        password: nacos
@@ -22,7 +22,7 @@
      #        group: dev
      #        data-id: com.doumee.meeting.admin
      discovery:
        server-addr: http://192.168.0.7:8848 #配置Nacos地址
        server-addr: http://192.168.0.3:8848 #配置Nacos地址
        namespace: wuhu_visit_dev
        username: nacos
        password: nacos

 server/system_timer/src/main/resources/bootstrap-test.yml

@@ -10,11 +10,11 @@
        # 暂时关闭缓存
        enabled: false
    nacos:
      server-addr: http://192.168.0.7:8848 #配置Nacos地址
      server-addr: http://192.168.0.3:8848 #配置Nacos地址
      username: nacos
      password: nacos
      #      config:
      #        server-addr: http://192.168.0.7:8848 #配置Nacos地址
      #        server-addr: http://192.168.0.3:8848 #配置Nacos地址
      #        namespace: dmvisit
      #        username: nacos
      #        password: nacos
@@ -22,7 +22,7 @@
      #        group: dev
      #        data-id: com.doumee.meeting.admin
      discovery:
        server-addr: http://192.168.0.7:8848 #配置Nacos地址
        server-addr: http://192.168.0.3:8848 #配置Nacos地址
        namespace: wuhu_visit_test
        username: nacos
        password: nacos

 server/system_timer/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
spring:
  profiles:
    active: pro
    active: dev
  application:
    name: systemTimer
    # 安全配置

 server/visits/admin_timer/src/main/resources/bootstrap-dev.yml

@@ -10,11 +10,11 @@
        # 暂时关闭缓存
        enabled: false
    nacos:
      server-addr: http://192.168.0.7:8848 #配置Nacos地址
      server-addr: http://192.168.0.3:8848 #配置Nacos地址
      username: nacos
      password: nacos
#      config:
#        server-addr: http://192.168.0.7:8848 #配置Nacos地址
#        server-addr: http://192.168.0.3:8848 #配置Nacos地址
#        namespace: dmvisit
#        username: nacos
#        password: nacos
@@ -22,7 +22,7 @@
#        group: dev
#        data-id: com.doumee.meeting.admin
      discovery:
        server-addr: http://192.168.0.7:8848 #配置Nacos地址
        server-addr: http://192.168.0.3:8848 #配置Nacos地址
        namespace: wuhu_visit_dev
        username: nacos
        password: nacos

 server/visits/admin_timer/src/main/resources/bootstrap-pro.yml

@@ -14,7 +14,7 @@
      username: nacos
      password: nacos
      #      config:
      #        server-addr: http://192.168.0.7:8848 #配置Nacos地址
      #        server-addr: http://192.168.0.3:8848 #配置Nacos地址
      #        namespace: dmvisit
      #        username: nacos
      #        password: nacos

 server/visits/admin_timer/src/main/resources/bootstrap-self.yml

@@ -10,11 +10,11 @@
        # 暂时关闭缓存
        enabled: false
    nacos:
      server-addr: http://192.168.0.7:8848 #配置Nacos地址
      server-addr: http://192.168.0.3:8848 #配置Nacos地址
      username: nacos
      password: nacos
#      config:
#        server-addr: http://192.168.0.7:8848 #配置Nacos地址
#        server-addr: http://192.168.0.3:8848 #配置Nacos地址
#        namespace: dmvisit
#        username: nacos
#        password: nacos
@@ -22,7 +22,7 @@
#        group: dev
#        data-id: com.doumee.meeting.admin
      discovery:
        server-addr: http://192.168.0.7:8848 #配置Nacos地址
        server-addr: http://192.168.0.3:8848 #配置Nacos地址
        namespace: dmvisit
        username: nacos
        password: nacos

 server/visits/admin_timer/src/main/resources/bootstrap-test.yml

@@ -10,11 +10,11 @@
        # 暂时关闭缓存
        enabled: false
    nacos:
      server-addr: http://192.168.0.7:8848 #配置Nacos地址
      server-addr: http://192.168.0.3:8848 #配置Nacos地址
      username: nacos
      password: nacos
#      config:
#        server-addr: http://192.168.0.7:8848 #配置Nacos地址
#        server-addr: http://192.168.0.3:8848 #配置Nacos地址
#        namespace: dmvisit
#        username: nacos
#        password: nacos
@@ -22,7 +22,7 @@
#        group: dev
#        data-id: com.doumee.meeting.admin
      discovery:
        server-addr: http://192.168.0.7:8848 #配置Nacos地址
        server-addr: http://192.168.0.3:8848 #配置Nacos地址
        namespace: wuhu_visit_test
        username: nacos
        password: nacos

 server/visits/admin_timer/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
spring:
  profiles:
    active: pro
    active: dev
  application:
    name: visitsTimer
    # 安全配置

 server/visits/dmvisit_admin/src/main/resources/bootstrap-dev.yml

@@ -10,11 +10,11 @@
        # 暂时关闭缓存
        enabled: false
    nacos:
      server-addr: http://192.168.0.7:8848 #配置Nacos地址
      server-addr: http://192.168.0.3:8848 #配置Nacos地址
      username: nacos
      password: nacos
      discovery:
        server-addr: http://192.168.0.7:8848 #配置Nacos地址
        server-addr: http://192.168.0.3:8848 #配置Nacos地址
#        namespace: dmvisit
        namespace: wuhu_visit_dev
        username: nacos

 server/visits/dmvisit_admin/src/main/resources/bootstrap-pro.yml

@@ -14,7 +14,7 @@
      username: nacos
      password: nacos
#      config:
#        server-addr: http://192.168.0.7:8848 #配置Nacos地址
#        server-addr: http://192.168.0.3:8848 #配置Nacos地址
#        namespace: dmvisit
#        username: nacos
#        password: nacos

 server/visits/dmvisit_admin/src/main/resources/bootstrap-self.yml

@@ -10,11 +10,11 @@
        # 暂时关闭缓存
        enabled: false
    nacos:
      server-addr: http://192.168.0.7:8848 #配置Nacos地址
      server-addr: http://192.168.0.3:8848 #配置Nacos地址
      username: nacos
      password: nacos
#      config:
#        server-addr: http://192.168.0.7:8848 #配置Nacos地址
#        server-addr: http://192.168.0.3:8848 #配置Nacos地址
#        namespace: dmvisit
#        username: nacos
#        password: nacos
@@ -22,7 +22,7 @@
#        group: dev
#        data-id: com.doumee.meeting.admin
      discovery:
        server-addr: http://192.168.0.7:8848 #配置Nacos地址
        server-addr: http://192.168.0.3:8848 #配置Nacos地址
#        namespace: dmvisit
        namespace: wuhu_visit_dev
        username: nacos

 server/visits/dmvisit_admin/src/main/resources/bootstrap-test.yml

@@ -10,11 +10,11 @@
        # 暂时关闭缓存
        enabled: false
    nacos:
      server-addr: http://192.168.0.7:8848 #配置Nacos地址
      server-addr: http://192.168.0.3:8848 #配置Nacos地址
      username: nacos
      password: nacos
#      config:
#        server-addr: http://192.168.0.7:8848 #配置Nacos地址
#        server-addr: http://192.168.0.3:8848 #配置Nacos地址
#        namespace: dmvisit
#        username: nacos
#        password: nacos
@@ -22,7 +22,7 @@
#        group: dev
#        data-id: com.doumee.meeting.admin
      discovery:
        server-addr: http://192.168.0.7:8848 #配置Nacos地址
        server-addr: http://192.168.0.3:8848 #配置Nacos地址
        namespace: wuhu_visit_test
        username: nacos
        password: nacos

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCabinet.java

@@ -151,6 +151,10 @@
    @ApiModelProperty(value = "酒精检测开启：0=开启；1=关闭", example = "1")
    private Integer alcoholStatus;


    @ApiModelProperty(value = "归还钥匙双重验证 0否 1是", example = "1")
    private Integer returnDoubleAuth;

    @ApiModelProperty(value = "经纬度信息 参数值：经度,纬度")
    @TableField(exist = false)
    private String jwd;

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/CabinetInfoVO.java

@@ -67,6 +67,9 @@
    @ApiModelProperty(value = "酒精检测开启：0=开启；1=关闭", example = "1")
    private Integer alcoholStatus;

    @ApiModelProperty(value = "归还钥匙双重验证 0否 1是", example = "1")
    private Integer returnDoubleAuth;

    @ApiModelProperty(value = "轮播图地址", example = "1")
    private List<String> bannerList;


 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java

@@ -597,13 +597,13 @@
            queryWrapper.ge(Company::getFsDate, Utils.Date.getStart(pageWrap.getModel().getFsDate()));
            queryWrapper.le(Company::getFsDate, Utils.Date.getEnd(pageWrap.getModel().getFsDate()));
        }
        queryWrapper.leftJoin(Company.class,Company::getId,Company::getParentId);
        /*        .leftJoin(Member.class, Member::getId,Company::getHeadId)*/
        /*  queryWrapper.leftJoin(" company c on c.id=t.parent_id");*/
        queryWrapper.selectAll(Company.class)
                .select("(select count(m.id) from member m where m.COMPANY_ID=t.id and m.ISDELETED=0) as countNum") ;
        queryWrapper.select("t1.name",Company::getParentName);
        queryWrapper.select("t1.company_path",Company::getParentCompanyPath);
        queryWrapper.leftJoin(Company.class,Company::getId,Company::getParentId);
        queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getStatus()),Company::getStatus,Constants.ZERO);
        queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getName()),Company::getName,pageWrap.getModel().getName());
        queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getParentName()),"c.name",pageWrap.getModel().getParentName());
@@ -713,9 +713,13 @@
        queryWrapper.select("t1.name",Company::getParentName);
        queryWrapper.select("t1.company_path",Company::getParentCompanyPath);
        queryWrapper.select("t1.type",Company::getParentType);
        queryWrapper.select("c1.NAME",Company::getRelationCompanyName);
        queryWrapper.select("s1.NAME",Company::getRelationUserName);
        queryWrapper.leftJoin(Company.class,Company::getId,Company::getParentId);
        queryWrapper.leftJoin(Member.class,Member::getId,Company::getHeadId);
        queryWrapper.leftJoin(SystemUser.class,SystemUser::getId,Company::getEditor);
        queryWrapper.leftJoin("company c1 on t.RELATION_COMPANY_ID = c1.id");
        queryWrapper.leftJoin("member s1 on t.RELATION_USER_ID = s1.id");
        queryWrapper.eq(Company::getIsdeleted,Constants.ZERO);
        if(Objects.nonNull(type) && ( Constants.equalsInteger(type,Constants.ONE) || Constants.equalsInteger(type,Constants.ZERO))){
//            queryWrapper.eq(type!=null,Company::getType,type);

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InoutRecordServiceImpl.java

@@ -7,9 +7,11 @@
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.CategoryMapper;
import com.doumee.dao.business.InoutDayCountMapper;
import com.doumee.dao.business.InoutRecordMapper;
import com.doumee.dao.business.dto.InParkDataDTO;
import com.doumee.dao.business.model.Category;
import com.doumee.dao.business.model.InoutDayCount;
import com.doumee.dao.business.model.InoutRecord;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.vo.GeneralDataVO;
@@ -56,6 +58,9 @@

    @Autowired
    private CategoryMapper categoryMapper;

    @Autowired
    private InoutDayCountMapper inoutDayCountMapper;

    @Override
    public Integer create(InoutRecord inoutRecord) {
@@ -556,7 +561,19 @@
        TelecomInParkDataVO telecomInParkDataVO = new TelecomInParkDataVO();
        telecomInParkDataVO.setInCarNum(Constants.ZERO);
        telecomInParkDataVO.setInUserNum(Constants.ZERO);
        List<InoutRecord> listCar = inoutRecordMapper.selectList(new MPJLambdaWrapper<InoutRecord>()

        InoutDayCount inoutDayCount = inoutDayCountMapper.selectOne(new QueryWrapper<InoutDayCount>()
                .lambda()
                .apply(" DATE(TIME_INFO) = CURDATE()  ")
                .last(" limit 1 ")
        );

        if(Objects.nonNull(inoutDayCount)){
            telecomInParkDataVO.setInUserNum(inoutDayCount.getInMemberNum());
            telecomInParkDataVO.setInCarNum(inoutDayCount.getInCarNum());
        }

       /* List<InoutRecord> listCar = inoutRecordMapper.selectList(new MPJLambdaWrapper<InoutRecord>()
                        .eq(InoutRecord::getIsdeleted,Constants.ZERO)
                        .eq(InoutRecord::getInOrOut,Constants.ZERO)
                        .isNotNull(InoutRecord::getCarCode)
@@ -577,7 +594,7 @@
            telecomInParkDataVO.setInUserNum(
                    new HashSet<>(listUser.stream().map(i->i.getMemberPhone()).collect(Collectors.toList())).size()
            );
        }
        }*/

        return telecomInParkDataVO;
    }

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java

@@ -4,7 +4,6 @@
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.dingTalk.DingTalk;
import com.doumee.core.dingTalk.DingTalkStream;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.haikang.model.HKConstants;
import com.doumee.core.jiandaoyun.api.arch.DeptApiClient;
@@ -1189,6 +1188,7 @@
                        .selectAs(JkKeys::getCarCode,JkCabinetGrid::getCarCode)
                        .selectAs(JkKeys::getRfidLable,JkCabinetGrid::getKeyCode)
                        .selectAs(JkKeys::getStatus,JkCabinetGrid::getKeyStatus)
                        .selectAs(JkKeys::getCarId,JkCabinetGrid::getCarId)
                        .leftJoin(JkKeys.class,JkKeys::getId,JkCabinetGrid::getKeyId)
                        .leftJoin(JkCabinet.class,JkCabinet::getId,JkCabinetGrid::getCabinetId)
                        .eq(JkCabinet::getCode,dto.getCode())
@@ -1219,6 +1219,21 @@
                            .eq(JkKeys::getId,jkCabinetGrid.getKeyId())
                    );
                    log.error("钥匙柜信息推送实际钥匙变化："+jkCabinetGrid.getKeyCode());
                    JkCabinetLog cabinetLog = new JkCabinetLog();
                    cabinetLog.setCabinetId(jkCabinetGrid.getCabinetId());
                    cabinetLog.setGridId(jkCabinetGrid.getId());
                    cabinetLog.setKeyId(jkCabinetGrid.getKeyId());
                    cabinetLog.setCarId(jkCabinetGrid.getCarId());
                    cabinetLog.setKeyInfo(jkCabinetGrid.getCarCode() + " " + jkCabinetGrid.getKeyCode());
                    cabinetLog.setType(Constants.ONE);
                    cabinetLog.setStatus(Constants.ZERO);
                    cabinetLog.setAuthType(3);
                    cabinetLog.setKeyStatus(Constants.TWO);
                    cabinetLog.setIsNotice(Constants.ZERO);
                    cabinetLog.setInfo("硬件同步-钥匙不在位");
                    cabinetLog.setIsdeleted(Constants.ZERO);
                    cabinetLog.setCreateDate(new Date());
                    jkCabinetLogMapper.insert(cabinetLog);
                }
            }else{
                if(!Constants.equalsInteger(jkCabinetGrid.getKeyStatus(),Constants.ONE)){
@@ -1227,6 +1242,21 @@
                            .eq(JkKeys::getId,jkCabinetGrid.getKeyId())
                    );
                    log.error("钥匙柜信息推送实际钥匙变化："+jkCabinetGrid.getKeyCode());
                    JkCabinetLog cabinetLog = new JkCabinetLog();
                    cabinetLog.setCabinetId(jkCabinetGrid.getCabinetId());
                    cabinetLog.setGridId(jkCabinetGrid.getId());
                    cabinetLog.setKeyId(jkCabinetGrid.getKeyId());
                    cabinetLog.setCarId(jkCabinetGrid.getCarId());
                    cabinetLog.setKeyInfo(jkCabinetGrid.getCarCode() + " " + jkCabinetGrid.getKeyCode());
                    cabinetLog.setType(Constants.ONE);
                    cabinetLog.setStatus(Constants.ZERO);
                    cabinetLog.setAuthType(3);
                    cabinetLog.setKeyStatus(Constants.ONE);
                    cabinetLog.setIsNotice(Constants.ZERO);
                    cabinetLog.setInfo("硬件同步-钥匙在位");
                    cabinetLog.setIsdeleted(Constants.ZERO);
                    cabinetLog.setCreateDate(new Date());
                    jkCabinetLogMapper.insert(cabinetLog);
                }
            }
//            if(StringUtils.isBlank(jkCabinetGrid.getKeyCode())

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetServiceImpl.java

@@ -88,6 +88,8 @@
            || Objects.isNull(jkCabinet.getColumnNum())
            || jkCabinet.getColumnNum() <= Constants.ZERO
            || Objects.isNull(jkCabinet.getNoType())
                || Objects.isNull(jkCabinet.getDoubleAuth())
                || Objects.isNull(jkCabinet.getReturnDoubleAuth())
            || Objects.isNull(jkCabinet.getSortType())
            || (
                Constants.equalsInteger(jkCabinet.getNoType(),Constants.ONE)
@@ -216,6 +218,8 @@
                || Objects.isNull(jkCabinet.getPort())
                || Objects.isNull(jkCabinet.getDoubleAuth())
                || Objects.isNull(jkCabinet.getAlcoholStatus())
                || Objects.isNull(jkCabinet.getDoubleAuth())
                || Objects.isNull(jkCabinet.getReturnDoubleAuth())
        ){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/mqtt/MqttPushCallback.java

@@ -27,7 +27,7 @@
/**
 * @author T14
 */
@Service
@Service("deviceMqttPushCallback")
@Slf4j
public class MqttPushCallback implements MqttCallback {


 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/mqtt/MqttSubServiceImpl.java

@@ -17,6 +17,7 @@
@Slf4j
public class MqttSubServiceImpl implements MqttBizService {
    @Autowired
    @org.springframework.beans.factory.annotation.Qualifier("deviceMqttPushCallback")
    private MqttPushCallback callBack ;
    @Override
    public MqttClient subscribe(MqttClient client,MqttConfig config,String[] topics){