From 6496d6a229ba8e0acd0777863fb34bee0f5ce717 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期五, 24 十二月 2021 10:42:38 +0800
Subject: [PATCH] Merge branch 'master' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 43 +++++++++++++++++++++++++++++++++++--------
1 files changed, 35 insertions(+), 8 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index ad1e46c..a4c6062 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -7208,6 +7208,14 @@
R pageRegisterHomeQuarantine(PageReserveRegisterDetailedAdminDTO detailedAdminDTO);
/**
+ * 居家隔离导出
+ * @param pageReserveRegisterDetailedAdminDTO
+ * @return
+ */
+ @PostMapping("/reserve/admin/homeQuarantine/export")
+ R exportHomeQuarantine(@RequestBody PageReserveRegisterDetailedAdminDTO pageReserveRegisterDetailedAdminDTO);
+
+ /**
* 分页查询物业宣传
* @param pageComPropertyPublicityDTO
* @return
@@ -7272,14 +7280,6 @@
*/
@GetMapping("/property/publicity/incr-view")
R incrPropertyPublicityView(@RequestParam("id") Long id);
-
- /**
- * 居家隔离导出
- * @param pageReserveRegisterDetailedAdminDTO
- * @return
- */
- @PostMapping("/reserve/admin/homeQuarantine/export")
- R exportHomeQuarantine(@RequestBody PageReserveRegisterDetailedAdminDTO pageReserveRegisterDetailedAdminDTO);
/**
* 获取预设图片
@@ -7494,6 +7494,33 @@
void updateAllHouseUnionAppCode();
/**
+ * 西区大屏治理数据
+ */
+ @GetMapping("/screen/getWestScreenStatics")
+ R westScreenStatics();
+
+ /**
+ * 西区大屏一标三实数据
+ * @return 西区大屏一标三实数据
+ */
+ @GetMapping("/screen/getComprehensivePopulationStatics")
+ R getComprehensivePopulationStatics(@RequestParam("streetId") Long streetId);
+
+ @GetMapping("/screen/getComprehensiveStreetList")
+ R getComprehensiveStreetList();
+
+ /**
+ * 通过社区id查询社区账号密码
+ * @param communityId 社区id
+ * @return 查询社区账号密码
+ */
+ @GetMapping("/screen/getCommunityPassword")
+ R getCommunityPassword(@RequestParam("communityId") Long communityId);
+
+ @GetMapping("/reserve/bigScreenStaticsReserve")
+ R bigScreenStaticsReserve(@RequestParam("communityId") Long communityId);
+
+ /**
* 党员活动折线图
* @param communityId
* @return
--
Gitblit v1.7.1