平阴三个街道上传项目统计数据校验

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/DataSourceConstant.java

@@ -12,6 +12,7 @@ public interface DataSourceConstant {
     String RESI_GROUP = "resiGroup";
     String EPMET_USER = "epmetuser";
     String EVALUATION_INDEX = "evaluationIndex";
+    String EVALUATION_INDEX_READ = "evaluationIndexRead";
     String PARTY_MEMBER = "partyMember";
     String EPMET_HEART="epmetHeart";
     String EPMET_POINT = "epmetPoint";

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/result/DataCheckDTO.java

@@ -0,0 +1,35 @@
+package com.epmet.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2022/3/7 15:56
+ */
+@Data
+public class DataCheckDTO implements Serializable {
+    private static final long serialVersionUID = -5836567756526658928L;
+    /**
+     * 客户ID
+     */
+    private String customerId;
+    /**
+     * 客户名
+     */
+    private String customerName;
+    /**
+     * 日期
+     */
+    private String dateId;
+    /**
+     * 上报项目数
+     */
+    private String reportCount;
+    /**
+     * 项目数
+     */
+    private String count;
+}

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java

@@ -365,4 +365,7 @@ public interface DataStatisticalOpenFeignClient {
 
     @PostMapping("/data/stats/ic/user/category-analysis-daily")
     Result statUserCategoryDaily(@RequestBody IcUserCategoryAnalysisDailyFormDTO formDTO);
+
+    @PostMapping("/data/stats/screenextract/data_check")
+    Result dataCheck(@RequestBody ExtractOriginFormDTO formDTO);
 }

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java

@@ -346,4 +346,9 @@ public class DataStatisticalOpenFeignClientFallBack implements DataStatisticalOp
     public Result statUserCategoryDaily(IcUserCategoryAnalysisDailyFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "statUserCategoryDaily", formDTO);
     }
+
+    @Override
+    public Result dataCheck(ExtractOriginFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "dataCheck", formDTO);
+    }
 }

epmet-module/data-statistical/data-statistical-server/pom.xml

@@ -242,6 +242,12 @@
                 <datasource.druid.evaluationIndex.username>epmet_evaluation_index_user</datasource.druid.evaluationIndex.username>
                 <datasource.druid.evaluationIndex.password>EpmEt-db-UsEr</datasource.druid.evaluationIndex.password>
 
