仁和东区代码提交

101captain

2022-01-14 2bc69b919ef626e6093d598d7eae07c8f9e3e0e4

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

@@ -2,6 +2,7 @@

import java.util.List;

import com.panzhihua.common.model.dtos.PageBaseDTO;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.scheduling.annotation.Async;
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -245,6 +246,7 @@
import com.panzhihua.common.model.vos.community.BatchhouseVO;
import com.panzhihua.common.model.vos.community.ComActActEvaluateVO;
import com.panzhihua.common.model.vos.community.ComActActRegistVO;
import com.panzhihua.common.model.vos.community.ComActActivityTypeVO;
import com.panzhihua.common.model.vos.community.ComActActivityVO;
import com.panzhihua.common.model.vos.community.ComActAnnouncementVO;
import com.panzhihua.common.model.vos.community.ComActColumnVO;
@@ -299,6 +301,7 @@
import com.panzhihua.common.model.vos.community.ComSwRotaExcelVO;
import com.panzhihua.common.model.vos.community.EldersAuthDetailsVO;
import com.panzhihua.common.model.vos.community.EldersAuthElderlyExcelVO;
import com.panzhihua.common.model.vos.community.QRActivityCodeVO;
import com.panzhihua.common.model.vos.community.ResetComActMessageVO;
import com.panzhihua.common.model.vos.community.SignactivityVO;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticAgeGender;
@@ -1067,10 +1070,11 @@
     *
     * @param userId
     *            用户id
     * @param status
     * @return 活动列表
     */
    @PostMapping("listactivity")
    R listActivity(@RequestParam("userId") Long userId);
    R listActivity(@RequestParam("userId") Long userId, @RequestParam(value = "status", required = false) Integer status);

    /**
     * 用户确认心愿
@@ -1166,7 +1170,7 @@
     * @return 社区集合 按照创建顺序倒序排列
     */
    @PostMapping("listcommunityall")
    R listCommunityAll();
    R listCommunityAll(@RequestParam("areaCode")String areaCode);

    /**
     * 首页广告banner
@@ -4937,7 +4941,15 @@
     * @return 社区列表
     */
    @GetMapping("/eventgrid/community/westList")
    R getWestCommunityLists();
    R getWestCommunityLists(String areaCode);

    /**
     * 综治app-小区列表
     * @param villageListAppDTO 请求参数
     * @return  小区列表
     */
    @PostMapping("/village/grid/list/app")
    R getGridVillageListApp(@RequestBody ComMngVillageListAppDTO villageListAppDTO);

    /**
     * 分页查询退役军人列表
@@ -5292,11 +5304,11 @@
    R addIntegralTradeAdmin(@RequestBody AddComActIntegralUserDTO integralUserDTO);

    /**
     * 根据社区活动id查询社区活动报名人员列表
     * 根据社区活动id查询社区活动报名且未参与人员列表
     *
     * @param activityId
     *            活动id
     * @return 社区活动报名人员列表
     * @return 社区活动报名且未参与人员列表
     */
    @PostMapping("/integral/act/activity/admin")
    R getTaskActivityPeopleList(@RequestParam("activityId") Long activityId);
@@ -5384,7 +5396,7 @@
     * @return 社区列表
     */
    @GetMapping("/switch/community/all/list")
    R communitySwitchList();
    R communitySwitchList(@RequestParam("areaCode") String areaCode);

    /**
     * 根据名字查询所有社区列表
@@ -5394,7 +5406,7 @@
     * @return 社区列表
     */
    @GetMapping("/switch/community/search/list")
    R communitySwitchSearchList(@RequestParam(value = "name") String name);
    R communitySwitchSearchList(@RequestParam(value = "name") String name,@RequestParam(value = "areaCode") String areaCode);

    /**
     * 根据经纬度以及距离搜索附近社区列表
@@ -7006,6 +7018,22 @@
    R applyDonates(@RequestBody ComActWarehouseApplyDTO comActWarehouseApplyDTO);

    /**
     * 生成二维码
     * @param qrCodeVO
     * @return
     */
    @PostMapping("/comActActivityCode/getQRCode")
    public R getQRCode(@RequestBody QRActivityCodeVO qrCodeVO);

    /**
     * 重置二维码
     * @param qrCodeVO
     * @return
     */
    @PostMapping("/comActActivityCode/resetQRCode")
    public R resetQRCode(@RequestBody QRActivityCodeVO qrCodeVO);

    /**
     * 实有房屋数据修复定时任务
     * @return  实有房屋数据修复定时任务
     */
