Merge remote-tracking branch 'origin/master'

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

@@ -49,15 +49,14 @@ public class ScreenGridManagerServiceImpl extends BaseServiceImpl<ScreenGridMana
             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);
+                logger.info("正常组织注册用户数据"+dataJson);
 
                 // 数据上报
                 String s = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_STATS_USER_GRID_MANAGER_UPLOAD_DATA, dataJson);
-                logger.info("返回结果"+s);
+                logger.info("正常组织注册用户数据返回结果"+s);
             }
 
 
@@ -83,17 +82,16 @@ public class ScreenGridManagerServiceImpl extends BaseServiceImpl<ScreenGridMana
                 // 统计截止到昨天的数据
                 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);
+                    logger.info("组织注册用户数据数据"+dataJson);
 
                     // 数据上报
                     String s = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_STATS_USER_GRID_MANAGER_UPLOAD_DATA, dataJson);
-                    logger.info("返回结果"+s);
+                    logger.info("组织注册用户数据返回结果"+s);
                 }
 
             }

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

@@ -11,6 +11,8 @@ import com.elink.esua.epdc.modules.screen.service.ScreenPublicDataService;
 import com.elink.esua.epdc.utils.EpmetUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -29,7 +31,7 @@ public class ScreenPublicDataServiceImpl extends BaseServiceImpl<ScreenPublicDat
 
     @Autowired
     private EpmetUtils epmetUtils;
-
+    private final Logger logger = LogManager.getLogger(getClass());
     @Override
     public Result customerAgency() {
         List<ScreenCustomerAgencyDTO> data = baseDao.customerAgency();
@@ -43,10 +45,12 @@ public class ScreenPublicDataServiceImpl extends BaseServiceImpl<ScreenPublicDat
     @Override
     public Result customerGrid() {
         List<ScreenCustomerGridDTO> data = baseDao.customerGrid();
+        logger.info("网格信息上传    "+data.toString());
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("isFirst", true);
         jsonObject.put("dataList", data);
-        epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_COLL_CUSTOMER_GRID, JSONObject.toJSONString(jsonObject));
+        String s = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_COLL_CUSTOMER_GRID, JSONObject.toJSONString(jsonObject));
+        logger.info("网格信息上传返回    "+s);
         return new Result();
     }
 

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

@@ -32,7 +32,7 @@
         SELECT sd.`id` AS gridId,
                sd.`name` AS gridName,
                sd.`pid` AS parentAgencyId,
-               SUBSTRING_INDEX(sd.pids, ',', -1) AS allParentIds,
+               REPLACE(sd.pids,(SELECT CONCAT(s.id,',') FROM `esua_epdc_admin`.sys_dept s WHERE s.pid = '0'),'')AS  allParentIds,
                '' AS areaMarks,
                '' AS centerMark,
                '' AS partyMark,