From 5277f291ce2016bcbd81c5a0f73c4f77c6343636 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 13 Aug 2021 18:01:06 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E6=B2=BB=E7=90=86?= =?UTF-8?q?=E6=8C=87=E6=95=B0=EF=BC=88=E5=A4=A9=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScreenGovernanceController.java | 14 ++ .../screen/dao/ScreenGovernanceDao.java | 11 ++ .../service/ScreenGovernanceService.java | 10 ++ .../impl/ScreenGovernanceServiceImpl.java | 12 +- .../mapper/screen/ScreenGovernanceDao.xml | 159 ++++++++++++++++++ 5 files changed, 205 insertions(+), 1 deletion(-) diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenGovernanceController.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenGovernanceController.java index caca520..a3b3ca6 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenGovernanceController.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenGovernanceController.java @@ -36,4 +36,18 @@ public class ScreenGovernanceController { return screenGovernanceService.governrankdatadaily(); } + /** + * 02、网格治理指数（天） + * + * @param + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author zhy + * @date 2021/6/28 11:05 + */ + @PostMapping("gridgoverndaily") + public Result gridgoverndaily() { + log.info("定时任务执行"); + return screenGovernanceService.gridgoverndaily(); + } + } diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenGovernanceDao.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenGovernanceDao.java index e55293f..c32d372 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenGovernanceDao.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenGovernanceDao.java @@ -3,6 +3,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.result.ScreenGovernRankDataDailyResultDTO; import com.elink.esua.epdc.dto.analysis.pc.screen.result.ScreenGovernanceResultDTO; +import com.elink.esua.epdc.dto.analysis.pc.screen.result.ScreenGridGovernDailyResultDTO; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -47,4 +48,14 @@ public interface ScreenGovernanceDao extends BaseDao */ List governrankdatadailyNoResp(); + /** + * 网格治理指数（天） + * + * @param + * @return java.util.List + * @author zhy + * @date 2021/8/13 17:55 + */ + List agencygoverndaily(); + } diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenGovernanceService.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenGovernanceService.java index 5f204f2..d111036 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenGovernanceService.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenGovernanceService.java @@ -20,4 +20,14 @@ public interface ScreenGovernanceService { */ Result governrankdatadaily(); + /** + * 02、网格治理指数（天） + * + * @param + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author zhy + * @date 2021/6/28 13:47 + */ + Result gridgoverndaily(); + } diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenGovernanceServiceImpl.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenGovernanceServiceImpl.java index 3152eea..e30de7a 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenGovernanceServiceImpl.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenGovernanceServiceImpl.java @@ -6,6 +6,7 @@ import com.elink.esua.epdc.commons.tools.constant.EpmetConstant; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.analysis.pc.screen.result.ScreenGovernRankDataDailyResultDTO; import com.elink.esua.epdc.dto.analysis.pc.screen.result.ScreenGovernanceResultDTO; +import com.elink.esua.epdc.dto.analysis.pc.screen.result.ScreenGridGovernDailyResultDTO; import com.elink.esua.epdc.modules.screen.dao.ScreenGovernanceDao; import com.elink.esua.epdc.modules.screen.service.ScreenGovernanceService; import com.elink.esua.epdc.utils.EpmetUtils; @@ -78,7 +79,6 @@ public class ScreenGovernanceServiceImpl extends BaseServiceImpl data = baseDao.agencygoverndaily(); + JSONObject jsonObject = new JSONObject(); + jsonObject.put("isFirst", true); + jsonObject.put("dataList", data); + epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_GOV_GRID_GOV_DATA, JSONObject.toJSONString(jsonObject)); + return new Result(); + } + /** * 追加未响应数据 * diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenGovernanceDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenGovernanceDao.xml index c0ae454..e07e3f6 100644 --- a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenGovernanceDao.xml +++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenGovernanceDao.xml @@ -204,4 +204,163 @@ d.DEPT_ID + + From 8b99556a98852d0b33256bf26471c0229ed7020a Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 16 Aug 2021 13:32:36 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=B2=BB=E7=90=86?= =?UTF-8?q?=E6=8C=87=E6=95=B0=EF=BC=88=E5=A4=A9=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScreenGovernanceController.java | 15 + .../screen/dao/ScreenGovernanceDao.java | 14 +- .../service/ScreenGovernanceService.java | 10 + .../impl/ScreenGovernanceServiceImpl.java | 13 +- .../mapper/screen/ScreenGovernanceDao.xml | 750 +++++++++++++++--- 5 files changed, 679 insertions(+), 123 deletions(-) diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenGovernanceController.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenGovernanceController.java index a3b3ca6..a1c98e0 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenGovernanceController.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenGovernanceController.java @@ -50,4 +50,19 @@ public class ScreenGovernanceController { return screenGovernanceService.gridgoverndaily(); } + /** + * 03、组织治理指数（天） + * + * @param + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author zhy + * @date 2021/6/28 11:05 + */ + @PostMapping("agencygoverndaily") + public Result agencygoverndaily() { + log.info("定时任务执行"); + return screenGovernanceService.agencygoverndaily(); + } + + } diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenGovernanceDao.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenGovernanceDao.java index c32d372..e5a6063 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenGovernanceDao.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenGovernanceDao.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.result.ScreenAgencyGovernDailyResultDTO; import com.elink.esua.epdc.dto.analysis.pc.screen.result.ScreenGovernRankDataDailyResultDTO; import com.elink.esua.epdc.dto.analysis.pc.screen.result.ScreenGovernanceResultDTO; import com.elink.esua.epdc.dto.analysis.pc.screen.result.ScreenGridGovernDailyResultDTO; @@ -56,6 +57,17 @@ public interface ScreenGovernanceDao extends BaseDao * @author zhy * @date 2021/8/13 17:55 */ - List agencygoverndaily(); + List gridgoverndaily(); + + + /** + * 组织治理指数（天） + * + * @param + * @return java.util.List + * @author zhy + * @date 2021/8/13 17:55 + */ + List agencygoverndaily(); } diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenGovernanceService.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenGovernanceService.java index d111036..6d025df 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenGovernanceService.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenGovernanceService.java @@ -30,4 +30,14 @@ public interface ScreenGovernanceService { */ Result gridgoverndaily(); + /** + * 03、组织治理指数（天） + * + * @param + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author zhy + * @date 2021/6/28 13:47 + */ + Result agencygoverndaily(); + } diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenGovernanceServiceImpl.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenGovernanceServiceImpl.java index e30de7a..5a62bca 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenGovernanceServiceImpl.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenGovernanceServiceImpl.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject; 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.Result; +import com.elink.esua.epdc.dto.analysis.pc.screen.result.ScreenAgencyGovernDailyResultDTO; import com.elink.esua.epdc.dto.analysis.pc.screen.result.ScreenGovernRankDataDailyResultDTO; import com.elink.esua.epdc.dto.analysis.pc.screen.result.ScreenGovernanceResultDTO; import com.elink.esua.epdc.dto.analysis.pc.screen.result.ScreenGridGovernDailyResultDTO; @@ -88,7 +89,7 @@ public class ScreenGovernanceServiceImpl extends BaseServiceImpl data = baseDao.agencygoverndaily(); + List data = baseDao.gridgoverndaily(); JSONObject jsonObject = new JSONObject(); jsonObject.put("isFirst", true); jsonObject.put("dataList", data); @@ -96,6 +97,16 @@ public class ScreenGovernanceServiceImpl extends BaseServiceImpl data = baseDao.agencygoverndaily(); + JSONObject jsonObject = new JSONObject(); + jsonObject.put("isFirst", true); + jsonObject.put("dataList", data); + epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_GOV_AGENCY_GOV_DATA, JSONObject.toJSONString(jsonObject)); + return new Result(); + } + /** * 追加未响应数据 * diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenGovernanceDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenGovernanceDao.xml index e07e3f6..3608f6a 100644 --- a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenGovernanceDao.xml +++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenGovernanceDao.xml @@ -204,153 +204,657 @@ d.DEPT_ID - + SELECT + info.*, IFNULL( + ( + info.inGroupTopicResolvedCount + info.inGroupTopicUnResolvedCount + ) / info.problemResolvedCount, + 0 + ) AS groupSelfGovernRatio, + IFNULL( + info.gridSelfGovernProjectTotal / info.problemResolvedCount, + 0 + ) AS gridSelfGovernRatio, + IFNULL( + info.communityClosedCount / info.problemResolvedCount, + 0 + ) AS communityClosedRatio, + IFNULL( + info.streetClosedCount / info.problemResolvedCount, + 0 + ) AS streetClosedRatio, + 0 AS districtDeptClosedRatio + FROM + ( + SELECT + DATE_FORMAT( + date_add(now(), INTERVAL - 1 DAY), + '%Y%m%d' + ) AS dateId, + sd.id AS gridId, + sd.pid, + sd.pids, + IFNULL( + ( + topic.topicResolvedCount + topic.topicUnResolvedCount + issue.issueResolvedCount + issue.issueUnResolvedCount + item.issueProjectResolvedCount + item.issueProjectResolvedCount + item.issueProjectUnResolvedCount + ), + 0 + ) AS problemResolvedCount, + IFNULL(topic.topicResolvedCount, 0) AS topicResolvedCount, + IFNULL( + topic.topicUnResolvedCount, + 0 + ) AS topicUnResolvedCount, + IFNULL(issue.issueResolvedCount, 0) AS issueResolvedCount, + IFNULL( + issue.issueUnResolvedCount, + 0 + ) AS issueUnResolvedCount, + IFNULL( + item.issueProjectResolvedCount, + 0 + ) AS issueProjectResolvedCount, + IFNULL( + item.issueProjectUnResolvedCount, + 0 + ) AS issueProjectUnResolvedCount, + IFNULL( + item.approvalProjectResolvedCount, + 0 + ) AS approvalProjectResolvedCount, + IFNULL( + item.approvalProjectUnResolvedCount, + 0 + ) AS approvalProjectUnResolvedCount, + IFNULL( + topic.inGroupTopicResolvedCount, + 0 + ) AS inGroupTopicResolvedCount, + IFNULL( + topic.inGroupTopicUnResolvedCount, + 0 + ) AS inGroupTopicUnResolvedCount, + IFNULL( + selfsolved.fromIssueResolvedInGridCount, + 0 + ) AS fromIssueResolvedInGridCount, + IFNULL( + selfsolved.fromIssueUnResolvedInGridCount, + 0 + ) AS fromIssueUnResolvedInGridCount, + IFNULL( + selfsolved.fromAgencyResolvedInGridCount, + 0 + ) AS fromAgencyResolvedInGridCount, + IFNULL( + selfsolved.fromAgencyUnResolvedInGridCount, + 0 + ) AS fromAgencyUnResolvedInGridCount, + IFNULL( + ( + selfsolved.fromIssueResolvedInGridCount + selfsolved.fromIssueUnResolvedInGridCount + selfsolved.fromIssueUnResolvedInGridCount + selfsolved.fromAgencyResolvedInGridCount + ), + 0 + ) AS gridSelfGovernProjectTotal, + IFNULL( + commsolved.communityClosedCount, + 0 + ) AS communityClosedCount, + IFNULL( + streetsolved.streetClosedCount, + 0 + ) AS streetClosedCount, + 0 AS districtDeptClosedCount + FROM + esua_epdc_admin.sys_dept sd + LEFT JOIN ( + SELECT + GRID_ID, + IFNULL(COUNT(0), 0) AS topicResolvedCount, + IFNULL(COUNT(0), 0) AS inGroupTopicResolvedCount, + 0 AS topicUnResolvedCount, + 0 AS inGroupTopicUnResolvedCount + FROM + esua_epdc_group.epdc_topic et + WHERE + et.DEL_FLAG = '0' + AND DATE_FORMAT(et.UPDATED_TIME, '%Y-%m-%d') = DATE_FORMAT( + date_add(now(), INTERVAL - 1 DAY), + '%Y-%m-%d' + ) + AND et.STATE = '20' + GROUP BY + et.GRID_ID + ) topic ON topic.GRID_ID = sd.id + LEFT JOIN ( + SELECT + GRID_ID, + IFNULL(COUNT(0), 0) AS issueResolvedCount, + 0 AS issueUnResolvedCount + FROM + esua_epdc_events.epdc_issue eis + WHERE + eis.DEL_FLAG = '0' + AND DATE_FORMAT( + eis.UPDATED_TIME, + '%Y-%m-%d' + ) = DATE_FORMAT( + date_add(now(), INTERVAL - 1 DAY), + '%Y-%m-%d' + ) + AND eis.ISSUE_STATE = '2' + GROUP BY + eis.GRID_ID + ) issue ON issue.GRID_ID = sd.id + LEFT JOIN ( + SELECT + GRID_ID, + IFNULL(COUNT(0), 0) AS issueProjectResolvedCount, + 0 AS issueProjectUnResolvedCount, + 0 AS approvalProjectResolvedCount, + 0 AS approvalProjectUnResolvedCount + FROM + esua_epdc_events.epdc_item eit + WHERE + eit.DEL_FLAG = '0' + AND DATE_FORMAT( + eit.UPDATED_TIME, + '%Y-%m-%d' + ) = DATE_FORMAT( + date_add(now(), INTERVAL - 1 DAY), + '%Y-%m-%d' + ) + AND eit.ITEM_STATE IN ('5', '10') + GROUP BY + GRID_ID + ) item ON item.GRID_ID = sd.id + LEFT JOIN ( + SELECT + GRID_ID, + IFNULL(COUNT(0), 0) AS fromIssueResolvedInGridCount, + 0 AS fromIssueUnResolvedInGridCount, + 0 AS fromAgencyResolvedInGridCount, + 0 AS fromAgencyUnResolvedInGridCount + FROM + ( + SELECT + GRID_ID, + eit.id, + hp.HANDLER_DEPT_ID, + eit.UPDATED_TIME + FROM + esua_epdc_events.epdc_item eit + LEFT JOIN esua_epdc_events.epdc_item_handle_process hp ON hp.item_id = eit.id + WHERE + eit.DEL_FLAG = '0' + AND hp.DEL_FLAG = '0' + AND eit.ITEM_STATE IN ('5', '10') + GROUP BY + eit.GRID_ID, + eit.ID + HAVING + COUNT(DISTINCT hp.HANDLER_DEPT_ID) = 1 + ) t + WHERE + t.GRID_ID = t.HANDLER_DEPT_ID + AND DATE_FORMAT(t.UPDATED_TIME, '%Y-%m-%d') = DATE_FORMAT( + date_add(now(), INTERVAL - 1 DAY), + '%Y-%m-%d' + ) + GROUP BY + t.GRID_ID + ) selfsolved ON selfsolved.GRID_ID = sd.id + LEFT JOIN ( + SELECT + GRID_ID, + IFNULL(COUNT(0), 0) AS communityClosedCount + FROM + ( + SELECT + GRID_ID, + eit.id, + hp.HANDLER_DEPT_ID, + eit.UPDATED_TIME + FROM + esua_epdc_events.epdc_item eit + LEFT JOIN esua_epdc_events.epdc_item_handle_process hp ON hp.item_id = eit.id + LEFT JOIN esua_epdc_admin.sys_dept sd ON sd.id = hp.HANDLER_DEPT_ID + WHERE + eit.DEL_FLAG = '0' + AND hp.DEL_FLAG = '0' + AND eit.ITEM_STATE IN ('5', '10') + AND hp.STATE IN ('5', '10') + AND sd.type_key = 'community_party' + GROUP BY + eit.GRID_ID, + eit.ID + ) t + WHERE + DATE_FORMAT(t.UPDATED_TIME, '%Y-%m-%d') = DATE_FORMAT( + date_add(now(), INTERVAL - 1 DAY), + '%Y-%m-%d' + ) + GROUP BY + t.GRID_ID + ) commsolved ON commsolved.GRID_ID = sd.id + LEFT JOIN ( + SELECT + GRID_ID, + IFNULL(COUNT(0), 0) AS streetClosedCount + FROM + ( + SELECT + GRID_ID, + eit.id, + hp.HANDLER_DEPT_ID, + eit.UPDATED_TIME + FROM + esua_epdc_events.epdc_item eit + LEFT JOIN esua_epdc_events.epdc_item_handle_process hp ON hp.item_id = eit.id + LEFT JOIN esua_epdc_admin.sys_dept sd ON sd.id = hp.HANDLER_DEPT_ID + WHERE + eit.DEL_FLAG = '0' + AND hp.DEL_FLAG = '0' + AND eit.ITEM_STATE IN ('5', '10') + AND hp.STATE IN ('5', '10') + AND sd.type_key = 'street_party' + GROUP BY + eit.GRID_ID, + eit.ID + ) t + WHERE + DATE_FORMAT(t.UPDATED_TIME, '%Y-%m-%d') = DATE_FORMAT( + date_add(now(), INTERVAL - 1 DAY), + '%Y-%m-%d' + ) + GROUP BY + t.GRID_ID + ) streetsolved ON streetsolved.GRID_ID = sd.id + WHERE + sd.del_flag = '0' + AND sd.type_key = 'grid_party' + AND sd.id NOT IN ( + SELECT + t.dept_id + FROM + esua_epdc_admin.sys_dept_config t + WHERE + t.del_flag = '0' + ) + GROUP BY + sd.id + ) info + + + From 20f9e6cc21e4109cb98cf21379f63d5bdc646a4a Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 16 Aug 2021 15:46:53 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=EF=BC=8C=E4=BD=86=E5=AE=9E=E9=99=85=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScreenGovernanceController.java | 14 ++++++----- .../service/ScreenGovernanceService.java | 7 +++--- .../impl/ScreenGovernanceServiceImpl.java | 25 ++++++++++++++++--- 3 files changed, 34 insertions(+), 12 deletions(-) diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenGovernanceController.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenGovernanceController.java index a1c98e0..9404ec9 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenGovernanceController.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenGovernanceController.java @@ -1,10 +1,12 @@ 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.ScreenJobFormDTO; import com.elink.esua.epdc.modules.screen.service.ScreenGovernanceService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -31,9 +33,9 @@ public class ScreenGovernanceController { * @date 2021/6/28 11:05 */ @PostMapping("governrankdatadaily") - public Result governrankdatadaily() { + public Result governrankdatadaily(@RequestBody ScreenJobFormDTO formDto) { log.info("定时任务执行"); - return screenGovernanceService.governrankdatadaily(); + return screenGovernanceService.governrankdatadaily(formDto); } /** @@ -45,9 +47,9 @@ public class ScreenGovernanceController { * @date 2021/6/28 11:05 */ @PostMapping("gridgoverndaily") - public Result gridgoverndaily() { + public Result gridgoverndaily(@RequestBody ScreenJobFormDTO formDto) { log.info("定时任务执行"); - return screenGovernanceService.gridgoverndaily(); + return screenGovernanceService.gridgoverndaily(formDto); } /** @@ -59,9 +61,9 @@ public class ScreenGovernanceController { * @date 2021/6/28 11:05 */ @PostMapping("agencygoverndaily") - public Result agencygoverndaily() { + public Result agencygoverndaily(@RequestBody ScreenJobFormDTO formDto) { log.info("定时任务执行"); - return screenGovernanceService.agencygoverndaily(); + return screenGovernanceService.agencygoverndaily(formDto); } diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenGovernanceService.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenGovernanceService.java index 6d025df..1cbfcf5 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenGovernanceService.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenGovernanceService.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.ScreenJobFormDTO; /** * 治理能力数据推送 @@ -18,7 +19,7 @@ public interface ScreenGovernanceService { * @author zhy * @date 2021/6/28 13:47 */ - Result governrankdatadaily(); + Result governrankdatadaily(ScreenJobFormDTO formDto); /** * 02、网格治理指数（天） @@ -28,7 +29,7 @@ public interface ScreenGovernanceService { * @author zhy * @date 2021/6/28 13:47 */ - Result gridgoverndaily(); + Result gridgoverndaily(ScreenJobFormDTO formDto); /** * 03、组织治理指数（天） @@ -38,6 +39,6 @@ public interface ScreenGovernanceService { * @author zhy * @date 2021/6/28 13:47 */ - Result agencygoverndaily(); + Result agencygoverndaily(ScreenJobFormDTO formDto); } diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenGovernanceServiceImpl.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenGovernanceServiceImpl.java index 5a62bca..f58c779 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenGovernanceServiceImpl.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenGovernanceServiceImpl.java @@ -3,7 +3,9 @@ package com.elink.esua.epdc.modules.screen.service.impl; import com.alibaba.fastjson.JSONObject; 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.ScreenJobFormDTO; import com.elink.esua.epdc.dto.analysis.pc.screen.result.ScreenAgencyGovernDailyResultDTO; import com.elink.esua.epdc.dto.analysis.pc.screen.result.ScreenGovernRankDataDailyResultDTO; import com.elink.esua.epdc.dto.analysis.pc.screen.result.ScreenGovernanceResultDTO; @@ -11,11 +13,13 @@ import com.elink.esua.epdc.dto.analysis.pc.screen.result.ScreenGridGovernDailyRe import com.elink.esua.epdc.modules.screen.dao.ScreenGovernanceDao; import com.elink.esua.epdc.modules.screen.service.ScreenGovernanceService; import com.elink.esua.epdc.utils.EpmetUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import java.text.DecimalFormat; +import java.util.Date; import java.util.List; import java.util.Optional; @@ -41,7 +45,11 @@ public class ScreenGovernanceServiceImpl extends BaseServiceImpl data = baseDao.governrankdatadaily(); List agencyData = baseDao.governrankdatadailyAgency(); List noRespData = baseDao.governrankdatadailyNoResp(); @@ -82,26 +90,37 @@ public class ScreenGovernanceServiceImpl extends BaseServiceImpl data = baseDao.gridgoverndaily(); JSONObject jsonObject = new JSONObject(); jsonObject.put("isFirst", true); jsonObject.put("dataList", data); + jsonObject.put("dateId", yearMonthDay); epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_GOV_GRID_GOV_DATA, JSONObject.toJSONString(jsonObject)); return new Result(); } @Override - public Result agencygoverndaily() { + public Result agencygoverndaily(ScreenJobFormDTO formDto) { + String yearMonthDay = DateUtils.formatNoSplit(DateUtils.addDateDays(new Date(), -1)); + if (formDto.getYearMonth() != null && StringUtils.isNotBlank(formDto.getYearMonth())) { + yearMonthDay = formDto.getYearMonth(); + } List data = baseDao.agencygoverndaily(); JSONObject jsonObject = new JSONObject(); jsonObject.put("isFirst", true); + jsonObject.put("dateId", yearMonthDay); jsonObject.put("dataList", data); epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_GOV_AGENCY_GOV_DATA, JSONObject.toJSONString(jsonObject)); return new Result(); From e01aed0468ffbb6e2502ce2bef3b7c9e7fc67f21 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 16 Aug 2021 17:16:19 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E8=A1=97=E9=81=93=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=87=8D=E6=96=B0=E7=BB=93=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../screen/dao/ScreenGovernanceDao.java | 11 +++++++ .../impl/ScreenGovernanceServiceImpl.java | 29 ++++++++++--------- .../mapper/screen/ScreenGovernanceDao.xml | 21 ++++++++++++++ 3 files changed, 47 insertions(+), 14 deletions(-) diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenGovernanceDao.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenGovernanceDao.java index e5a6063..30f47b5 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenGovernanceDao.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenGovernanceDao.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.SysDeptDTO; import com.elink.esua.epdc.dto.analysis.pc.screen.result.ScreenAgencyGovernDailyResultDTO; import com.elink.esua.epdc.dto.analysis.pc.screen.result.ScreenGovernRankDataDailyResultDTO; import com.elink.esua.epdc.dto.analysis.pc.screen.result.ScreenGovernanceResultDTO; @@ -16,6 +17,16 @@ import java.util.List; @Mapper public interface ScreenGovernanceDao extends BaseDao { + /** + * 获取街道列表 + * + * @param + * @return java.util.List + * @author zhy + * @date 2021/8/16 17:11 + */ + List getStreetList(); + /** * 治理能力排行数据(按日统计)数据 * 网格统计 diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenGovernanceServiceImpl.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenGovernanceServiceImpl.java index f58c779..03a47cd 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenGovernanceServiceImpl.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenGovernanceServiceImpl.java @@ -5,6 +5,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.SysDeptDTO; import com.elink.esua.epdc.dto.analysis.pc.screen.form.ScreenJobFormDTO; import com.elink.esua.epdc.dto.analysis.pc.screen.result.ScreenAgencyGovernDailyResultDTO; import com.elink.esua.epdc.dto.analysis.pc.screen.result.ScreenGovernRankDataDailyResultDTO; @@ -39,11 +40,6 @@ public class ScreenGovernanceServiceImpl extends BaseServiceImpl data = baseDao.governrankdatadaily(); List agencyData = baseDao.governrankdatadailyAgency(); List noRespData = baseDao.governrankdatadailyNoResp(); + List streetList = baseDao.getStreetList(); // 处理未响应和项目转入次数 noRespHandle(data, noRespData); @@ -67,15 +64,19 @@ public class ScreenGovernanceServiceImpl extends BaseServiceImpl agencyOptional = agencyData.stream().filter(agency -> agency.getOrgId().equals(STREET_ID)).findFirst(); - if (agencyOptional.isPresent()) { - ScreenGovernRankDataDailyResultDTO agencyResult = agencyOptional.get(); - Integer responseCount = agencyResult.getResponseCount() + agencyData.stream().filter(agency -> agency.getParentId().equals(STREET_ID)).mapToInt(ScreenGovernRankDataDailyResultDTO::getResponseCount).sum(); - Integer transferCount = agencyResult.getTransferCount() + agencyData.stream().filter(agency -> agency.getParentId().equals(STREET_ID)).mapToInt(ScreenGovernRankDataDailyResultDTO::getTransferCount).sum(); - agencyResult.setResponseCount(responseCount); - agencyResult.setTransferCount(transferCount); - } + + streetList.forEach(street -> { + String streetId = street.getId().toString(); + // 街道数据需要在本身基础上再加上社区的合计 + Optional agencyOptional = agencyData.stream().filter(agency -> agency.getOrgId().equals(streetId)).findFirst(); + if (agencyOptional.isPresent()) { + ScreenGovernRankDataDailyResultDTO agencyResult = agencyOptional.get(); + Integer responseCount = agencyResult.getResponseCount() + agencyData.stream().filter(agency -> agency.getParentId().equals(streetId)).mapToInt(ScreenGovernRankDataDailyResultDTO::getResponseCount).sum(); + Integer transferCount = agencyResult.getTransferCount() + agencyData.stream().filter(agency -> agency.getParentId().equals(streetId)).mapToInt(ScreenGovernRankDataDailyResultDTO::getTransferCount).sum(); + agencyResult.setResponseCount(responseCount); + agencyResult.setTransferCount(transferCount); + } + }); // 合并网格社区街道数据 data.addAll(agencyData); // 计算响应率 diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenGovernanceDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenGovernanceDao.xml index 3608f6a..e9c90b1 100644 --- a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenGovernanceDao.xml +++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenGovernanceDao.xml @@ -3,6 +3,27 @@ + +