Merge remote-tracking branch 'origin/dev' into dev

puhanshu

2022-03-14 b92edf56e7e25440e7c46b967aa5373a7a8b25c2

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -9367,4 +9367,128 @@
     */
    @GetMapping("/building/getBuildListByVillageId")
    R getBuildListByVillageId(@RequestParam(value = "villageId") Long villageId);
    /**
     * 党员活动详情数据
     * @return
     */
    @PostMapping("/activity/partyMemberDetail")
    R partyMemberDetail(@RequestBody CommonPage commonPage);
    /**
     * 导出党员活动详情数据
     * @return
     */
    @PostMapping("/activity/exportPartyMemberDetail")
    R exportPartyMemberDetail(@RequestBody CommonPage commonPage);

    /**
     * 金沙定制页面-党建引领基础数据
     * @param communityId
     * @return
     */
    @GetMapping("/screen/partyBuildIng/base")
    R getPartyBuildIngBaseData(@RequestParam("communityId") Long communityId);

    /**
     * 党员活动展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/screen/partyBuildIng/partyAct")
    R pagePartyBuildIngAct(@RequestBody PageBaseDTO pageBaseDTO);

    /**
     * 议事投票展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/screen/partyBuildIng/discuss")
    R pagePartyBuildIngDiscuss(@RequestBody PageBaseDTO pageBaseDTO);

    /**
     * 金沙定制页面-四长四员
     * @param communityId
     * @return
     */
    @GetMapping("/screen/fourMember/base")
    R getFourMemberBaseData(@RequestParam("communityId") Long communityId);

    /**
     * 杨家坪定制页面-五微服务
     * @param communityId
     * @return
     */
    @GetMapping("/screen/fms/base")
    R getFmsBaseData(@RequestParam("communityId") Long communityId);

    /**
     * 杨家坪定制页面-微团队展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/screen/fms/team")
    R pageFmsTeam(@RequestBody PageBaseDTO pageBaseDTO);

    /**
     * 杨家坪定制页面-居家养老基础数据
     * @param communityId
     * @return
     */
    @GetMapping("/screen/alarm/base")
    R getAlarmBaseData(@RequestParam("communityId") Long communityId);

    /**
     * 杨家坪定制页面-报警记录展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/screen/alarm/record")
    R pageAlarmRecord(@RequestBody PageBaseDTO pageBaseDTO);

    /**
     * 杨家坪定制页面-报警设备点位图
     * @param communityId
     * @return
     */
    @GetMapping("/screen/alarm/pointMap")
    R getAlarmPointMap(@RequestParam("communityId") Long communityId);

    /**
     * 杨家坪定制页面-志愿服务
     * @param communityId
     * @return
     */
    @GetMapping("/screen/volunteer/base")
    R getVolunteerBaseData(@RequestParam("communityId") Long communityId);

    /**
     * 金沙定制页面-志愿线展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/screen/partyBuildIng/microWish")
    R pagePartyBuildIngMicroWish(@RequestBody PageBaseDTO pageBaseDTO);

    /**
     * 金沙定制页面-四长四员解决问题展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/screen/fourMember/resolve")
    R pageFourMemberResolve(@RequestBody PageBaseDTO pageBaseDTO);

    /**
     * 金沙定制页面-四长四员院落议事展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/screen/courtyard/list")
    R pageCourtyardDiscuss(@RequestBody PageBaseDTO pageBaseDTO);

    /**
     * 金沙定制页面-院落议事
     * @param communityId
     * @return
     */
    @GetMapping("/screen/courtyard/base")
    R getCourtyardBaseData(@RequestParam("communityId") Long communityId);
}