@@ -7128,6 +7156,48 @@
     */
    @PostMapping("/elders/pensionAuthRecord/add")
    R addPensionAuthRecordVO(@RequestBody ComElderAuthRecordVO comElderAuthRecordVO);
    /**
     * 活动报名签到情况
     * @param id 活动主键id
     * @return
     */
    @GetMapping("/activity/sign-in/list")
    R listSignInRecord(@RequestParam("id") Long id);

    /**
     * 活动签到记录
     * @param id 活动主键
     * @param userId 用户id
     * @return
     */
    @GetMapping("/activity/regist/list")
    R listRegistRecord(@RequestParam("id")  Long id, @RequestParam("userId") Long userId);

    /**
     * 获取活动类型（目前只有志愿者活动需要获取）
     * @param communityId
     * @param type
     * @return
     */
    @GetMapping("/activity/type/list")
    R listActivityType(@RequestParam("communityId") Long communityId, @RequestParam("type") Integer type);

    /**
     * 添加活动类型
     * @param comActActivityTypeVO
     * @return
     */
    @PostMapping("/activity/type/add")
    R addActivityType(@RequestBody ComActActivityTypeVO comActActivityTypeVO);

    /**
     * 我的评价
     * @param userId
     * @param activityId
     * @return
     */
    @GetMapping("/activity/my-evaluate")
    R listMyActivityEvaluate(@RequestParam("userId") Long userId, @RequestParam("activityId") Long activityId);

    /**
     * 分页查询居家隔离统计
@@ -7424,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
@@ -7433,11 +7530,11 @@

    /**
     * 党员积分前3
     * @param communityId
     * @param pageBigScreenStatisticPartyOrg
     * @return
     */
    @GetMapping("/bigscreen/party/partyActivityTop")
    R partyActivityTop(@RequestParam("communityId")Long communityId);
    @PostMapping("/bigscreen/party/partyActivityTop")
    R partyActivityTop(@RequestBody PageBigScreenStatisticPartyOrg pageBigScreenStatisticPartyOrg);

    /**
     * 社区服务大屏数据分析接口
@@ -7482,4 +7579,154 @@
     */
    @PostMapping("/screen/merchant/popular")
    R getScreenPopularMerchants(@RequestBody PagePopularMerchantDTO pagePopularMerchantDTO);

    /**
     * 新版大屏首页接口
     */
    @GetMapping("/screen/indexInfo")
    R indexInfo(@RequestParam("communityId") Long communityId);

    /**
     * 首页二级页面-微心愿
     * @param communityId
     * @return
     */
    @GetMapping("/screen/index/microWish")
    R indexMicroWish(@RequestParam("communityId") Long communityId);

    /**
     * 首页二级页面-随手拍
     * @param communityId
     * @return
     */
    @GetMapping("/screen/index/easyPhoto")
    R indexEasyPhoto(@RequestParam("communityId") Long communityId);

    /**
     * 首页二级页面-随手拍展示列表
     * @return
     */
    @PostMapping("/screen/index/easyPhotoList")
    R indexEasyPhotoList(@RequestBody PageBaseDTO pageBaseDTO);

    /**
     * 首页二级页面-社区问卷
     * @param communityId
     * @return
     */
    @GetMapping("/screen/index/questionnaire")
    R indexQuestionnaire(@RequestParam("communityId") Long communityId);

    /**
     * 首页二级页面-社区动态
     * @param communityId
     * @return
     */
    @GetMapping("/screen/index/dyn")
    R indexDyn(@RequestParam("communityId") Long communityId);

    /**
     * 首页二级页面-社区动态展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/screen/index/dynList")
    R indexDynList(@RequestBody PageBaseDTO pageBaseDTO);

    /**
     * 首页二级页面-邻里圈
     * @param communityId
     * @return
     */
    @GetMapping("/screen/index/neighbor")
    R indexNeighbor(@RequestParam("communityId") Long communityId);

    /**
     * 首页二级页面-邻里圈展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/screen/index/neighborList")
    R indexNeighborList(@RequestBody PageBaseDTO pageBaseDTO);

    /**
     * 首页二级页面-便民商家
     * @param communityId
     * @return
     */
    @GetMapping("/screen/index/merchant")
    R indexMerchant(@RequestParam("communityId") Long communityId);

    /**
     * 首页二级页面-商家展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/screen/index/merchantList")
    R indexMerchantList(@RequestBody PageBaseDTO pageBaseDTO);

    /**
     * 首页二级页面-微心愿展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/screen/index/microWishList")
    R indexMicroWishList(@RequestBody PageBaseDTO pageBaseDTO);

    /**
     * 首页二级页面-社区问卷展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/screen/index/questionnaireList")
    R indexQuestionnaireList(@RequestBody PageBaseDTO pageBaseDTO);

    /**
     * 首页二级页面-居民活动
     * @param communityId
     * @return
     */
    @GetMapping("/screen/index/residentAct")
    R indexResidentAct(@RequestParam("communityId") Long communityId);

    /**
     * 首页二级页面-居民活动展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/screen/index/residentActList")
    R indexResidentActList(@RequestBody PageBaseDTO pageBaseDTO);

    /**
     * 首页二级页面-志愿者活动
     * @param communityId
     * @return
     */
    @GetMapping("/screen/index/volunteerAct")
    R indexVolunteerAct(@RequestParam("communityId") Long communityId);

    /**
     * 首页二级页面-志愿者活动展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/screen/index/volunteerActList")
    R indexVolunteerActList(@RequestBody PageBaseDTO pageBaseDTO);

    /**
     * 清网治格-根据事件分类获取近1月的社区事件数据
     * @param type
     * @param communityId
     * @return
     */
    @GetMapping("/screen/event/list")
    R getEventList(@RequestParam(value = "type") Integer type, @RequestParam(value = "communityId") Long communityId);

    /**
     * 清网治格-社区事件数据分页
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/screen/event/page")
    R pageEventList(@RequestBody PageBaseDTO pageBaseDTO);
}