Merge branch 'feature/indexModify'

5 years ago · f12d1ea8d8
3 changed files with 56 additions and 56 deletions
--- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/CloudAnalysisFeignClient.java
+++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/CloudAnalysisFeignClient.java
@ -65,7 +65,7 @@ public interface CloudAnalysisFeignClient {
    * @return com.elink.esua.epdc.commons.tools.utils.Result
    */
    @PostMapping("cloudAnalysis/indexcollect/gridpartymemberdata")
-    Result gridpartymemberdata();
+    Result gridpartymemberdata(String time);

    /**
    * @describe: 党建能力-网格相关指标上报
@ -75,7 +75,7 @@ public interface CloudAnalysisFeignClient {
    * @return com.elink.esua.epdc.commons.tools.utils.Result
    */
    @PostMapping("cloudAnalysis/indexcollect/gridpartyability")
-    Result gridpartyability();
+    Result gridpartyability(String time);

    /**
    * @describe: 党建能力-街道及社区相关指标
@ -85,7 +85,7 @@ public interface CloudAnalysisFeignClient {
    * @return com.elink.esua.epdc.commons.tools.utils.Result
    */
    @PostMapping("cloudAnalysis/indexcollect/orgpartyability")
-    Result orgpartyability();
+    Result orgpartyability(String time);

    /**
    * @describe: 服务能力-网格相关指标
@ -95,7 +95,7 @@ public interface CloudAnalysisFeignClient {
    * @return com.elink.esua.epdc.commons.tools.utils.Result
    */
    @PostMapping("cloudAnalysis/indexcollect/gridserviceability")
-    Result gridserviceability();
+    Result gridserviceability(String time);

    /**
    * @describe: 服务能力-组织（街道|社区|全区）相关指标
@ -105,7 +105,7 @@ public interface CloudAnalysisFeignClient {
    * @return com.elink.esua.epdc.commons.tools.utils.Result
    */
    @PostMapping("cloudAnalysis/indexcollect/orgserviceability")
-    Result orgserviceability();
+    Result orgserviceability(String time);

    /**
    * @describe: 治理能力-网格相关指标
@ -115,7 +115,7 @@ public interface CloudAnalysisFeignClient {
    * @return com.elink.esua.epdc.commons.tools.utils.Result
    */
    @PostMapping("cloudAnalysis/indexcollect/gridgovrnability")
-    Result gridgovrnability();
+    Result gridgovrnability(String time);

    /**
    * @describe: 治理能力-街道及社区相关指标
@ -125,7 +125,7 @@ public interface CloudAnalysisFeignClient {
    * @return com.elink.esua.epdc.commons.tools.utils.Result
    */
    @PostMapping("cloudAnalysis/indexcollect/orggovrnability")
-    Result orggovrnability();
+    Result orggovrnability(String time);

    /**
    * @describe: 治理能力-部门相关指标
@ -135,7 +135,7 @@ public interface CloudAnalysisFeignClient {
    * @return com.elink.esua.epdc.commons.tools.utils.Result
    */
    @PostMapping("cloudAnalysis/indexcollect/deptgovrnability")
-    Result deptgovrnability();
+    Result deptgovrnability(String time);

    /**
    * @describe: 指标数据传输完毕通知接口
--- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/CloudAnalysisFeignClientFallback.java
+++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/CloudAnalysisFeignClientFallback.java
@ -64,43 +64,43 @@ public class CloudAnalysisFeignClientFallback implements CloudAnalysisFeignClien
    }

    @Override
-    public Result gridpartymemberdata() {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_CLOUD_ANALYSIS_SERVER, "gridpartymemberdata");
+    public Result gridpartymemberdata(String time) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_CLOUD_ANALYSIS_SERVER, "gridpartymemberdata",time);
    }

    @Override
-    public Result gridpartyability() {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_CLOUD_ANALYSIS_SERVER, "gridpartyability");
+    public Result gridpartyability(String time) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_CLOUD_ANALYSIS_SERVER, "gridpartyability",time);
    }

    @Override
-    public Result orgpartyability() {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_CLOUD_ANALYSIS_SERVER, "orgpartyability");
+    public Result orgpartyability(String time) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_CLOUD_ANALYSIS_SERVER, "orgpartyability",time);
    }

    @Override
-    public Result gridserviceability() {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_CLOUD_ANALYSIS_SERVER, "gridserviceability");
+    public Result gridserviceability(String time) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_CLOUD_ANALYSIS_SERVER, "gridserviceability",time);
    }

    @Override
-    public Result orgserviceability() {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_CLOUD_ANALYSIS_SERVER, "orgserviceability");
+    public Result orgserviceability(String time) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_CLOUD_ANALYSIS_SERVER, "orgserviceability",time);
    }

    @Override
-    public Result gridgovrnability() {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_CLOUD_ANALYSIS_SERVER, "gridgovrnability");
+    public Result gridgovrnability(String time) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_CLOUD_ANALYSIS_SERVER, "gridgovrnability",time);
    }

    @Override
-    public Result orggovrnability() {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_CLOUD_ANALYSIS_SERVER, "orggovrnability");
+    public Result orggovrnability(String time) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_CLOUD_ANALYSIS_SERVER, "orggovrnability",time);
    }

    @Override
-    public Result deptgovrnability() {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_CLOUD_ANALYSIS_SERVER, "deptgovrnability");
+    public Result deptgovrnability(String time) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_CLOUD_ANALYSIS_SERVER, "deptgovrnability",time);
    }

    @Override
--- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/impl/PushDataEveryMonthTaskImpl.java
+++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/impl/PushDataEveryMonthTaskImpl.java
@ -24,21 +24,21 @@ public class PushDataEveryMonthTaskImpl implements PushDataEveryMonthTask {
    @Override
    public void run(String param) {
        // 调用-->党建能力-党员相关指标上报
-        gridpartymemberdata();
+        gridpartymemberdata(param);
        // 调用-->党建能力-网格相关指标上报
-        gridpartyability();
+        gridpartyability(param);
        // 调用-->党建能力-街道及社区相关指标
-        orgpartyability();
+        orgpartyability(param);
        // 调用-->服务能力-网格相关指标
-        gridserviceability();
+        gridserviceability(param);
        // 调用-->服务能力-组织（街道|社区|全区）相关指标
-        orgserviceability();
+        orgserviceability(param);
        // 调用-->治理能力-网格相关指标
-        gridgovrnability();
+        gridgovrnability(param);
        // 调用-->治理能力-街道及社区相关指标
-        orggovrnability();
+        orggovrnability(param);
        // 调用-->治理能力-部门相关指标
-        deptgovrnability();
+        deptgovrnability(param);
        // 调用-->指标数据传输完毕通知接口
        all();
    }
@ -53,11 +53,11 @@ public class PushDataEveryMonthTaskImpl implements PushDataEveryMonthTask {
     * @params []
     * @return void
     */
-    public void gridpartymemberdata() {
+    public void gridpartymemberdata(String time) {
        //方法名
        String methodName = Thread.currentThread().getStackTrace()[2].getMethodName();
-        logger.info("<" + methodName + "|党建能力-党员相关指标上报>定时任务开始执行");
-        cloudAnalysisFeignClient.gridpartymemberdata();
+        logger.info("<" + methodName + "|党建能力-党员相关指标上报>定时任务开始执行"+"::|参数time为："+time);
+        cloudAnalysisFeignClient.gridpartymemberdata(time);
        logger.info("<" + methodName + "|党建能力-党员相关指标上报>定时任务执行结束");
    }

@ -68,11 +68,11 @@ public class PushDataEveryMonthTaskImpl implements PushDataEveryMonthTask {
     * @params []
     * @return void
     */
-    public void gridpartyability() {
+    public void gridpartyability(String time) {
        //方法名
        String methodName = Thread.currentThread().getStackTrace()[2].getMethodName();
-        logger.info("<" + methodName + "|党建能力-网格相关指标上报>定时任务开始执行");
-        cloudAnalysisFeignClient.gridpartyability();
+        logger.info("<" + methodName + "|党建能力-网格相关指标上报>定时任务开始执行"+"::|参数time为："+time);
+        cloudAnalysisFeignClient.gridpartyability(time);
        logger.info("<" + methodName + "|党建能力-网格相关指标上报>定时任务执行结束");
    }

@ -83,11 +83,11 @@ public class PushDataEveryMonthTaskImpl implements PushDataEveryMonthTask {
     * @params []
     * @return void
     */
-    public void orgpartyability() {
+    public void orgpartyability(String time) {
        //方法名
        String methodName = Thread.currentThread().getStackTrace()[2].getMethodName();
-        logger.info("<" + methodName + "|党建能力-街道及社区相关指标>定时任务开始执行");
-        cloudAnalysisFeignClient.orgpartyability();
+        logger.info("<" + methodName + "|党建能力-街道及社区相关指标>定时任务开始执行"+"::|参数time为："+time);
+        cloudAnalysisFeignClient.orgpartyability(time);
        logger.info("<" + methodName + "|党建能力-街道及社区相关指标>定时任务执行结束");
    }

@ -98,11 +98,11 @@ public class PushDataEveryMonthTaskImpl implements PushDataEveryMonthTask {
     * @params []
     * @return void
     */
-    public void gridserviceability() {
+    public void gridserviceability(String time) {
        //方法名
        String methodName = Thread.currentThread().getStackTrace()[2].getMethodName();
-        logger.info("<" + methodName + "|服务能力-网格相关指标>定时任务开始执行");
-        cloudAnalysisFeignClient.gridserviceability();
+        logger.info("<" + methodName + "|服务能力-网格相关指标>定时任务开始执行"+"::|参数time为："+time);
+        cloudAnalysisFeignClient.gridserviceability(time);
        logger.info("<" + methodName + "|服务能力-网格相关指标>定时任务执行结束");
    }

@ -113,11 +113,11 @@ public class PushDataEveryMonthTaskImpl implements PushDataEveryMonthTask {
     * @params []
     * @return void
     */
-    public void orgserviceability() {
+    public void orgserviceability(String time) {
        //方法名
        String methodName = Thread.currentThread().getStackTrace()[2].getMethodName();
-        logger.info("<" + methodName + "|服务能力-组织（街道|社区|全区）相关指标>定时任务开始执行");
-        cloudAnalysisFeignClient.orgserviceability();
+        logger.info("<" + methodName + "|服务能力-组织（街道|社区|全区）相关指标>定时任务开始执行"+"::|参数time为："+time);
+        cloudAnalysisFeignClient.orgserviceability(time);
        logger.info("<" + methodName + "|服务能力-组织（街道|社区|全区）相关指标>定时任务执行结束");
    }

@ -128,11 +128,11 @@ public class PushDataEveryMonthTaskImpl implements PushDataEveryMonthTask {
     * @params []
     * @return void
     */
-    public void gridgovrnability() {
+    public void gridgovrnability(String time) {
        //方法名
        String methodName = Thread.currentThread().getStackTrace()[2].getMethodName();
-        logger.info("<" + methodName + "|治理能力-网格相关指标>定时任务开始执行");
-        cloudAnalysisFeignClient.gridgovrnability();
+        logger.info("<" + methodName + "|治理能力-网格相关指标>定时任务开始执行"+"::|参数time为："+time);
+        cloudAnalysisFeignClient.gridgovrnability(time);
        logger.info("<" + methodName + "|治理能力-网格相关指标>定时任务执行结束");
    }

@ -143,11 +143,11 @@ public class PushDataEveryMonthTaskImpl implements PushDataEveryMonthTask {
     * @params []
     * @return void
     */
-    public void orggovrnability() {
+    public void orggovrnability(String time) {
        //方法名
        String methodName = Thread.currentThread().getStackTrace()[2].getMethodName();
-        logger.info("<" + methodName + "|治理能力-街道及社区相关指标>定时任务开始执行");
-        cloudAnalysisFeignClient.orggovrnability();
+        logger.info("<" + methodName + "|治理能力-街道及社区相关指标>定时任务开始执行"+"::|参数time为："+time);
+        cloudAnalysisFeignClient.orggovrnability(time);
        logger.info("<" + methodName + "|治理能力-街道及社区相关指标>定时任务执行结束");
    }

@ -158,11 +158,11 @@ public class PushDataEveryMonthTaskImpl implements PushDataEveryMonthTask {
     * @params []
     * @return void
     */
-    public void deptgovrnability() {
+    public void deptgovrnability(String time) {
        //方法名
        String methodName = Thread.currentThread().getStackTrace()[2].getMethodName();
-        logger.info("<" + methodName + "|治理能力-部门相关指标>定时任务开始执行");
-        cloudAnalysisFeignClient.deptgovrnability();
+        logger.info("<" + methodName + "|治理能力-部门相关指标>定时任务开始执行"+"::|参数time为："+time);
+        cloudAnalysisFeignClient.deptgovrnability(time);
        logger.info("<" + methodName + "|治理能力-部门相关指标>定时任务执行结束");
    }