+                <datasource.druid.evaluationIndex1.url>
+                    <![CDATA[jdbc:mysql://192.168.1.140:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.evaluationIndex1.url>
+                <datasource.druid.evaluationIndex1.username>root</datasource.druid.evaluationIndex1.username>
+                <datasource.druid.evaluationIndex1.password>root</datasource.druid.evaluationIndex1.password>
+
                 <datasource.druid.partyMember.url>
                     <![CDATA[jdbc:mysql://192.168.1.140:3306/epmet_resi_partymember?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.partyMember.url>
@@ -374,6 +380,12 @@
                 <datasource.druid.evaluationIndex.username>epmet_evaluation_index_user</datasource.druid.evaluationIndex.username>
                 <datasource.druid.evaluationIndex.password>EpmEt-db-UsEr</datasource.druid.evaluationIndex.password>
 
+                <datasource.druid.evaluationIndex1.url>
+                    <![CDATA[jdbc:mysql://192.168.1.140:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.evaluationIndex1.url>
+                <datasource.druid.evaluationIndex1.username>root</datasource.druid.evaluationIndex1.username>
+                <datasource.druid.evaluationIndex1.password>root</datasource.druid.evaluationIndex1.password>
+
                 <datasource.druid.partyMember.url>
                     <![CDATA[jdbc:mysql://192.168.1.140:3306/epmet_resi_partymember?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.partyMember.url>
@@ -506,6 +518,12 @@
                 <datasource.druid.evaluationIndex.username>epmet</datasource.druid.evaluationIndex.username>
                 <datasource.druid.evaluationIndex.password>elink@833066</datasource.druid.evaluationIndex.password>
 
+                <datasource.druid.evaluationIndex1.url>
+                    <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.evaluationIndex1.url>
+                <datasource.druid.evaluationIndex1.username>epmet</datasource.druid.evaluationIndex1.username>
+                <datasource.druid.evaluationIndex1.password>elink@833066</datasource.druid.evaluationIndex1.password>
+
                 <datasource.druid.partyMember.url>
                     <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_resi_partymember?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.partyMember.url>
@@ -634,6 +652,12 @@
                 <datasource.druid.evaluationIndex.username>epmet_evaluation_index_user</datasource.druid.evaluationIndex.username>
                 <datasource.druid.evaluationIndex.password>EpmEt-db-UsEr</datasource.druid.evaluationIndex.password>
 
+                <datasource.druid.evaluationIndex1.url>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.evaluationIndex1.url>
+                <datasource.druid.evaluationIndex1.username>epmet_cloud_viewer</datasource.druid.evaluationIndex1.username>
+                <datasource.druid.evaluationIndex1.password>EpmEtclOUdvIEwEr@w</datasource.druid.evaluationIndex1.password>
+
                 <datasource.druid.partyMember.url>
                     <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_resi_partymember?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.partyMember.url>

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenExtractDailyController.java

@@ -5,6 +5,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.extract.form.ExtractOriginFormDTO;
 import com.epmet.dto.extract.form.ExtractScreenFormDTO;
 import com.epmet.service.evaluationindex.extract.toscreen.ScreenExtractService;
+import com.epmet.service.evaluationindex.screen.ProjectDataService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -12,6 +13,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
 import java.util.concurrent.ExecutorService;
 
 /**
@@ -26,6 +28,8 @@ public class ScreenExtractDailyController {
     private ScreenExtractService screenExtractService;
     @Autowired
     private ExecutorService executorService;
+    @Resource
+    private ProjectDataService projectDataService;
 
     /**
      * @param extractOriginFormDTO
@@ -59,4 +63,19 @@ public class ScreenExtractDailyController {
         return new Result();
     }
 
+
+    /**
+     * 平阴三个街道上报统计数据正确性校验
+     *
+     * @Param formDTO
+     * @Return {@link Result}
+     * @Author zhaoqifeng
+     * @Date 2022/3/7 15:43
+     */
+    @PostMapping("data_check")
+    public Result dataCheck(@RequestBody ExtractOriginFormDTO formDTO) {
+        projectDataService.dataCheck(formDTO);
+        return new Result();
+    }
+
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectDataDao.java

@@ -18,7 +18,9 @@
 package com.epmet.dao.evaluationindex.screen;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.extract.form.ExtractOriginFormDTO;
 import com.epmet.dto.screen.ScreenProjectDataDTO;
+import com.epmet.dto.screen.result.DataCheckDTO;
 import com.epmet.dto.screen.result.GridAndOrgCategoryCountResultDTO;
 import com.epmet.entity.evaluationindex.screen.ScreenProjectDataEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -111,4 +113,13 @@ public interface ScreenProjectDataDao extends BaseDao<ScreenProjectDataEntity> {
                                                                          @Param("customerId") String customerId, @Param("subCount")Integer subCount,
                                                                          @Param("allAgencies") List<GridAndOrgCategoryCountResultDTO> allAgencies);
 
+    /**
+     * 获取数据比对结果
+     *
+     * @Param formDTO
+     * @Return {@link List< DataCheckDTO>}
+     * @Author zhaoqifeng
+     * @Date 2022/3/7 16:00
+     */
+    List<DataCheckDTO> getCheckResult(ExtractOriginFormDTO formDTO);
 }

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
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.evaluationindex.screen;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.dto.extract.form.ExtractOriginFormDTO;
+import com.epmet.entity.evaluationindex.screen.ScreenProjectDataEntity;
+
+/**
+ * 中央区-项目数据
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2021-02-23
+ */
+public interface ProjectDataService extends BaseService<ScreenProjectDataEntity> {
+
+    /**
+     * 平阴三个街道上报统计数据正确性校验
+     *
+     * @Param formDTO
+     * @Return
+     * @Author zhaoqifeng
+     * @Date 2022/3/7 15:44
+     */
+    void dataCheck(ExtractOriginFormDTO formDTO);
+
+}

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
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.evaluationindex.screen.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.dingtalk.api.request.OapiRobotSendRequest;
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.DingDingRobotConstant;
+import com.epmet.commons.tools.utils.DateUtils;
+import com.epmet.commons.tools.utils.HttpClientManager;
+import com.epmet.constant.DataSourceConstant;
+import com.epmet.dao.evaluationindex.screen.ScreenProjectDataDao;
+import com.epmet.dto.extract.form.ExtractOriginFormDTO;
+import com.epmet.dto.screen.result.DataCheckDTO;
+import com.epmet.entity.evaluationindex.screen.ScreenProjectDataEntity;
+import com.epmet.service.evaluationindex.screen.ProjectDataService;
+import com.epmet.util.DimIdGenerator;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 中央区-项目数据
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2021-02-23
+ */
+@Slf4j
+@Service
+@DataSource(value = DataSourceConstant.EVALUATION_INDEX_READ)
+public class ProjectDataServiceImpl extends BaseServiceImpl<ScreenProjectDataDao, ScreenProjectDataEntity> 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<DataCheckDTO> 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);
+            }
+        }
+    }
+}

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:
   # 线程池配置

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml

@@ -393,4 +393,56 @@
             GROUP BY categoryCode
         </foreach>
     </select>
+    <select id="getCheckResult" resultType="com.epmet.dto.screen.result.DataCheckDTO">
+        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' ) &lt;= 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' )
+            <if test='null != dateId and "" != dateId'>
+                AND DATE_ID = #{dateId}
+            </if>
+            <if test='null != startDate and "" != startDate and null != endDate and "" != endDate'>
+                AND DATE_ID BETWEEN #{startDate} AND #{endDate}
+            </if>
+        GROUP BY
+            CUSTOMER_ID,
+            DATE_ID
+        HAVING
+            1 = 1
+            AND reportCount != count
+        ORDER BY
+            CUSTOMER_ID,
+            DATE_ID DESC
+    </select>
 </mapper>

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);
 }

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

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