Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/CommonMapper.xml

@@ -2628,7 +2628,8 @@
             tup.sequence_nbr permissionSeq,
             tup.cert_no certNo,
             tup.expiry_date expiryDate,
-            tui.name  userName
+            tui.name  userName,
+            tui.sequence_nbr userSeq
         FROM
         tzs_user_permission tup
         LEFT JOIN tzs_user_info tui ON tup.user_seq = tui.sequence_nbr

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/SafetyProblemTracingGenServiceImpl.java

@@ -3,7 +3,9 @@ package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.google.common.collect.Lists;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.module.common.api.dao.ESEquipmentCategory;
 import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.SafetyProblemTracing;
@@ -11,7 +13,9 @@ import com.yeejoin.amos.boot.module.jg.api.enums.SafetyProblemStatusEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.SafetyProblemTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.CommonMapper;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgOtherInfo;
+import com.yeejoin.amos.boot.module.ymt.api.entity.TzsUserInfo;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.TzBaseEnterpriseInfoMapper;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.TzsUserInfoMapper;
 import net.javacrumbs.shedlock.spring.annotation.SchedulerLock;
 import org.eclipse.paho.client.mqttv3.MqttException;
 import org.slf4j.Logger;
@@ -54,20 +58,21 @@ public class SafetyProblemTracingGenServiceImpl{
 
     @Autowired
     TzBaseEnterpriseInfoMapper baseEnterpriseInfoMapper;
-
+    @Autowired
+    TzsUserInfoMapper tzsUserInfoMapper;
     @Scheduled(cron = "0 0 1 * * ?")
     @SchedulerLock(name = "executeSafetyProblemCheck", lockAtMostFor = "PT5H", lockAtLeastFor = "PT10M")
     public void executeSafetyProblemCheck() {
-        executeMaintenanceCheck();
-        executeInspectionCheck();
+        //executeMaintenanceCheck();
+        //executeInspectionCheck();
         executePersonnalCertificationCheck();
-        executeEnterpriseQualificationCheck();
+        //executeEnterpriseQualificationCheck();
     }
 
     private void executePersonnalCertificationCheck() {
         logger.info("开始人员资质超期检查");
         List<Map<String, Object>> certificationRecords = commonMapper.queryOutOfCertificationRecord();
-        sendSafetyProblemMessage(certificationRecords, SafetyProblemTypeEnum.ZZCQ);
+        updateUserInfoAndSendMessage(certificationRecords);
         logger.info("人员资质超期检查结束");
     }
 
@@ -157,6 +162,18 @@ public class SafetyProblemTracingGenServiceImpl{
         sendSafetyProblemMessage(mapList, SafetyProblemTypeEnum.XKCQ);
     }
 
+    private void updateUserInfoAndSendMessage(List<Map<String, Object>> certificationRecords) {
+        Set<String> outOfUnitLicenseList = certificationRecords.stream().map(m -> m.get("userSeq").toString()).collect(Collectors.toSet());
+        if (!ValidationUtil.isEmpty(outOfUnitLicenseList)) {
+                LambdaUpdateWrapper<TzsUserInfo> up = new LambdaUpdateWrapper();
+                up.in(BaseEntity::getSequenceNbr,outOfUnitLicenseList);
+                up.set(TzsUserInfo::getQrCodeState,0);
+                tzsUserInfoMapper.update(null,up);
+        }
+        sendSafetyProblemMessage(certificationRecords, SafetyProblemTypeEnum.ZZCQ);
+
+    }
+
     /**
      * 发送安全问题
      * @param mapList