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-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/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,
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());
+ }
+ }
+}
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}
+
+ )