fix:安全追溯-企业许可超期

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

@@ -2573,9 +2573,14 @@
         AND ul.expiry_date <![CDATA[<]]> to_char( now( ), 'YYYY-MM-DD' )
     </select>
 
-    <update id="updateEnterpriseSafetyStatus">
-        update tz_base_enterprise_info
-            set status = '1'
-        where use_unit_code in (#{useUnitCodeList})
-    </update>
+   <update id="updateEnterpriseSafetyStatus">
+    update tz_base_enterprise_info
+    set status = '1'
+    where use_unit_code in
+    <foreach item="item" index="index" collection="useUnitCodeList"
+             open="(" separator="," close=")">
+        #{item}
+    </foreach>
+</update>
+
 </mapper>

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/listener/SafetyProblemTopicMessage.java

@@ -163,7 +163,7 @@ public class SafetyProblemTopicMessage extends EmqxListener {
                 SafetyProblemTracing safetyProblemTracing = new SafetyProblemTracing();
                 safetyProblemTracing.setProblemType(problemTypeEnum.getName());
                 safetyProblemTracing.setProblemTypeCode(problemTypeEnum.getCode());
-                safetyProblemTracing.setProblemDesc(problemTypeEnum.getDesc());
+                safetyProblemTracing.setProblemDesc(problemTypeEnum.getDesc() + "-" + json.getOrDefault("itemName", "") + "-" + json.getOrDefault("subItemName", ""));
                 safetyProblemTracing.setSourceType(SafetyProblemSourceTypeEnum.UNIT.getName());
                 safetyProblemTracing.setSourceTypeCode(SafetyProblemSourceTypeEnum.UNIT.getCode());
                 safetyProblemTracing.setSourceId(json.getOrDefault("licenceSeq", "").toString());

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

@@ -11,7 +11,6 @@ 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.TzBaseEnterpriseInfo;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.TzBaseEnterpriseInfoMapper;
 import net.javacrumbs.shedlock.spring.annotation.SchedulerLock;
 import org.eclipse.paho.client.mqttv3.MqttException;
@@ -21,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.component.emq.EmqKeeper;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
 import java.nio.charset.StandardCharsets;
 import java.util.List;
@@ -141,6 +141,9 @@ public class SafetyProblemTracingGenServiceImpl{
 
     private void updateEnterpriseAndSendMessage(List<Map<String, Object>> mapList) {
         Set<String> outOfUnitLicenseList = mapList.stream().map(m -> m.get("useUnitCode").toString()).collect(Collectors.toSet());
+        if (ValidationUtil.isEmpty(outOfUnitLicenseList)) {
+            return;
+        }
         // 更新企业问题状态为未处理（异常）-多个许可超期归并一个企业问题
         commonMapper.updateEnterpriseSafetyStatus(outOfUnitLicenseList);
         sendSafetyProblemMessage(mapList, SafetyProblemTypeEnum.XKCQ);