补充

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

@@ -11,6 +11,8 @@ import com.elink.esua.epdc.modules.screen.service.ScreenBaseReportService;
 import com.elink.esua.epdc.utils.EpmetUtils;
 import com.elink.esua.epdc.utils.ScreenDataUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -32,6 +34,8 @@ import java.util.Optional;
 @Service
 public class ScreenBaseReportServiceImpl extends BaseServiceImpl<ScreenBaseReportDao, ScreenBaseReportResultDTO> implements ScreenBaseReportService {
 
+    private final Logger logger = LogManager.getLogger(getClass());
+
     @Autowired
     private EpmetUtils epmetUtils;
 
@@ -180,7 +184,7 @@ public class ScreenBaseReportServiceImpl extends BaseServiceImpl<ScreenBaseRepor
             String dataJson = ScreenDataUtils.getScreenDateJson(gridGridProjectResultDTOS, true);
             // 数据上报
             String s = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_GRID_PROJECT, dataJson);
-            System.out.print("结果返回"+s);
+            logger.info("当天网格项目数据上报数据     " + s);
         } else {
             // 推送所有日期
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -202,9 +206,10 @@ public class ScreenBaseReportServiceImpl extends BaseServiceImpl<ScreenBaseRepor
                 // 推送逻辑
                 List<GridGridProjectResultDTO> gridGridProjectResultDTOS = baseDao.selectGridProjectList(paramDto);
                 String dataJson = ScreenDataUtils.getScreenDateJson(gridGridProjectResultDTOS, true);
+                logger.info("网格项目数据上报数据     " + dataJson);
                 // 数据上报
-                epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_GRID_PROJECT, dataJson);
-                System.out.print("所有数据" + dataJson);
+                String s = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_GRID_PROJECT, dataJson);
+                logger.info("网格项目数据返回数据    " + s);
             }
         }
         return new Result();
@@ -219,7 +224,7 @@ public class ScreenBaseReportServiceImpl extends BaseServiceImpl<ScreenBaseRepor
             String dataJson = ScreenDataUtils.getScreenDateJson(communityProjectResultDTOS, true);
             // 数据上报
             String s = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_AGENCY_PROJECT, dataJson);
-            System.out.print("结果返回"+s);
+            logger.info("组织项目数据常规结果返回"+s);
         } else {
             // 推送所有日期
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -241,9 +246,10 @@ public class ScreenBaseReportServiceImpl extends BaseServiceImpl<ScreenBaseRepor
                 // 推送逻辑
                 List<CommunityProjectResultDTO> communityProjectResultDTOS = baseDao.selectCommunityProjectList(paramDto);
                 String dataJson = ScreenDataUtils.getScreenDateJson(communityProjectResultDTOS, true);
+                logger.info("组织项目数据上报数据     " + dataJson);
                 // 数据上报
                 String s = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_AGENCY_PROJECT, dataJson);
-                System.out.print("所有数据" + dataJson);
+                logger.info("组织项目数据结果返回    "+s);
             }
         }
         return new Result();

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

@@ -12,6 +12,8 @@ import com.elink.esua.epdc.modules.screen.service.ScreenGridManagerService;
 import com.elink.esua.epdc.utils.EpmetUtils;
 import com.elink.esua.epdc.utils.ScreenDataUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -28,6 +30,8 @@ public class ScreenGridManagerServiceImpl extends BaseServiceImpl<ScreenGridMana
     @Autowired
     private EpmetUtils epmetUtils;
 
+    private final Logger logger = LogManager.getLogger(getClass());
+
     @Value("${epmet.config.customerId}")
     private String customerId;
 
@@ -35,11 +39,17 @@ public class ScreenGridManagerServiceImpl extends BaseServiceImpl<ScreenGridMana
     public Result selectGridManagerUploadData() {
         // 统计截止到昨天的数据
         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);
+
             // 数据上报
-            epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_STATS_USER_GRID_MANAGER_UPLOAD_DATA, dataJson);
+            String s = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_STATS_USER_GRID_MANAGER_UPLOAD_DATA, dataJson);
+            logger.info("返回结果"+s);
         }
 
         return new Result<>();

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

@@ -1566,14 +1566,14 @@
         ifnull(count(ei.ITEM_STATE = '0' and DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') or null),0) as pendingIncr,
         ifnull(count((ei.ITEM_STATE = '10' or ei.ITEM_STATE = '5') and DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') or null),0) as closedIncr
 
-        from yushan_esua_epdc_admin.sys_dept sd
-        left join yushan_esua_epdc_events.epdc_item ei  on find_in_set(sd.id,ei.ALL_DEPT_IDS) and ei.DEL_FLAG ='0'
+        from esua_epdc_admin.sys_dept sd
+        left join esua_epdc_events.epdc_item ei  on find_in_set(sd.id,ei.ALL_DEPT_IDS) and ei.DEL_FLAG ='0'
         where sd.del_flag = '0'
         and sd.type_key in('community_party', 'street_party')
-        and sd.id not in (SELECT t.DEPT_ID FROM `yushan_esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG  = '0')
+        and sd.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG  = '0')
         <choose>
             <when test="endTime != null and endTime != ''">
-                and DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(#{endTime}, '%Y-%m-%d')
+                and DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(date_add(#{endTime}, interval -1 day), '%Y-%m-%d')
             </when>
             <otherwise>
                 and DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d')

epdc-cloud-client-yushan

@@ -1 +1 @@
-Subproject commit 2cea96391ebb8473f4f5b95d612d7cc058b05081
+Subproject commit 05923a0568d61f97bc1d8847f481c5584039e7b8