From abd987e62248d08fdbe7952af5360f56165a3a9f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 28 Sep 2020 11:08:25 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0screenExtractMonthlyTask?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feign/DataStatisticalOpenFeignClient.java | 11 ++++++ ...ataStatisticalOpenFeignClientFallBack.java | 13 +++++++ .../ScreenExtractDailyController.java | 2 +- .../service/ScreenExtractTaskService.java | 9 +++++ .../impl/ScreenExtractTaskServiceImpl.java | 17 ++++++++++ .../epmet/task/ScreenExtractMonthlyTask.java | 34 +++++++++++++++++++ 6 files changed, 85 insertions(+), 1 deletion(-) create mode 100644 epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/ScreenExtractMonthlyTask.java diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java index 166ffc241d..5020fd3c63 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java @@ -5,6 +5,7 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.dto.StatsFormDTO; import com.epmet.dto.extract.form.ExtractIndexFormDTO; import com.epmet.dto.extract.form.ExtractOriginFormDTO; +import com.epmet.dto.extract.form.ExtractScreenFormDTO; import com.epmet.dto.group.form.GroupStatsFormDTO; import com.epmet.dto.issue.form.IssueJobFromDTO; import com.epmet.dto.stats.form.CustomerIdAndDateIdFormDTO; @@ -229,4 +230,14 @@ public interface DataStatisticalOpenFeignClient { */ @PostMapping(value = "/data/stats/screenextract/extractdailyall") Result extractDailyAll(@RequestBody(required = false) ExtractOriginFormDTO extractOriginFormDTO); + + /** + * @return com.epmet.commons.tools.utils.Result + * @param extractScreenFormDTO + * @author yinzuomei + * @description + * @Date 2020/9/28 11:05 + **/ + @PostMapping("/data/stats/screenextract/extractmonthlyall") + Result extractMonthlyAll(ExtractScreenFormDTO extractScreenFormDTO); } diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java index 4e7611762d..344f0ff7a1 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java @@ -6,6 +6,7 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.dto.StatsFormDTO; import com.epmet.dto.extract.form.ExtractIndexFormDTO; import com.epmet.dto.extract.form.ExtractOriginFormDTO; +import com.epmet.dto.extract.form.ExtractScreenFormDTO; import com.epmet.dto.group.form.GroupStatsFormDTO; import com.epmet.dto.issue.form.IssueJobFromDTO; import com.epmet.dto.stats.form.CustomerIdAndDateIdFormDTO; @@ -217,4 +218,16 @@ public class DataStatisticalOpenFeignClientFallBack implements DataStatisticalOp public Result extractDailyAll(ExtractOriginFormDTO extractOriginFormDTO) { return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "extractDailyAll", extractOriginFormDTO); } + + /** + * @param extractScreenFormDTO + * @return com.epmet.commons.tools.utils.Result + * @author yinzuomei + * @description + * @Date 2020/9/28 11:05 + **/ + @Override + public Result extractMonthlyAll(ExtractScreenFormDTO extractScreenFormDTO) { + return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "screenExtractMonthly", extractScreenFormDTO); + } } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenExtractDailyController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenExtractDailyController.java index c83a07427d..133dc09f8c 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenExtractDailyController.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenExtractDailyController.java @@ -39,7 +39,7 @@ public class ScreenExtractDailyController { * @author zxc * @date 2020/9/24 10:15 上午 */ - @PostMapping("extractmonthlyyall") + @PostMapping("extractmonthlyall") public Result screenExtractMonthly(@RequestBody ExtractScreenFormDTO formDTO) { screenExtractService.extractMonthlyAll(formDTO); return new Result(); diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/ScreenExtractTaskService.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/ScreenExtractTaskService.java index 5e144642ed..25a4244301 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/ScreenExtractTaskService.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/ScreenExtractTaskService.java @@ -8,6 +8,15 @@ import com.epmet.commons.tools.utils.Result; */ public interface ScreenExtractTaskService { + Result screenExtractDaily(String params); + /** + * @return com.epmet.commons.tools.utils.Result + * @param params + * @author yinzuomei + * @description 大屏数据抽取-按月统计 + * @Date 2020/9/28 10:49 + **/ + Result screenExtractMonthly(String params); } diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/ScreenExtractTaskServiceImpl.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/ScreenExtractTaskServiceImpl.java index 963045ec79..698a3ec7b3 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/ScreenExtractTaskServiceImpl.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/ScreenExtractTaskServiceImpl.java @@ -3,6 +3,7 @@ package com.epmet.service.impl; import com.alibaba.fastjson.JSON; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.extract.form.ExtractOriginFormDTO; +import com.epmet.dto.extract.form.ExtractScreenFormDTO; import com.epmet.feign.DataStatisticalOpenFeignClient; import com.epmet.service.ScreenExtractTaskService; import lombok.extern.slf4j.Slf4j; @@ -30,4 +31,20 @@ public class ScreenExtractTaskServiceImpl implements ScreenExtractTaskService { } return dataStatisticalOpenFeignClient.extractDailyAll(extractOriginFormDTO); } + + /** + * @param params + * @return com.epmet.commons.tools.utils.Result + * @author yinzuomei + * @description 大屏数据抽取-按月统计 + * @Date 2020/9/28 10:49 + **/ + @Override + public Result screenExtractMonthly(String params) { + ExtractScreenFormDTO extractScreenFormDTO=new ExtractScreenFormDTO(); + if(StringUtils.isNotBlank(params)){ + extractScreenFormDTO=JSON.parseObject(params,ExtractScreenFormDTO.class); + } + return dataStatisticalOpenFeignClient.extractMonthlyAll(extractScreenFormDTO); + } } diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/ScreenExtractMonthlyTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/ScreenExtractMonthlyTask.java new file mode 100644 index 0000000000..9e4cc24222 --- /dev/null +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/ScreenExtractMonthlyTask.java @@ -0,0 +1,34 @@ +package com.epmet.task; + +import com.epmet.commons.tools.utils.Result; +import com.epmet.service.ScreenExtractTaskService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 大屏数据抽取-按月统计 + * + * @author yinzuomei@elink-cn.com + * @date 2020/9/28 10:39 + */ +@Component("screenExtractMonthlyTask") +public class ScreenExtractMonthlyTask implements ITask{ + @Autowired + private ScreenExtractTaskService screenExtractTaskService; + + private Logger logger = LoggerFactory.getLogger(getClass()); + + + @Override + public void run(String params) { + logger.info("ScreenExtractMonthlyTask定时任务正在执行，参数为：{}", params); + Result result = screenExtractTaskService.screenExtractMonthly(params); + if (result.success()){ + logger.info("ScreenExtractMonthlyTask定时任务执行成功"); + }else { + logger.error("ScreenExtractMonthlyTask定时任务执行失败:" + result.getMsg()); + } + } +} From 6f7de7a8884b3ea10362e624872b3a473e6d6fe6 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 28 Sep 2020 11:17:36 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=85=AC=E4=BC=97=E5=8F=82=E4=B8=8E?= =?UTF-8?q?=E5=90=84=E7=B1=BB=E6=80=BB=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extract/toscreen/impl/ScreenExtractServiceImpl.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java index 86e1eef6e3..a427a49925 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java @@ -36,6 +36,8 @@ public class ScreenExtractServiceImpl implements ScreenExtractService { private OrgRankExtractService orgRankExtractService; @Autowired private GovernRankDataExtractService governRankDataExtractService; + @Autowired + private PublicPartiTotalDataExtractService publicPartiTotalDataExtractService; /** * @param extractOriginFormDTO @@ -108,10 +110,14 @@ public class ScreenExtractServiceImpl implements ScreenExtractService { * @date 2020/9/24 10:16 上午 */ public void extractDaily(String customerId, String dateId) { -// partyBaseInfoService.statsPartyMemberBaseInfoToScreen(customerId,dateId); + //党员基本情况 + partyBaseInfoService.statsPartyMemberBaseInfoToScreen(customerId,dateId); + //先锋模范 pioneerDataExtractService.extractGridPioneerData(customerId, dateId); pioneerDataExtractService.extractCommunityPioneerData(customerId, dateId); pioneerDataExtractService.extractExceptCommunityPioneerData(customerId, dateId); + //公众参与排行（注册人数、参与人数、话题数、议题数、项目数） + publicPartiTotalDataExtractService.extractPublicPartiTotalData(customerId,dateId); } /** @@ -124,6 +130,7 @@ public class ScreenExtractServiceImpl implements ScreenExtractService { formDTO.setCustomerId(customerId); formDTO.setMonthId(monthId); + //基层治理-公众参与screen_user_join publicPartExtractService.extractTotalDataMonthly(formDTO); //治理能力排行 governRankDataExtractService.extractGridData(customerId, monthId); From ba2ef04d622b3c376a71af74d335f603dbb48d87 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 28 Sep 2020 12:06:56 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=89=B4=E6=9D=83=E6=8B=A6=E6=88=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-gateway/src/main/resources/bootstrap.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/epmet-gateway/src/main/resources/bootstrap.yml b/epmet-gateway/src/main/resources/bootstrap.yml index 750440f69f..8bf6af5abd 100644 --- a/epmet-gateway/src/main/resources/bootstrap.yml +++ b/epmet-gateway/src/main/resources/bootstrap.yml @@ -440,9 +440,7 @@ epmet: # 外部应用认证，使用AccessToken等头进行认证 externalAuthUrls: - - /data/report/test/test - - /data/report/screen/** - - /data/report/kcscreen/** + - /data/report/** - /epmetuser/customerstaff/customerlist swaggerUrls: