From f1bcbc43e988d0d1a91bea66a9ebbf6d601e48c0 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 13 十月 2022 10:33:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenStatisticsApi.java |  257 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 257 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenStatisticsApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenStatisticsApi.java
index 8ae1dae..9c9d49c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenStatisticsApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenStatisticsApi.java
@@ -2,6 +2,7 @@
 
 import javax.annotation.Resource;
 
+import com.panzhihua.common.model.dtos.property.CommonPage;
 import com.panzhihua.service_community.service.ComActService;
 import com.panzhihua.common.model.dtos.PageBaseDTO;
 import com.panzhihua.common.model.dtos.community.convenient.PagePopularMerchantDTO;
@@ -335,4 +336,260 @@
     public R indexVolunteerActList(@RequestBody PageBaseDTO pageBaseDTO) {
         return bigScreenStatisticsService.indexVolunteerActList(pageBaseDTO);
     }
+
+    /**
+     * 清网治格-根据事件分类获取近1月的社区事件数据
+     * @param type
+     * @param communityId
+     * @return
+     */
+    @GetMapping("/event/list")
+    public R getEventList(@RequestParam(value = "type") Integer type, @RequestParam(value = "communityId") Long communityId) {
+        return bigScreenStatisticsService.getEventList(type, communityId);
+    }
+
+    /**
+     * 清网治格-社区事件数据分页
+     * @param pageBaseDTO
+     * @return
+     */
+    @PostMapping("/event/page")
+    public R pageEventList(@RequestBody PageBaseDTO pageBaseDTO) {
+        return bigScreenStatisticsService.pageEventList(pageBaseDTO);
+    }
+    @PostMapping("/hmk/baseInfo")
+    public R getHmkBaseInfo(@RequestBody CommonPage commonPage){
+        return bigScreenStatisticsService.hmkBaseInfo(commonPage);
+    }
+    @GetMapping("/hmk/partyProjectActivityLine")
+    public R partyActivityLine(){
+        return bigScreenStatisticsService.partyProjectActivityLine();
+    }
+    @PostMapping("/hmk/projectActivityTop")
+    public R projectActivityTop(@RequestBody CommonPage commonPage){
+        return bigScreenStatisticsService.projectActivityProject(commonPage);
+    }
+    @GetMapping("/hmk/projectType")
+    public R projectType(@RequestParam("name") String name){
+        return bigScreenStatisticsService.projectType(name);
+    }
+
+    /**
+     * 金沙定制页面-党建引领基础数据
+     * @param communityId
+     * @return
+     */
+    @GetMapping("/partyBuildIng/base")
+    public R getPartyBuildIngBaseData(@RequestParam("communityId") Long communityId) {
+        return bigScreenStatisticsService.getPartyBuildIngBaseData(communityId);
+    }
+
+    /**
+     * 党员活动展示列表
+     * @param pageBaseDTO
+     * @return
+     */
+    @PostMapping("/partyBuildIng/partyAct")
+    public R pagePartyBuildIngAct(@RequestBody PageBaseDTO pageBaseDTO) {
+        return bigScreenStatisticsService.pagePartyBuildIngAct(pageBaseDTO);
+    }
+
+    /**
+     * 议事投票展示列表
+     * @param pageBaseDTO
+     * @return
+     */
+    @PostMapping("/partyBuildIng/discuss")
+    public R pagePartyBuildIngDiscuss(@RequestBody PageBaseDTO pageBaseDTO) {
+        return bigScreenStatisticsService.pagePartyBuildIngDiscuss(pageBaseDTO);
+    }
+
+    /**
+     * 金沙定制页面-四长四员
+     * @param communityId
+     * @return
+     */
+    @GetMapping("/fourMember/base")
+    public R getFourMemberBaseData(@RequestParam("communityId") Long communityId) {
+        return bigScreenStatisticsService.getFourMemberBaseData(communityId);
+    }
+
+    /**
+     * 杨家坪定制页面-五微服务
+     * @param communityId
+     * @return
+     */
+    @GetMapping("/fms/base")
+    public R getFmsBaseData(@RequestParam("communityId") Long communityId) {
+        return bigScreenStatisticsService.getFmsBaseData(communityId);
+    }
+
+    /**
+     * 杨家坪定制页面-微团队展示列表
+     * @param pageBaseDTO
+     * @return
+     */
+    @PostMapping("/fms/team")
+    public R pageFmsTeam(@RequestBody PageBaseDTO pageBaseDTO) {
+        return bigScreenStatisticsService.pageFmsTeam(pageBaseDTO);
+    }
+
+    /**
+     * 杨家坪定制页面-居家养老基础数据
+     * @param communityId
+     * @return
+     */
+    @GetMapping("/alarm/base")
+    public R getAlarmBaseData(@RequestParam("communityId") Long communityId) {
+        return bigScreenStatisticsService.getAlarmBaseData(communityId);
+    }
+
+    /**
+     * 杨家坪定制页面-报警记录展示列表
+     * @param pageBaseDTO
+     * @return
+     */
+    @PostMapping("/alarm/record")
+    public R pageAlarmRecord(@RequestBody PageBaseDTO pageBaseDTO) {
+        return bigScreenStatisticsService.pageAlarmRecord(pageBaseDTO);
+    }
+
+    /**
+     * 杨家坪定制页面-报警设备点位图
+     * @param communityId
+     * @return
+     */
+    @GetMapping("/alarm/pointMap")
+    public R getAlarmPointMap(@RequestParam("communityId") Long communityId) {
+        return bigScreenStatisticsService.getAlarmPointMap(communityId);
+    }
+
+    /**
+     * 杨家坪定制页面-志愿服务
+     * @param communityId
+     * @return
+     */
+    @GetMapping("/volunteer/base")
+    public R getVolunteerBaseData(@RequestParam("communityId") Long communityId) {
+        return bigScreenStatisticsService.getVolunteerBaseData(communityId);
+    }
+
+    /**
+     * 金沙定制页面-志愿线展示列表
+     * @param pageBaseDTO
+     * @return
+     */
+    @PostMapping("/partyBuildIng/microWish")
+    public R pagePartyBuildIngMicroWish(@RequestBody PageBaseDTO pageBaseDTO) {
+        return bigScreenStatisticsService.pagePartyBuildIngMicroWish(pageBaseDTO);
+    }
+
+    /**
+     * 金沙定制页面-四长四员解决问题展示列表
+     * @param pageBaseDTO
+     * @return
+     */
+    @PostMapping("/fourMember/resolve")
+    public R pageFourMemberResolve(@RequestBody PageBaseDTO pageBaseDTO) {
+        return bigScreenStatisticsService.pageFourMemberResolve(pageBaseDTO);
+    }
+
+    /**
+     * 金沙定制页面-四长四员院落议事展示列表
+     * @param pageBaseDTO
+     * @return
+     */
+    @PostMapping("/courtyard/list")
+    public R pageCourtyardDiscuss(@RequestBody PageBaseDTO pageBaseDTO) {
+        return bigScreenStatisticsService.pageCourtyardDiscuss(pageBaseDTO);
+    }
+
+    /**
+     * 金沙定制页面-院落议事
+     * @param communityId
+     * @return
+     */
+    @GetMapping("/courtyard/base")
+    public R getCourtyardBaseData(@RequestParam("communityId") Long communityId) {
+        return bigScreenStatisticsService.getCourtyardBaseData(communityId);
+    }
+
+    /**
+     * 孵化中心-基础数据
+     * @param communityId
+     * @return
+     */
+    @GetMapping("/hatch/base")
+    public R getHatchBaseData(@RequestParam("communityId") Long communityId) {
+        return bigScreenStatisticsService.getHatchBaseData(communityId);
+    }
+
+    /**
+     * 孵化中心-孵化成果展示列表
+     * @param pageBaseDTO
+     * @return
+     */
+    @PostMapping("/hatchResult/list")
+    public R pageHatchResult(@RequestBody PageBaseDTO pageBaseDTO) {
+        return bigScreenStatisticsService.pageHatchResult(pageBaseDTO);
+    }
+
+    /**
+     * 孵化中心-孵化进度展示列表
+     * @param pageBaseDTO
+     * @return
+     */
+    @PostMapping("/hatchSchedule/list")
+    public R pageHatchSchedule(@RequestBody PageBaseDTO pageBaseDTO) {
+        return bigScreenStatisticsService.pageHatchSchedule(pageBaseDTO);
+    }
+
+    /**
+     * 五社联动基础数据
+     * @param communityId
+     * @return
+     */
+    @GetMapping("/fiveAssociations/base")
+    public R getFiveAssociationsBaseData(@RequestParam("communityId") Long communityId) {
+        return bigScreenStatisticsService.getFiveAssociationsBaseData(communityId);
+    }
+
+    /**
+     * 五社联动项目展示列表
+     * @param pageBaseDTO
+     * @return
+     */
+    @PostMapping("/socialProject/list")
+    public R pageSocialProjectList(@RequestBody PageBaseDTO pageBaseDTO) {
+        return bigScreenStatisticsService.pageSocialProjectList(pageBaseDTO);
+    }
+
+    /**
+     * 五社联动社会组织展示列表
+     * @param pageBaseDTO
+     * @return
+     */
+    @PostMapping("/socialOrg/list")
+    public R pageSocialOrgList(@RequestBody PageBaseDTO pageBaseDTO) {
+        return bigScreenStatisticsService.pageSocialOrgList(pageBaseDTO);
+    }
+
+    /**
+     * 人大代表
+     * @param communityId
+     * @return
+     */
+    @GetMapping("/dpc/base")
+    public R dpcBase(@RequestParam("communityId") Long communityId) {
+        return bigScreenStatisticsService.dpcBase(communityId);
+    }
+
+    /**
+     * 人大代表-随手拍展示列表
+     * @return
+     */
+    @PostMapping("/dpc/easyPhotoList")
+    public R dpcEasyPhotoList(@RequestBody PageBaseDTO pageBaseDTO) {
+        return bigScreenStatisticsService.dpcEasyPhotoList(pageBaseDTO);
+    }
 }

--
Gitblit v1.7.1