From e1cc81b635886dbaa3390db8901e64cafbf90060 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Fri, 4 Mar 2022 10:55:09 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9/data/stats/statsuser/gm-?= =?UTF-8?q?uploaddata?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ScreenGridManagerServiceImpl.java | 9 ++++----- .../screen/service/impl/ScreenPublicDataServiceImpl.java | 8 ++++++-- .../main/resources/mapper/screen/ScreenPublicDataDao.xml | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenGridManagerServiceImpl.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenGridManagerServiceImpl.java index f825d7f..b0c4cbc 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenGridManagerServiceImpl.java +++ b/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 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); } @@ -89,11 +88,11 @@ public class ScreenGridManagerServiceImpl extends BaseServiceImpl data = baseDao.customerAgency(); @@ -43,10 +45,12 @@ public class ScreenPublicDataServiceImpl extends BaseServiceImpl 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(); } diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenPublicDataDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenPublicDataDao.xml index 57ccb41..9555e68 100644 --- a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenPublicDataDao.xml +++ b/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, From 4a8f5f40decbf1283796b8bcc99929fb7301db09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Mon, 7 Mar 2022 10:21:59 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../screen/service/impl/ScreenGridManagerServiceImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenGridManagerServiceImpl.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenGridManagerServiceImpl.java index b0c4cbc..2b30ebb 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenGridManagerServiceImpl.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenGridManagerServiceImpl.java @@ -82,7 +82,6 @@ public class ScreenGridManagerServiceImpl extends BaseServiceImpl gridManagerUploadDataResultDTOS = baseDao.selectGridManagerUploadData(paramDto); logger.info("结果"+gridManagerUploadDataResultDTOS.size());