Merge branch 'feature/userAnalysisReform'

esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClint.java → esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClint.java

@@ -2,7 +2,7 @@ package com.elink.esua.epdc.feign;
 
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.feign.fallback.UserFeignClintFallback;
+import com.elink.esua.epdc.feign.fallback.AnalysisFeignClintFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 
@@ -11,8 +11,8 @@ import org.springframework.web.bind.annotation.GetMapping;
  *  @Date: 2020/3/25 10:20
  *  @Description: 用户数据分析
  */
-@FeignClient(name = ServiceConstant.EPDC_ANALYSIS_SERVER, fallback = UserFeignClintFallback.class)
-public interface UserFeignClint {
+@FeignClient(name = ServiceConstant.EPDC_ANALYSIS_SERVER, fallback = AnalysisFeignClintFallback.class)
+public interface AnalysisFeignClint {
 
     /***
      * 生成用户分析数据导入临时表

esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClintFallback.java → esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClintFallback.java

@@ -3,7 +3,7 @@ package com.elink.esua.epdc.feign.fallback;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.feign.UserFeignClint;
+import com.elink.esua.epdc.feign.AnalysisFeignClint;
 import org.springframework.stereotype.Component;
 
 /**
@@ -12,7 +12,7 @@ import org.springframework.stereotype.Component;
  *  @Description: 用户数据分析
  */
 @Component
-public class UserFeignClintFallback implements UserFeignClint {
+public class AnalysisFeignClintFallback implements AnalysisFeignClint {
 
     @Override
     public Result createUserAnalysisData() {

esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobUserServiceImpl.java

@@ -1,10 +1,9 @@
 package com.elink.esua.epdc.service.impl;
 
-import com.elink.esua.epdc.feign.UserFeignClint;
+import com.elink.esua.epdc.feign.AnalysisFeignClint;
 import com.elink.esua.epdc.service.ScheduleJobUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Service;
 
 /**
  *  @author: qushutong
@@ -14,7 +13,7 @@ import org.springframework.stereotype.Service;
 @Component
 public class ScheduleJobUserServiceImpl implements ScheduleJobUserService {
     @Autowired
-    private UserFeignClint userFeignClint;
+    private AnalysisFeignClint userFeignClint;
 
     @Override
     public void createUserAnalysisData() {

esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/analysis/UserAnalysisTask.java

@@ -1,18 +1,23 @@
 package com.elink.esua.epdc.task.analysis;
 
+import com.elink.esua.epdc.service.ScheduleJobUserService;
+import com.elink.esua.epdc.task.ITask;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
 /**
  * @author: qushutong
- *  @Date: 2020/3/25 10:04
- *  @Description: 用户分析
+ * @Date: 2020/3/25 10:12
+ * @Description:
  */
-public interface UserAnalysisTask {
+@Component("userAnalysisTask")
+public class UserAnalysisTask implements ITask {
 
-    /***
-     * 网格开通情况
-     * @param
-     * @return void
-     * @author qushutong
-     * @date 2020/3/25 10:11
-     */
-    void run(String params);
+    @Autowired
+    private ScheduleJobUserService scheduleJobUserService;
+
+    @Override
+    public void run(String params) {
+        scheduleJobUserService.createUserAnalysisData();
+    }
 }

esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/analysis/UserAnalysisTaskImpl.java

@@ -1,21 +0,0 @@
-package com.elink.esua.epdc.task.analysis;
-
-import com.elink.esua.epdc.service.ScheduleJobUserService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-/**
- *  @author: qushutong
- *  @Date: 2020/3/25 10:12
- *  @Description:
- */
-@Component("UserAnalysisTask")
-public class UserAnalysisTaskImpl implements UserAnalysisTask {
-    @Autowired
-    private ScheduleJobUserService scheduleJobUserService;
-
-    @Override
-    public void run(String params) {
-        scheduleJobUserService.createUserAnalysisData();
-    }
-}

esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/KpiManualScoreTask.java → esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/kpi/KpiManualScoreTask.java

@@ -1,6 +1,7 @@
-package com.elink.esua.epdc.task;
+package com.elink.esua.epdc.task.kpi;
 
 import com.elink.esua.epdc.service.ScheduleJobKpiService;
+import com.elink.esua.epdc.task.ITask;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/KpiMetaDataTask.java → esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/kpi/KpiMetaDataTask.java

@@ -1,6 +1,7 @@
-package com.elink.esua.epdc.task;
+package com.elink.esua.epdc.task.kpi;
 
 import com.elink.esua.epdc.service.ScheduleJobKpiService;
+import com.elink.esua.epdc.task.ITask;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/KpiRuleTask.java → esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/kpi/KpiRuleTask.java

@@ -1,6 +1,7 @@
-package com.elink.esua.epdc.task;
+package com.elink.esua.epdc.task.kpi;
 
 import com.elink.esua.epdc.service.ScheduleJobKpiService;
+import com.elink.esua.epdc.task.ITask;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;