From 6fc1e7f179acaeec4df755f72895b3b4fb50d4bb Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 14 一月 2022 13:15:59 +0800
Subject: [PATCH] Merge branch 'renhequ' into dev
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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..07e7905 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;
@@ -1299,7 +1300,7 @@
@Override
public R<ComActVO> actList() {
- return communityService.listCommunityAll();
+ return communityService.listCommunityAll(null);
}
@Override
@@ -2670,7 +2671,6 @@
}
});
}
- statisticsVO.setGridIncidentList(eventResultList);
// 查询所有小区
List<CivilVillageStatisticsVO> villageStatisticsList =
this.baseMapper.getCivilScreenVillageList(eventListDTO.getCommunityId());
@@ -2835,4 +2835,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