From 8d5fb4ee9d27fd6a61b210eaee74af265f76aa7c Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期五, 08 四月 2022 14:55:18 +0800
Subject: [PATCH] [修改]修改配置
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java | 29 +++++++++++++++++++----------
1 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
index 4ad13ad..e7d55dd 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
@@ -7,6 +7,7 @@
import javax.annotation.Resource;
+import com.panzhihua.common.model.vos.community.screen.event.EventComprehensiveGovernanceStatisticsVO;
import com.panzhihua.common.model.vos.community.StatisticsCommVO;
import com.panzhihua.common.model.vos.community.bigscreen.GridsGovernanceStatisticsVO;
import org.springframework.beans.BeanUtils;
@@ -170,11 +171,9 @@
*/
@Override
public R<EventDetailsVO> eventDetails(Long id) {
- EventDO eventDO = eventMapper.selectById(id);
- if (eventDO != null) {
- EventDetailsVO eventDetailsVO = new EventDetailsVO();
- BeanUtils.copyProperties(eventDO, eventDetailsVO);
- EventGridDataDO eventGridDataDO = eventGridDataMapper.selectById(eventDO.getGridId());
+ EventDetailsVO eventDetailsVO = eventMapper.getById(id);
+ if (eventDetailsVO != null) {
+ EventGridDataDO eventGridDataDO = eventGridDataMapper.selectById(eventDetailsVO.getGridId());
if (eventGridDataDO != null) {
eventDetailsVO.setGridName(eventGridDataDO.getGridName());
eventDetailsVO.setCommunityId(eventGridDataDO.getGridCommunityId());
@@ -252,17 +251,17 @@
eventDetailsVO.setTrans(eventTransferRecordVOS);
// 查询网格员头像,姓名
- Map<String, Object> gridMember = eventMapper.getUserBaseInfo(eventDO.getGridMemberId());
+ Map<String, Object> gridMember = eventMapper.getUserBaseInfo(eventDetailsVO.getGridMemberId());
if (!CollectionUtils.isEmpty(gridMember)) {
eventDetailsVO.setGridMemberName(
gridMember.get("nick_name") == null ? "" : gridMember.get("nick_name").toString());
eventDetailsVO.setGridMemberImageUrl(
gridMember.get("image_url") == null ? "" : gridMember.get("image_url").toString());
}
- if (Objects.equals(eventDO.getGridMemberId(), eventDO.getCreateBy())) {
+ if (Objects.equals(eventDetailsVO.getGridMemberId(), eventDetailsVO.getCreateBy())) {
eventDetailsVO.setCreator(eventDetailsVO.getGridMemberName());
} else {
- Map<String, Object> createUser = eventMapper.getUserBaseInfo(eventDO.getCreateBy());
+ Map<String, Object> createUser = eventMapper.getUserBaseInfo(eventDetailsVO.getCreateBy());
eventDetailsVO
.setCreator(createUser.get("nick_name") == null ? "" : createUser.get("nick_name").toString());
}
@@ -1299,7 +1298,7 @@
@Override
public R<ComActVO> actList() {
- return communityService.listCommunityAll();
+ return communityService.listCommunityAll(null);
}
@Override
@@ -2670,7 +2669,6 @@
}
});
}
- statisticsVO.setGridIncidentList(eventResultList);
// 查询所有小区
List<CivilVillageStatisticsVO> villageStatisticsList =
this.baseMapper.getCivilScreenVillageList(eventListDTO.getCommunityId());
@@ -2835,4 +2833,15 @@
statisticsVO.setDrawEventPopulationTotalVO(populationTotalVO);
return R.ok(statisticsVO);
}
+
+ /**
+ * 西区大数据分析平台-综合治理栏
+ * @return
+ */
+ @Override
+ public R getComprehensiveGovernanceStatics() {
+ EventComprehensiveGovernanceStatisticsVO governanceStatisticsVO = this.baseMapper.selectComprehensiveGovernanceStatics();
+ governanceStatisticsVO.generateGovernanceTotal();
+ return R.ok(governanceStatisticsVO);
+ }
}
--
Gitblit v1.7.1