Merge branch 'dev_shibei_task' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop

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

@@ -64,10 +64,10 @@ public class ShiBeiICJobController {
     }
 
     private void executeMethod(String bizType, String customerId, String d) {
-        if (bizType.equals(BizTypeEnum.PROJECT.getType())){
+        if (bizType.equals(BizTypeEnum.USER.getType())){
             this.extractUserPointData(customerId, d);
         }
-        if (bizType.equals(BizTypeEnum.USER.getType())) {
+        if (bizType.equals(BizTypeEnum.PROJECT.getType())) {
             this.agencyProjectStats(customerId, d);
         }
     }

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

@@ -1,4 +1,4 @@
-package com.epmet.task;
+package com.epmet.task.ic;
 
 
 import com.alibaba.fastjson.JSON;
@@ -6,6 +6,7 @@ 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 com.epmet.task.ITask;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,4 +1,4 @@
-package com.epmet.task;
+package com.epmet.task.ic;
 
 
 import com.alibaba.fastjson.JSON;
@@ -6,6 +6,7 @@ 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 com.epmet.task.ITask;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;