1.自动任务不执行bug

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/pom.xml

@@ -30,6 +30,10 @@
             <groupId>net.javacrumbs.shedlock</groupId>
             <artifactId>shedlock-spring</artifactId>
         </dependency>
+        <dependency>
+            <groupId>net.javacrumbs.shedlock</groupId>
+            <artifactId>shedlock-provider-redis-spring</artifactId>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/config/ShedLockConfig.java

+package com.yeejoin.amos.boot.module.jyjc.biz.config;
+
+import net.javacrumbs.shedlock.core.LockProvider;
+import net.javacrumbs.shedlock.provider.redis.spring.RedisLockProvider;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+
+/**
+ * @author Administrator
+ */
+@Configuration
+public class ShedLockConfig {
+
+    @Bean
+    public LockProvider lockProvider(RedisConnectionFactory connectionFactory) {
+        return new RedisLockProvider(connectionFactory);
+    }
+}

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/event/listener/InspectionApplicationPushEventListener.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jyjc.biz.event.listener;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Sequence;
@@ -16,6 +17,7 @@ import com.yeejoin.amos.boot.module.jyjc.biz.event.InspectionApplicationPushEven
 import com.yeejoin.amos.boot.module.jyjc.biz.kafka.KafkaProducer;
 import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.JyjcInspectionApplicationEquipServiceImpl;
 import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.JyjcInspectionApplicationPushLogServiceImpl;
+import com.yeejoin.amos.boot.module.jyjc.biz.util.JyjcConstant;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgConstructionInfo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgRegisterInfo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo;
@@ -204,35 +206,53 @@ public class InspectionApplicationPushEventListener implements ApplicationListen
 
     private Map<String, Object> populateEquipInfoWithTechParams(String equList, String record) {
         EquipCategoryEnum productType = EquipCategoryEnum.of(Integer.parseInt(equList));
+        Map<String, Object> echParamMap = new HashMap<>();
         switch (Objects.requireNonNull(productType)) {
             // 锅炉 - 监管未调整
             case IDX_BIZ_JG_TECH_PARAMS_BOILER:
-                return BeanUtil.beanToMap(equipTechParamBoilerMapper.queryTechParamInUse(record));
                 // 压力容器 - 监管未调整
+                echParamMap = BeanUtil.beanToMap(equipTechParamBoilerMapper.queryTechParamInUse(record));
+                break;
             case IDX_BIZ_JG_TECH_PARAMS_VESSEL:
-                return BeanUtil.beanToMap(equipTechParamVesselMapper.queryTechParamInUse(record));
                 // 电梯
+                echParamMap = BeanUtil.beanToMap(equipTechParamVesselMapper.queryTechParamInUse(record));
+                break;
             case IDX_BIZ_JG_TECH_PARAMS_ELEVATOR:
-                return BeanUtil.beanToMap(equipTechParamElevatorMapper.queryTechParamInUse(record));
                 // 起重机械
+                echParamMap = BeanUtil.beanToMap(equipTechParamElevatorMapper.queryTechParamInUse(record));
+                break;
             case IDX_BIZ_JG_TECH_PARAMS_LIFTING:
-                return BeanUtil.beanToMap(equipTechParamLiftingMapper.queryTechParamInUse(record));
                 // 场（厂）内专用机动车辆
+                echParamMap = BeanUtil.beanToMap(equipTechParamLiftingMapper.queryTechParamInUse(record));
+                break;
             case IDX_BIZ_JG_TECH_PARAMS_VEHICLE:
-                return BeanUtil.beanToMap(equipTechParamVehicleMapper.queryTechParamInUse(record));
                 // 大型游乐设施
+                echParamMap = BeanUtil.beanToMap(equipTechParamVehicleMapper.queryTechParamInUse(record));
+                break;
             case IDX_BIZ_JG_TECH_PARAMS_RIDES:
-                return BeanUtil.beanToMap(equipTechParamRidesMapper.queryTechParamInUse(record));
                 // 压力管道 - 监管未调整
+                echParamMap = BeanUtil.beanToMap(equipTechParamRidesMapper.queryTechParamInUse(record));
+                break;
             case IDX_BIZ_JG_TECH_PARAMS_PIPELINE:
-                return BeanUtil.beanToMap(equipTechParamPipelineMapper.queryTechParamInUse(record));
                 // 客运索道
+                echParamMap = BeanUtil.beanToMap(equipTechParamPipelineMapper.queryTechParamInUse(record));
+                break;
             case IDX_BIZ_JG_TECH_PARAMS_ROPEWAY:
-                return BeanUtil.beanToMap(equipTechParamRopewayMapper.queryTechParamInUse(record));
+                echParamMap = BeanUtil.beanToMap(equipTechParamRopewayMapper.queryTechParamInUse(record));
+                break;
             default:
                 break;
         }
-        return null;
+        this.castStr2JsonField(echParamMap);
+        return echParamMap;
+    }
+
+    private void castStr2JsonField(Map<String, Object> echParamMap) {
+        echParamMap.forEach((k, v) -> {
+            if (JyjcConstant.TECH_PARAM_JSON_FIELDS.contains(k) && v != null) {
+                echParamMap.put(k, JSON.parse(v.toString()));
+            }
+        });
     }
 
     private String getAddressByRecord(String equipUnicode) {

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/util/JyjcConstant.java

@@ -8,5 +8,5 @@ public class JyjcConstant {
     /**
      * 技术参数json类型字段
      */
-    public static final String[] TECH_PARAM_JSON_FIELDS = {"safetyAccessoriesAndRelatedDevices", "gasCylinderAccessories"};
+    public static final String TECH_PARAM_JSON_FIELDS = "safetyAccessoriesAndRelatedDevices, gasCylinderAccessories";
 }