定时成功

epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenGridManagerController.java

@@ -1,6 +1,7 @@
 package com.elink.esua.epdc.modules.screen.controller;
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.analysis.pc.screen.form.GmUploaddataParamDTO;
 import com.elink.esua.epdc.dto.analysis.pc.screen.form.ScreenJobFormDTO;
 import com.elink.esua.epdc.modules.screen.service.ScreenGridManagerService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,8 +30,8 @@ public class ScreenGridManagerController {
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.screen.result.GridManagerUploadDataResultDTO>>
      **/
     @PostMapping("gridManagerUploadData")
-    public Result selectGridManagerUploadData() {
+    public Result selectGridManagerUploadData(@RequestBody GmUploaddataParamDTO paramDto) {
-        return screenGridManagerService.selectGridManagerUploadData();
+        return screenGridManagerService.selectGridManagerUploadData(paramDto);
     }
     /**
      * @Description  网格员事件分析上报

epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenGridManagerDao.java

@@ -1,6 +1,7 @@
 package com.elink.esua.epdc.modules.screen.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.analysis.pc.screen.form.GmUploaddataParamDTO;
 import com.elink.esua.epdc.dto.analysis.pc.screen.result.GridManagerUploadDataResultDTO;
 import com.elink.esua.epdc.dto.analysis.pc.screen.result.GridManagerUploadEventResultDTO;
 import com.elink.esua.epdc.dto.analysis.pc.screen.result.ScreenBaseReportResultDTO;
@@ -24,7 +25,7 @@ public interface ScreenGridManagerDao extends BaseDao<ScreenBaseReportResultDTO>
      * @Param [customId]
      * @return java.util.List<com.elink.esua.epdc.dto.screen.result.GridManagerUploadDataResultDTO>
      **/
-    List<GridManagerUploadDataResultDTO> selectGridManagerUploadData(@Param("customId")String customId, @Param("yearMonthDay") String yearMonthDay);
+    List<GridManagerUploadDataResultDTO> selectGridManagerUploadData(GmUploaddataParamDTO paramDto);
     /**
      * @Description  网格员事件总数上报
      * @Author songyunpeng

epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenGridManagerService.java

@@ -1,6 +1,7 @@
 package com.elink.esua.epdc.modules.screen.service;
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.analysis.pc.screen.form.GmUploaddataParamDTO;
 
 /**
  * 网格管理
@@ -17,7 +18,7 @@ public interface ScreenGridManagerService {
      * @Param [customId]
      * @return java.util.List<com.elink.esua.epdc.dto.screen.result.GridManagerUploadDataResultDTO>
      **/
-    Result selectGridManagerUploadData();
+    Result selectGridManagerUploadData(GmUploaddataParamDTO paramDto);
     /**
      * @Description  网格员事件总数上报
      * @Author songyunpeng

epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenGridManagerServiceImpl.java

@@ -4,6 +4,7 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.EpmetConstant;
 import com.elink.esua.epdc.commons.tools.utils.DateUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.analysis.pc.screen.form.GmUploaddataParamDTO;
 import com.elink.esua.epdc.dto.analysis.pc.screen.result.GridManagerUploadDataResultDTO;
 import com.elink.esua.epdc.dto.analysis.pc.screen.result.GridManagerUploadEventResultDTO;
 import com.elink.esua.epdc.dto.analysis.pc.screen.result.ScreenBaseReportResultDTO;
@@ -18,6 +19,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 
@@ -36,23 +40,82 @@ public class ScreenGridManagerServiceImpl extends BaseServiceImpl<ScreenGridMana
     private String customerId;
 
     @Override
-    public Result selectGridManagerUploadData() {
+    public Result selectGridManagerUploadData(GmUploaddataParamDTO paramDto) {
-        // 统计截止到昨天的数据
+        paramDto.setCustomId(customerId);
-        String yearMonthDay = DateUtils.format(DateUtils.addDateDays(new Date(), -1));
-        logger.info("时间"+yearMonthDay);
-        List<GridManagerUploadDataResultDTO> gridManagerUploadDataResultDTOS = baseDao.selectGridManagerUploadData(customerId, yearMonthDay);
-        logger.info("结果"+gridManagerUploadDataResultDTOS.size());
 
-        if(gridManagerUploadDataResultDTOS.size()!=0){
+        if (StringUtils.isBlank(paramDto.getEndTime())) {
-            String dataJson = ScreenDataUtils.getScreenDateJson(gridManagerUploadDataResultDTOS,true);
+            // 统计截止到昨天的数据
-            logger.info("数据"+dataJson);
+            String yearMonthDay = DateUtils.format(DateUtils.addDateDays(new Date(), -1));
+            paramDto.setYearMonthDay(yearMonthDay);
+            logger.info("时间"+yearMonthDay);
+            List<GridManagerUploadDataResultDTO> gridManagerUploadDataResultDTOS = baseDao.selectGridManagerUploadData(paramDto);
+            logger.info("结果"+gridManagerUploadDataResultDTOS.size());
 
-            // 数据上报
+            if(gridManagerUploadDataResultDTOS.size()!=0){
-            String s = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_STATS_USER_GRID_MANAGER_UPLOAD_DATA, dataJson);
+                String dataJson = ScreenDataUtils.getScreenDateJson(gridManagerUploadDataResultDTOS,true);
-            logger.info("返回结果"+s);
+                logger.info("数据"+dataJson);
+
+                // 数据上报
+                String s = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_STATS_USER_GRID_MANAGER_UPLOAD_DATA, dataJson);
+                logger.info("返回结果"+s);
+            }
+
+
+        } else {
+            // 推送所有日期
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            Calendar ca = Calendar.getInstance();
+            Date curDate = null;
+            Date endDate = null;
+            try {
+                curDate = sdf.parse(paramDto.getStartTime());
+                endDate = sdf.parse(paramDto.getEndTime());
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
+            int i =curDate.compareTo(endDate);
+            while (curDate.compareTo(endDate) <= 0) {
+                ca.setTime(curDate);
+                paramDto.setEndTime(sdf.format(curDate));
+                ca.add(Calendar.DAY_OF_MONTH, 1);
+                curDate = ca.getTime();
+
+                // 统计截止到昨天的数据
+                String yearMonthDay = DateUtils.format(DateUtils.addDateDays(new Date(), -1));
+                paramDto.setYearMonthDay(yearMonthDay);
+                logger.info("时间"+yearMonthDay);
+                List<GridManagerUploadDataResultDTO> gridManagerUploadDataResultDTOS = baseDao.selectGridManagerUploadData(paramDto);
+                logger.info("结果"+gridManagerUploadDataResultDTOS.size());
+
+                if(gridManagerUploadDataResultDTOS.size()!=0){
+                    String dataJson = ScreenDataUtils.getScreenDateJson(gridManagerUploadDataResultDTOS,true);
+                    logger.info("数据"+dataJson);
+
+                    // 数据上报
+                    String s = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_STATS_USER_GRID_MANAGER_UPLOAD_DATA, dataJson);
+                    logger.info("返回结果"+s);
+                }
+
+            }
         }
+        return new Result();
 
-        return new Result<>();
+//        // 统计截止到昨天的数据
+//        String yearMonthDay = DateUtils.format(DateUtils.addDateDays(new Date(), -1));
+//        logger.info("时间"+yearMonthDay);
+//        List<GridManagerUploadDataResultDTO> gridManagerUploadDataResultDTOS = baseDao.selectGridManagerUploadData(customerId, yearMonthDay);
+//        logger.info("结果"+gridManagerUploadDataResultDTOS.size());
+//
+//        if(gridManagerUploadDataResultDTOS.size()!=0){
+//            String dataJson = ScreenDataUtils.getScreenDateJson(gridManagerUploadDataResultDTOS,true);
+//            logger.info("数据"+dataJson);
+//
+//            // 数据上报
+//            String s = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_STATS_USER_GRID_MANAGER_UPLOAD_DATA, dataJson);
+//            logger.info("返回结果"+s);
+//        }
+//
+//        return new Result<>();
     }
 
     @Override

epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenGridManagerDao.xml

@@ -3,21 +3,37 @@
 
 <mapper namespace="com.elink.esua.epdc.modules.screen.dao.ScreenGridManagerDao">
 
-    <select id="selectGridManagerUploadData"
+    <select id="selectGridManagerUploadData" parameterType="com.elink.esua.epdc.dto.analysis.pc.screen.form.GmUploaddataParamDTO"
             resultType="com.elink.esua.epdc.dto.analysis.pc.screen.result.GridManagerUploadDataResultDTO">
 
         select
         '${customId}'                                                                              as customerId,
-        DATE_FORMAT(#{yearMonthDay}, '%Y%m%d')                                             as dateId,
+        <choose>
-        CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(#{yearMonthDay}, '%Y-%m-%d'), '%Y'), '%Y'),
+            <when test="endTime != null and endTime != ''">
-        'W',
+                DATE_FORMAT(#{endTime}, '%Y%m%d')                                             as dateId,
-        WEEK(STR_TO_DATE(DATE_FORMAT(#{yearMonthDay}, '%Y-%m-%d'), '%Y-%m-%d')))         weekId,
+                CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(#{endTime}, '%Y-%m-%d'), '%Y'), '%Y'),
-        DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(#{yearMonthDay}, '%Y-%m-%d'), '%Y'), '%Y')       AS yearId,
+                'W',
-        CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(#{yearMonthDay}, '%Y-%m-%d'), '%Y'), '%Y'),
+                WEEK(STR_TO_DATE(DATE_FORMAT(#{endTime}, '%Y-%m-%d'), '%Y-%m-%d')))         weekId,
-        'Q',
+                DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(#{endTime}, '%Y-%m-%d'), '%Y'), '%Y')       AS yearId,
-        QUARTER(STR_TO_DATE(DATE_FORMAT(#{yearMonthDay}, '%Y-%m-%d'),
+                CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(#{endTime}, '%Y-%m-%d'), '%Y'), '%Y'),
-        '%Y-%m-%d')))                                                                 quarterId,
+                'Q',
-        DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(#{yearMonthDay}, '%Y-%m-%d'), '%Y-%m'), '%Y%m')  AS monthId,
+                QUARTER(STR_TO_DATE(DATE_FORMAT(#{endTime}, '%Y-%m-%d'),
+                '%Y-%m-%d')))                                                                 quarterId,
+                DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(#{endTime}, '%Y-%m-%d'), '%Y-%m'), '%Y%m')  AS monthId,
+            </when>
+            <otherwise>
+                DATE_FORMAT(#{yearMonthDay}, '%Y%m%d')                                             as dateId,
+                CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(#{yearMonthDay}, '%Y-%m-%d'), '%Y'), '%Y'),
+                'W',
+                WEEK(STR_TO_DATE(DATE_FORMAT(#{yearMonthDay}, '%Y-%m-%d'), '%Y-%m-%d')))         weekId,
+                DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(#{yearMonthDay}, '%Y-%m-%d'), '%Y'), '%Y')       AS yearId,
+                CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(#{yearMonthDay}, '%Y-%m-%d'), '%Y'), '%Y'),
+                'Q',
+                QUARTER(STR_TO_DATE(DATE_FORMAT(#{yearMonthDay}, '%Y-%m-%d'),
+                '%Y-%m-%d')))                                                                 quarterId,
+                DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(#{yearMonthDay}, '%Y-%m-%d'), '%Y-%m'), '%Y%m')  AS monthId,
+            </otherwise>
+        </choose>
         a.staffId,
         a.staffName,
         a.gridId,
@@ -41,8 +57,16 @@
         seur.STAFF_NAME as staffName,
         ee.GRID_ID as gridId,
         sd.pid,
-        count(DATE_FORMAT(ee.CREATED_TIME, '%Y-%m-%d') &lt;= #{yearMonthDay} or null) as projectCount, -- 项目立项数,截止到当前dateId的总数
+        <choose>
-        count(DATE_FORMAT(ee.CREATED_TIME, '%Y-%m-%d') = #{yearMonthDay} or null) as projectIncr, -- 项目立项数，dateId这一天的增量
+            <when test="endTime != null and endTime != ''">
+                count(DATE_FORMAT(ee.CREATED_TIME, '%Y-%m-%d') &lt;= #{endTime} or null) as projectCount, -- 项目立项数,截止到当前dateId的总数
+                count(DATE_FORMAT(ee.CREATED_TIME, '%Y-%m-%d') = #{endTime} or null) as projectIncr, -- 项目立项数，dateId这一天的增量
+            </when>
+            <otherwise>
+                count(DATE_FORMAT(ee.CREATED_TIME, '%Y-%m-%d') &lt;= #{yearMonthDay} or null) as projectCount, -- 项目立项数,截止到当前dateId的总数
+                count(DATE_FORMAT(ee.CREATED_TIME, '%Y-%m-%d') = #{yearMonthDay} or null) as projectIncr, -- 项目立项数，dateId这一天的增量
+            </otherwise>
+        </choose>
         0 as issueToProjectCount,
         0 as closedIssueCount,
         0 as projectResponseCount,
@@ -73,12 +97,20 @@
         sd.pid,
         0 as projectCount,
         0 as projectIncr,
-        count(DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') &lt;= #{yearMonthDay} or null) as issueToProjectCount, -- 议题转项目数,截止到当前dateId的总数
+        <choose>
+            <when test="endTime != null and endTime != ''">
+                count(DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') &lt;= #{endTime} or null) as issueToProjectCount, -- 议题转项目数,截止到当前dateId的总数
+                count(DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') = #{endTime} or null) as issueToProjectIncr, -- 议题转项目数，dateId这一天的增量
+            </when>
+            <otherwise>
+                count(DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') &lt;= #{yearMonthDay} or null) as issueToProjectCount, -- 议题转项目数,截止到当前dateId的总数
+                count(DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') = #{yearMonthDay} or null) as issueToProjectIncr, -- 议题转项目数，dateId这一天的增量
+            </otherwise>
+        </choose>
         0 as closedIssueCount,
         0 as projectResponseCount,
         0 as projectTransferCount,
         0 as projectClosedCount,
-        count(DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') = #{yearMonthDay} or null) as issueToProjectIncr, -- 议题转项目数，dateId这一天的增量
         0 as closedIssueIncr,
         0 as projectResponseIncr,
         0 as projectTransferIncr,
@@ -104,12 +136,20 @@
         0 as projectCount,
         0 as projectIncr,
         0 as issueToProjectCount,
-        count(DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') &lt;= #{yearMonthDay} or null) as closedIssueCount, -- 议题关闭数,截止到当前dateId的总数
+        <choose>
+            <when test="endTime != null and endTime != ''">
+                count(DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') &lt;= #{endTime} or null) as closedIssueCount, -- 议题关闭数,截止到当前dateId的总数
+                count(DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') = #{endTime} or null) as closedIssueIncr, -- 议题关闭数，dateId这一天的增量
+            </when>
+            <otherwise>
+                count(DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') &lt;= #{yearMonthDay} or null) as closedIssueCount, -- 议题关闭数,截止到当前dateId的总数
+                count(DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') = #{yearMonthDay} or null) as closedIssueIncr, -- 议题关闭数，dateId这一天的增量
+            </otherwise>
+        </choose>
         0 as projectResponseCount,
         0 as projectTransferCount,
         0 as projectClosedCount,
         0 as issueToProjectIncr,
-        count(DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') = #{yearMonthDay} or null) as closedIssueIncr, -- 议题关闭数，dateId这一天的增量
         0 as projectResponseIncr,
         0 as projectTransferIncr,
         0 as projectClosedIncr
@@ -136,14 +176,26 @@
         0 as projectIncr,
         0 as issueToProjectCount,
         0 as closedIssueCount,
-        count(DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') &lt;= #{yearMonthDay} and ei.STATE = 0 and eid.ID is null or null) as projectResponseCount, -- 项目响应数,截止到当前dateId的总数
+        <choose>
-        count(DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') &lt;= #{yearMonthDay} and ei.STATE = 0 and eid.ID is not null or null) as projectTransferCount, -- 项目吹哨数,截止到当前dateId的总数
+            <when test="endTime != null and endTime != ''">
-        count(DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') &lt;= #{yearMonthDay} and ei.STATE = 10 or null) as projectClosedCount, -- 项目结案数，截止到当前dateId的总数
+                count(DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') &lt;= #{endTime} and ei.STATE = 0 and eid.ID is null or null) as projectResponseCount, -- 项目响应数,截止到当前dateId的总数
+                count(DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') &lt;= #{endTime} and ei.STATE = 0 and eid.ID is not null or null) as projectTransferCount, -- 项目吹哨数,截止到当前dateId的总数
+                count(DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') &lt;= #{endTime} and ei.STATE = 10 or null) as projectClosedCount, -- 项目结案数，截止到当前dateId的总数
+                count(DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') = #{endTime} and ei.STATE = 0 and eid.ID is null or null) as projectResponseIncr, -- 项目响应数，dateId这一天的增量
+                count(DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') = #{endTime} and ei.STATE = 0 and eid.ID is not null or null) as projectTransferIncr, -- 项目吹哨数，dateId这一天的增量
+                count(DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') = #{endTime} and ei.STATE = 10 or null) as projectClosedIncr -- 项目结案数，dateId这一天的增量
+            </when>
+            <otherwise>
+                count(DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') &lt;= #{yearMonthDay} and ei.STATE = 0 and eid.ID is null or null) as projectResponseCount, -- 项目响应数,截止到当前dateId的总数
+                count(DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') &lt;= #{yearMonthDay} and ei.STATE = 0 and eid.ID is not null or null) as projectTransferCount, -- 项目吹哨数,截止到当前dateId的总数
+                count(DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') &lt;= #{yearMonthDay} and ei.STATE = 10 or null) as projectClosedCount, -- 项目结案数，截止到当前dateId的总数
+                count(DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') = #{yearMonthDay} and ei.STATE = 0 and eid.ID is null or null) as projectResponseIncr, -- 项目响应数，dateId这一天的增量
+                count(DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') = #{yearMonthDay} and ei.STATE = 0 and eid.ID is not null or null) as projectTransferIncr, -- 项目吹哨数，dateId这一天的增量
+                count(DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') = #{yearMonthDay} and ei.STATE = 10 or null) as projectClosedIncr -- 项目结案数，dateId这一天的增量
+            </otherwise>
+        </choose>
         0 as issueToProjectIncr,
         0 as closedIssueIncr,
-        count(DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') = #{yearMonthDay} and ei.STATE = 0 and eid.ID is null or null) as projectResponseIncr, -- 项目响应数，dateId这一天的增量
-        count(DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') = #{yearMonthDay} and ei.STATE = 0 and eid.ID is not null or null) as projectTransferIncr, -- 项目吹哨数，dateId这一天的增量
-        count(DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') = #{yearMonthDay} and ei.STATE = 10 or null) as projectClosedIncr -- 项目结案数，dateId这一天的增量
         from esua_epdc_admin.sys_epmet_user_relation seur
         left join esua_epdc_admin.sys_user eu on eu.MOBILE = seur.MOBILE
         right join esua_epdc_events.epdc_item_handle_process ei on ei.CREATED_BY = eu.id and ei.DEL_FLAG = '0'

epdc-cloud-client-yushan

@@ -1 +1 @@
-Subproject commit 68781e585aba07aa918fbe20a75144389e43dfd6
+Subproject commit b9acf7644934c90b35541e8b49495e6aa39a7e4c