getCheckResult(ExtractOriginFormDTO formDTO);
}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ProjectDataService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ProjectDataService.java
new file mode 100644
index 0000000000..ac348125ab
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ProjectDataService.java
@@ -0,0 +1,42 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see {
+
+ /**
+ * 平阴三个街道上报统计数据正确性校验
+ *
+ * @Param formDTO
+ * @Return
+ * @Author zhaoqifeng
+ * @Date 2022/3/7 15:44
+ */
+ void dataCheck(ExtractOriginFormDTO formDTO);
+
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ProjectDataServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ProjectDataServiceImpl.java
new file mode 100644
index 0000000000..6d98d21115
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ProjectDataServiceImpl.java
@@ -0,0 +1,94 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see implements ProjectDataService {
+
+ /**
+ * 平阴三个街道上报统计数据正确性校验
+ *
+ * @param formDTO
+ * @Param formDTO
+ * @Return
+ * @Author zhaoqifeng
+ * @Date 2022/3/7 15:44
+ */
+ @Override
+ public void dataCheck(ExtractOriginFormDTO formDTO) {
+ if (StringUtils.isNotBlank(formDTO.getStartDate()) && StringUtils.isNotBlank(formDTO.getEndDate())) {
+ formDTO.setDateId(null);
+ } else {
+ if (StringUtils.isBlank(formDTO.getDateId())){
+ formDTO.setDateId(DimIdGenerator.getDateDimId(DateUtils.addDateDays(new Date(), -1)));
+ }
+ }
+ List list = baseDao.getCheckResult(formDTO);
+ if (CollectionUtils.isNotEmpty(list)) {
+ //发送钉钉消息
+ //EPMETV3群机器人
+ String secret = DingDingRobotConstant.V3_ROBOT_SECRET;
+ String url = DingDingRobotConstant.V3_ROBOT_URL;
+
+ for (DataCheckDTO dto : list) {
+ OapiRobotSendRequest request = new OapiRobotSendRequest();
+ request.setMsgtype("markdown");
+ OapiRobotSendRequest.Markdown markdown = new OapiRobotSendRequest.Markdown();
+ markdown.setTitle("平阴三个街道项目日统计数据上报比对结果");
+ markdown.setText("客户ID：" + dto.getCustomerId() +"\n\n"+
+ "> 客户名称：" + dto.getCustomerName() +"\n\n"+
+ "> 日期：" + dto.getDateId() + "\n\n"+
+ "> 上报项目数：" + dto.getReportCount() + "\n\n"+
+ "> 表中项目数：" + dto.getCount());
+ request.setMarkdown(markdown);
+ log.info("robot需要发送的内容为："+markdown.getText());
+ HttpClientManager.getInstance().sendDingMsg(JSON.toJSONString(request),url,secret);
+ }
+ }
+ }
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml
index 8374e06c4f..b159668ec9 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml
@@ -193,6 +193,11 @@ dynamic:
url: @datasource.druid.operCustomize.url@
username: @datasource.druid.operCustomize.username@
password: @datasource.druid.operCustomize.password@
+ evaluationIndexRead:
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: @datasource.druid.evaluationIndex1.url@
+ username: @datasource.druid.evaluationIndex1.username@
+ password: @datasource.druid.evaluationIndex1.password@
thread:
# 线程池配置
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml
index 7a192fa70d..fd9d29f527 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml
@@ -393,4 +393,56 @@
GROUP BY categoryCode
+
+ SELECT
+ CUSTOMER_ID AS customerId,
+ CASE
+ CUSTOMER_ID
+ WHEN '46c55cb862d6d5e6d05d2ab61a1cc07e' THEN
+ '榆山'
+ WHEN '44876154d10d7cb7affd92000f84f833' THEN
+ '锦水'
+ WHEN '6f203e30de1a65aab7e69c058826cd80' THEN
+ '平阴' ELSE '孔村'
+ END AS customerName,
+ PROJECT_TOTAL AS reportCount,
+ DATE_ID,
+ (
+ SELECT
+ count(*) AS dataCount
+ FROM
+ screen_project_data
+ WHERE
+ 1 = 1
+ AND customer_id = a.CUSTOMER_ID
+ AND DEL_FLAG = '0'
+ AND DATE_FORMAT( PROJECT_CREATE_TIME, '%Y%m%d' ) <= DATE_ID
+ GROUP BY
+ CUSTOMER_ID
+ ORDER BY
+ CUSTOMER_ID
+ ) AS count
+ FROM
+ epmet_data_statistical.fact_agency_project_daily a
+ WHERE
+ 1 = 1
+ AND del_flag = '0'
+ AND customer_id IN ( '2fe0065f70ca0e23ce4c26fca5f1d933', '44876154d10d7cb7affd92000f84f833', '46c55cb862d6d5e6d05d2ab61a1cc07e' )
+ AND AGENCY_ID IN ( '1234085031077498881', '1215437824174608386', '1258587398679126017' )
+
+ AND DATE_ID = #{dateId}
+
+
+ AND DATE_ID BETWEEN #{startDate} AND #{endDate}
+
+ GROUP BY
+ CUSTOMER_ID,
+ DATE_ID
+ HAVING
+ 1 = 1
+ AND reportCount != count
+ ORDER BY
+ CUSTOMER_ID,
+ DATE_ID DESC
+
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 25a4244301..90716be4c4 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
@@ -19,4 +19,7 @@ public interface ScreenExtractTaskService {
* @Date 2020/9/28 10:49
**/
Result screenExtractMonthly(String params);
+
+
+ Result dateCheckDaily(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 698a3ec7b3..dea86b3965 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
@@ -47,4 +47,13 @@ public class ScreenExtractTaskServiceImpl implements ScreenExtractTaskService {
}
return dataStatisticalOpenFeignClient.extractMonthlyAll(extractScreenFormDTO);
}
+
+ @Override
+ public Result dateCheckDaily(String params) {
+ ExtractOriginFormDTO extractOriginFormDTO = new ExtractOriginFormDTO();
+ if (StringUtils.isNotBlank(params)) {
+ extractOriginFormDTO = JSON.parseObject(params, ExtractOriginFormDTO.class);
+ }
+ return dataStatisticalOpenFeignClient.dataCheck(extractOriginFormDTO);
+ }
}
diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/DataCheckDailyTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/DataCheckDailyTask.java
new file mode 100644
index 0000000000..e94d4c68c7
--- /dev/null
+++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/DataCheckDailyTask.java
@@ -0,0 +1,33 @@
+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 Administrator
+ */
+@Component("dataCheckDailyTask")
+public class DataCheckDailyTask implements ITask{
+
+ @Autowired
+ private ScreenExtractTaskService screenExtractTaskService;
+
+ private Logger logger = LoggerFactory.getLogger(getClass());
+
+
+ @Override
+ public void run(String params) {
+ logger.info("DataCheckDailyTask定时任务正在执行，参数为：{}", params);
+ Result result = screenExtractTaskService.dateCheckDaily(params);
+ if (result.success()){
+ logger.info("DataCheckDailyTask定时任务执行成功");
+ }else {
+ logger.error("DataCheckDailyTask定时任务执行失败:" + result.getMsg());
+ }
+ }
+}