修改：核酸检测清理，增加定时任务：icNatClearTask

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/ic/IcNatClearTask.java

@@ -0,0 +1,39 @@
+package com.epmet.task.ic;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.TypeReference;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.feign.EpmetUserOpenFeignClient;
+import com.epmet.task.ITask;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @ClassName IcNatClearTask
+ * @Description 核酸检测定时清理
+ * @Author wangxianzhang
+ * @Date 2022/11/29 13:41
+ */
+@Slf4j
+@Component("icNatClearTask")
+public class IcNatClearTask implements ITask {
+
+    @Autowired
+    private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
+
+    @Override
+    public void run(String jsonParams) {
+        Map<String, Object> paramMap;
+        if (StringUtils.isNotBlank(jsonParams)) {
+            paramMap = JSON.parseObject(jsonParams, new TypeReference<Map<String, Object>>(){});
+        } else {
+            paramMap = new HashMap<>();
+        }
+        epmetUserOpenFeignClient.clearNatRecords(paramMap);
+    }
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

@@ -959,4 +959,14 @@ public interface EpmetUserOpenFeignClient {
     @PostMapping("/epmetuser/icresiuser/rhzkList")
     Result<List<RHZKStatisticsResultDTO>> renHuCondition(@RequestBody RHZKStatisticsFormDTO formDTO);
 
+    /**
+     * 清楚核酸检测记录（只保留近n天）
+     * @author wxz
+     * @date 2022/11/28 下午5:36
+     * * @param map 接受json反序列化，简单传递参数，避免定义过多dto
+     *         k:retentionDays  v:保留最近多少天(Integer)
+     * * @return Result
+     */
+    @PostMapping("/epmetuser/icNat/clearNatRecords")
+    Result clearNatRecords(@RequestBody Map<String, Object> map);
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java

@@ -751,4 +751,9 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
     public Result<List<RHZKStatisticsResultDTO>> renHuCondition(RHZKStatisticsFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "renHuCondition", formDTO);
     }
+
+    @Override
+    public Result clearNatRecords(Map<String, Object> map) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "clearNatRecords", map);
+    }
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java

@@ -334,7 +334,8 @@ public class IcNatController implements ResultDataResolver {
      * 清楚核酸检测记录（只保留近n天）
      * @author wxz
      * @date 2022/11/28 下午5:36
-     * * @param map
+     * * @param map 接受json反序列化，简单传递参数，避免定义过多dto
+     *         k:retentionDays  v:保留最近多少天(Integer)
      * * @return Result
      */
     @PostMapping("clearNatRecords")
@@ -342,8 +343,8 @@ public class IcNatController implements ResultDataResolver {
         // 保留天数
         Integer retentionDays = (Integer) map.get("retentionDays");
 
-        // 如果是-1直接不做任何操作
+        // 如果是非正数直接不做任何操作
-        if (-1 != retentionDays) {
+        if (retentionDays != null && retentionDays > 0) {
             icNucleinService.clearNatRecords(retentionDays);
         }