From 0d2e1c7cb637ce619c349da70f2c54df4aff54a1 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 14 Sep 2020 10:47:25 +0800 Subject: [PATCH 1/3] =?UTF-8?q?/data/stats/kcscreencoll/news/trend=20?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=85=A5=E5=8F=82=E5=8E=BB=E6=8E=89readCount?= =?UTF-8?q?=EF=BC=8Cscreen=5Fkc=5Fnews=5Ftrend=5Fmonthly=E8=A1=A8=E5=8E=BB?= =?UTF-8?q?=E6=8E=89read=5Fcount?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/screencoll/form/KcNewsTrendFormDTO.java | 5 ----- .../screen/ScreenKcNewsTrendMonthlyEntity.java | 5 ----- .../evaluationindex/screen/ScreenKcNewsTrendMonthlyDao.xml | 3 --- 3 files changed, 13 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcNewsTrendFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcNewsTrendFormDTO.java index 6e6bdf9359..5d00324e55 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcNewsTrendFormDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcNewsTrendFormDTO.java @@ -15,11 +15,6 @@ public class KcNewsTrendFormDTO implements Serializable { private static final long serialVersionUID = 1L; - /** - * 阅读数量 - */ - private Integer readCount; - /** * 参与数量 */ diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcNewsTrendMonthlyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcNewsTrendMonthlyEntity.java index 548d34f284..d63a96ee08 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcNewsTrendMonthlyEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcNewsTrendMonthlyEntity.java @@ -48,11 +48,6 @@ public class ScreenKcNewsTrendMonthlyEntity extends BaseEpmetEntity { */ private String monthId; - /** - * 阅读数量 - */ - private Integer readCount; - /** * 参与数量 */ diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcNewsTrendMonthlyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcNewsTrendMonthlyDao.xml index 4caffe8fba..60bebaa7d7 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcNewsTrendMonthlyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcNewsTrendMonthlyDao.xml @@ -7,7 +7,6 @@ - @@ -29,7 +28,6 @@ ID, CUSTOMER_ID, MONTH_ID, - READ_COUNT, PARTI_COUNT, DEL_FLAG, REVISION, @@ -43,7 +41,6 @@ (SELECT REPLACE(UUID(), '-', '') AS id), #{customerId}, #{monthId}, - #{item.readCount}, #{item.partiCount}, 0, 0, From c60bf5607027e8668e3dd7a1039e427fba67a7e4 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 14 Sep 2020 11:11:49 +0800 Subject: [PATCH 2/3] =?UTF-8?q?sql=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/CustomerStaffDao.xml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml index 48fd117891..4d88329d42 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml @@ -230,9 +230,11 @@ cs.del_flag = 0 AND cs.enable_flag = 'enable' AND - - cs.user_id = #{userId} - + ( + + cs.user_id = #{userId} + + ) From bfa0bca4766c800edb0737c24b606d1b8bd0c116 Mon Sep 17 00:00:00 2001 From: wxz Date: Mon, 14 Sep 2020 13:54:05 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9A=82=E5=81=9C?= =?UTF-8?q?=E7=9A=84=E7=BB=9F=E8=AE=A1=EF=BC=8C=E9=87=8D=E6=96=B0=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feign/DataStatisticalOpenFeignClient.java | 7 +++++ ...ataStatisticalOpenFeignClientFallBack.java | 5 ++++ .../DataStatsProcessPenddingCalService.java | 9 +++++++ ...ataStatsProcessPenddingCalServiceImpl.java | 19 ++++++++++++++ .../task/DataStatsProcessPenddingCalTask.java | 26 +++++++++++++++++++ 5 files changed, 66 insertions(+) create mode 100644 epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/DataStatsProcessPenddingCalService.java create mode 100644 epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/DataStatsProcessPenddingCalServiceImpl.java create mode 100644 epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/DataStatsProcessPenddingCalTask.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 1f1c1b10fe..107bc8f478 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 @@ -173,4 +173,11 @@ public interface DataStatisticalOpenFeignClient { @PostMapping("/data/stats/statstopic/execute") Result execTopicStatistical(@RequestParam(value = "date",required = false) String date); + /** + * 处理暂停的计算 + * @return + */ + @PostMapping("/data/stats/indexcalculate/process-pendding-cals") + Result processPenddingCalculate(); + } 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 d58fa69ec4..1c79cfc56b 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 @@ -170,4 +170,9 @@ public class DataStatisticalOpenFeignClientFallBack implements DataStatisticalOp public Result execTopicStatistical(String date) { return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "execTopicStatistical",date); } + + @Override + public Result processPenddingCalculate() { + return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "processPenddingCalculate"); + } } diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/DataStatsProcessPenddingCalService.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/DataStatsProcessPenddingCalService.java new file mode 100644 index 0000000000..9b5d049284 --- /dev/null +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/DataStatsProcessPenddingCalService.java @@ -0,0 +1,9 @@ +package com.epmet.service; + +import com.epmet.commons.tools.utils.Result; + +public interface DataStatsProcessPenddingCalService { + + Result processPenddingCal(); + +} diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/DataStatsProcessPenddingCalServiceImpl.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/DataStatsProcessPenddingCalServiceImpl.java new file mode 100644 index 0000000000..55381b40b0 --- /dev/null +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/DataStatsProcessPenddingCalServiceImpl.java @@ -0,0 +1,19 @@ +package com.epmet.service.impl; + +import com.epmet.commons.tools.utils.Result; +import com.epmet.feign.DataStatisticalOpenFeignClient; +import com.epmet.service.DataStatsProcessPenddingCalService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service +public class DataStatsProcessPenddingCalServiceImpl implements DataStatsProcessPenddingCalService { + + @Autowired + private DataStatisticalOpenFeignClient feignClient; + + @Override + public Result processPenddingCal() { + return feignClient.processPenddingCalculate(); + } +} diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/DataStatsProcessPenddingCalTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/DataStatsProcessPenddingCalTask.java new file mode 100644 index 0000000000..b02396846c --- /dev/null +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/DataStatsProcessPenddingCalTask.java @@ -0,0 +1,26 @@ +package com.epmet.task; + +import com.epmet.commons.tools.utils.Result; +import com.epmet.service.DataStatsProcessPenddingCalService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +@Slf4j +@Component("dataStatsProcessPenddingCalTask") +public class DataStatsProcessPenddingCalTask implements ITask { + + @Autowired + private DataStatsProcessPenddingCalService dataStatsProcessPenddingCalService; + + @Override + public void run(String params) { + log.debug("DataStatsProcessPenddingCalTask定时任务正在执行，参数为：{}", params); + Result result = dataStatsProcessPenddingCalService.processPenddingCal(); + if (result.success()){ + log.debug("DataStatsProcessPenddingCalTask定时任务正在执行定时任务执行成功"); + }else { + log.debug("DataStatsProcessPenddingCalTask定时任务正在执行定时任务执行失败:" + result.getMsg()); + } + } +}