rk
2026-05-29 f2889bd1adbd3021f6ca0c596eb8633d41c79cfb
报表数据
已修改27个文件
170 ■■■■■ 文件已修改
server/meeting/meeting_admin/src/main/resources/bootstrap-dev.yml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/meeting/meeting_admin/src/main/resources/bootstrap-pro.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/meeting/meeting_admin/src/main/resources/bootstrap-self.yml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/meeting/meeting_admin/src/main/resources/bootstrap-test.yml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_gateway/src/main/resources/bootstrap-dev.yml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_gateway/src/main/resources/bootstrap-self.yml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_gateway/src/main/resources/bootstrap-test.yml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_service/src/main/java/com/doumee/dao/business/model/Company.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_timer/src/main/resources/bootstrap-dev.yml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_timer/src/main/resources/bootstrap-pro.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_timer/src/main/resources/bootstrap-self.yml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_timer/src/main/resources/bootstrap-test.yml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_timer/src/main/resources/bootstrap.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/admin_timer/src/main/resources/bootstrap-dev.yml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/admin_timer/src/main/resources/bootstrap-pro.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/admin_timer/src/main/resources/bootstrap-self.yml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/admin_timer/src/main/resources/bootstrap-test.yml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/admin_timer/src/main/resources/bootstrap.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_admin/src/main/resources/bootstrap-dev.yml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_admin/src/main/resources/bootstrap-pro.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_admin/src/main/resources/bootstrap-self.yml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_admin/src/main/resources/bootstrap-test.yml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InoutRecordServiceImpl.java 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/mqtt/MqttPushCallback.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/mqtt/MqttSubServiceImpl.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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_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/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/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){