数字社区单独部署 支持的定时任务 拆分2个任务

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java

@@ -23,6 +23,7 @@ import com.epmet.dto.user.result.MidPatrolDetailResult;
 import com.epmet.dto.user.result.MidPatrolRecordResult;
 import com.epmet.feign.impl.DataStatisticalOpenFeignClientFallBackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -362,6 +363,6 @@ public interface DataStatisticalOpenFeignClient {
      * @author LiuJanJun
      * @date 2022/1/18 4:37 下午
      */
-    @PostMapping("/data/stats/shibeiICJob/userPointAndProjectStatus")
+    @PostMapping("/data/stats/shibeiICJob/userPointAndProjectStatus/{bizType}")
-    Result userPointAndProjectStatus(@RequestBody ExtractOriginFormDTO formDTO);
+    Result userPointAndProjectStatus(@PathVariable("bizType") String biztype,@RequestBody ExtractOriginFormDTO formDTO);
 }

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java

@@ -341,7 +341,7 @@ public class DataStatisticalOpenFeignClientFallBack implements DataStatisticalOp
     }
 
     @Override
-    public Result userPointAndProjectStatus(ExtractOriginFormDTO formDTO) {
+    public Result userPointAndProjectStatus(String biztype,ExtractOriginFormDTO formDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "userPointAndProjectStatus", formDTO);
+        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "userPointAndProjectStatus", biztype,formDTO);
     }
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ShiBeiICJobController.java

@@ -2,6 +2,7 @@ package com.epmet.controller;
 
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
+import com.epmet.commons.tools.enums.BizTypeEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.redis.RedisKeys;
 import com.epmet.commons.tools.redis.RedisUtils;
@@ -15,10 +16,7 @@ import com.epmet.service.evaluationindex.extract.toscreen.ScreenGrassrootsGovern
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -38,8 +36,8 @@ public class ShiBeiICJobController {
     @Autowired
     private RedisUtils redisUtils;
 
-    @PostMapping("userPointAndProjectStatus")
+    @PostMapping("userPointAndProjectStatus/{bizType}")
-    public Result<String> userPointAndProjectStatus(@RequestBody ExtractOriginFormDTO formDTO) {
+    public Result<String> userPointAndProjectStatus(@PathVariable("bizType") String bizType, @RequestBody ExtractOriginFormDTO formDTO) {
         if (StringUtils.isBlank(formDTO.getCustomerId())){
             return new Result<String>().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"参数错误cid不能为空");
         }
@@ -48,23 +46,30 @@ public class ShiBeiICJobController {
         if (StringUtils.isNotBlank(formDTO.getStartDate()) && StringUtils.isNotBlank(formDTO.getEndDate())) {
             List<String> daysBetween = DateUtils.getDaysBetween(formDTO.getStartDate(), formDTO.getEndDate());
             daysBetween.forEach(d -> {
-                this.extractUserPointData(formDTO.getCustomerId(), d);
+                executeMethod(bizType, formDTO.getCustomerId(), d);
-                this.agencyProjectStats(formDTO.getCustomerId(), formDTO.getDateId());
                 result.add(d);
-                redisUtils.hSet(RedisKeys.getBackDoorbizExcuteResult("userPointAndProjectStatus"), formDTO.getCustomerId(), result, 3 * 24 * 60 * 60L);
+                redisUtils.hSet(RedisKeys.getBackDoorbizExcuteResult("userPointAndProjectStatus-"+bizType), formDTO.getCustomerId(), result, 3 * 24 * 60 * 60L);
             });
         } else {
             if (StringUtils.isBlank(formDTO.getDateId())){
                 formDTO.setDateId(DateUtils.getBeforeNDay(NumConstant.ONE));
             }
-            this.extractUserPointData(formDTO.getCustomerId(), formDTO.getDateId());
+            executeMethod(bizType, formDTO.getCustomerId(), formDTO.getDateId());
-            this.agencyProjectStats(formDTO.getCustomerId(), formDTO.getDateId());
             result.add(formDTO.getDateId());
-            redisUtils.hSet(RedisKeys.getBackDoorbizExcuteResult("userPointAndProjectStatus"), formDTO.getCustomerId(), result, 3 * 24 * 60 * 60L);
+            redisUtils.hSet(RedisKeys.getBackDoorbizExcuteResult("userPointAndProjectStatus-"+bizType), formDTO.getCustomerId(), result, 3 * 24 * 60 * 60L);
         }
         long end = System.currentTimeMillis();
         long l = (end - start) / 1000;
-        return new Result<String>().ok("userPointAndProjectStatus耗时" + l + "s");
+        return new Result<String>().ok("userPointAndProjectStatus耗时-"+bizType + l + "s");
+    }
+
+    private void executeMethod(String bizType, String customerId, String d) {
+        if (bizType.equals(BizTypeEnum.PROJECT.getType())){
+            this.extractUserPointData(customerId, d);
+        }
+        if (bizType.equals(BizTypeEnum.USER.getType())) {
+            this.agencyProjectStats(customerId, d);
+        }
     }
 
     /**

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/IcPrivateDeploySupportTask.java → epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/IcPrivateDeploySupportProjectTask.java

@@ -2,6 +2,7 @@ package com.epmet.task;
 
 
 import com.alibaba.fastjson.JSON;
+import com.epmet.commons.tools.enums.BizTypeEnum;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.extract.form.ExtractOriginFormDTO;
 import com.epmet.feign.DataStatisticalOpenFeignClient;
@@ -11,11 +12,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
- * desc：数字社区私有化部署 任务之一还有【autoEvaluateDemandTask，statsDemandTask，dailyStatisticalVoteTask】
+ * desc：数字社区私有化部署 任务之一还有【autoEvaluateDemandTask，statsDemandTask，dailyStatisticalVoteTask,IcPrivateDeploySupportUserPointTask】
  */
 @Slf4j
-@Component("icPrivateDeploySupportTask")
+@Component("icPrivateDeploySupportProjectTask")
-public class IcPrivateDeploySupportTask implements ITask {
+public class IcPrivateDeploySupportProjectTask implements ITask {
     @Autowired
     private DataStatisticalOpenFeignClient dataStatisticalOpenFeignClient;
 
@@ -25,7 +26,7 @@ public class IcPrivateDeploySupportTask implements ITask {
         if (StringUtils.isNotBlank(params)) {
             formDTO = JSON.parseObject(params, ExtractOriginFormDTO.class);
         }
-        Result result = dataStatisticalOpenFeignClient.userPointAndProjectStatus(formDTO);
+        Result result = dataStatisticalOpenFeignClient.userPointAndProjectStatus(BizTypeEnum.PROJECT.getType(), formDTO);
-        log.info("IcPrivateDeploySupportTask excute end，param:{},result:{}",params,result);
+        log.info("icPrivateDeploySupportProjectTask excute end，param:{},result:{}",params,result);
     }
 }

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

@@ -0,0 +1,32 @@
+package com.epmet.task;
+
+
+import com.alibaba.fastjson.JSON;
+import com.epmet.commons.tools.enums.BizTypeEnum;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.extract.form.ExtractOriginFormDTO;
+import com.epmet.feign.DataStatisticalOpenFeignClient;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * desc：数字社区私有化部署 任务之一还有【autoEvaluateDemandTask，statsDemandTask，dailyStatisticalVoteTask,icPrivateDeploySupportProjectTask】
+ */
+@Slf4j
+@Component("icPrivateDeploySupportUserPointTask")
+public class IcPrivateDeploySupportUserPointTask implements ITask {
+    @Autowired
+    private DataStatisticalOpenFeignClient dataStatisticalOpenFeignClient;
+
+    @Override
+    public void run(String params) {
+        ExtractOriginFormDTO formDTO = new ExtractOriginFormDTO();
+        if (StringUtils.isNotBlank(params)) {
+            formDTO = JSON.parseObject(params, ExtractOriginFormDTO.class);
+        }
+        Result result = dataStatisticalOpenFeignClient.userPointAndProjectStatus(BizTypeEnum.USER.getType(), formDTO);
+        log.info("icPrivateDeploySupportUserPointTask excute end，param:{},result:{}",params,result);
+    }
+}