Merge branch 'test' into 'master'

罗元桥

2021-07-12 0dc0a47cf5f655cb0dbff082f7c36613c21e328b

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

@@ -5,16 +5,16 @@
import com.panzhihua.common.model.dtos.advertisement.ComOpsAdvDTO;
import com.panzhihua.common.model.dtos.advertisement.PageComOpsAdvDTO;
import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDetailDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenStatisticAgeGenderDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenStatisticPartyActivityDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.PageBigScreenStatisticPartyOrg;
import com.panzhihua.common.model.dtos.community.bigscreen.*;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityListDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityPeopleListDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenDiscussListDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenMicroListDTO;
import com.panzhihua.common.model.dtos.community.wallet.ComActWalletDetailDTO;
import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeDTO;
import com.panzhihua.common.model.dtos.community.easyPhoto.AddEasyPhotoActivityDTO;
import com.panzhihua.common.model.dtos.community.easyPhoto.EditEasyPhotoActivityDTO;
import com.panzhihua.common.model.dtos.community.easyPhoto.PageEasyPhotoActivityDTO;
import com.panzhihua.common.model.dtos.community.easyPhoto.PageEasyPhotoActivityUserDTO;
import com.panzhihua.common.model.dtos.community.wallet.*;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthGetResultDTO;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthPageDTO;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthUserAddAppDTO;
@@ -24,10 +24,7 @@
import com.panzhihua.common.model.dtos.shop.*;
import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
import com.panzhihua.common.model.dtos.vaccines.*;
import com.panzhihua.common.model.vos.BcDictionaryItemVO;
import com.panzhihua.common.model.vos.BcDictionaryVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
import com.panzhihua.common.model.vos.*;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticAgeGender;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyActivity;
@@ -2939,6 +2936,24 @@
    R listSaveBuildingExcelVO(@RequestBody List<ComMngBuildingExcelVO> newVoList, @RequestParam("communityId") Long communityId);

    /**
     * 插入字典
     * @param dictionaryVO  字典数据
     * @return R  是否保存成功
     * @author manailin
     * @date 2021/6/10 17:00
     */
    @PostMapping("/dictionary/insertDiction")
    R  insertDiction(@RequestBody DictionaryVO dictionaryVO);
    /**
     * 插入字典项
     * @param dictionaryVO  字典数据
     * @return R  是否保存成功
     * @author manailin
     * @date 2021/6/10 17:00
     */
    @PostMapping("/dictionary/insertDictionItem")
    R  insertDictionItem(@RequestBody BcDictionaryVO dictionaryVO);
    /**
     * 根据字典key查询字典项
     *
     * @param key
@@ -3124,11 +3139,11 @@
    /**
     * 事件大屏统计接口
     *
     * @param communityId 社区id
     * @param screenEventDTO 请求参数
     * @return 统计结果
     */
    @GetMapping("/screen/getScreenEvent")
    R getScreenEvent(@RequestParam("communityId") Long communityId);
    @PostMapping("/screen/getScreenEvent")
    R getScreenEvent(@RequestBody BigScreenEventDTO screenEventDTO);

    /**
     * 民生大屏统计接口
@@ -3484,4 +3499,122 @@
     */
    @PostMapping("/village/admin/export")
    R getGridVillageListExport(@RequestBody ComMngVillageListExportAdminDTO villageListAppDTO);

    /**
     * 社区后台-分页查询随手拍活动列表
     * @param pageEasyPhotoActivityDTO  请求参数
     * @return  随手拍活动列表
     */
    @PostMapping("/easy/photo/activity/page")
    R pageEasyPhotoActivity(@RequestBody PageEasyPhotoActivityDTO pageEasyPhotoActivityDTO);

    /**
     * 社区后台-添加随手拍活动
     * @param addEasyPhotoActivityDTO   请求参数
     * @return  添加结果
     */
    @PostMapping("/easy/photo/activity/add")
    R addEasyPhotoActivity(@RequestBody AddEasyPhotoActivityDTO addEasyPhotoActivityDTO);

    /**
     * 社区后台-编辑随手拍活动
     * @param editEasyPhotoActivityDTO  请求参数
     * @return  编辑结果
     */
    @PostMapping("/easy/photo/activity/edit")
    R editEasyPhotoActivity(@RequestBody EditEasyPhotoActivityDTO editEasyPhotoActivityDTO);

    /**
     * 社区后台-取消随手拍活动
     * @param id    随手拍活动id
     * @return  取消结果
     */
    @GetMapping("/easy/photo/activity/cancel")
    R cancelEasyPhotoActivity(@RequestParam("id") Long id);

    /**
     * 分页查询随手拍活动下居民参与记录
     * @param pageEasyPhotoActivityUserDTO  请求参数
     * @return  居民参与记录
     */
    @PostMapping("/easy/photo/activity/page/user")
    R pageEasyPhotoActivityUser(@RequestBody PageEasyPhotoActivityUserDTO pageEasyPhotoActivityUserDTO);

    /**
     * 随手拍活动定时任务
     * @return  执行结果
     */
    @PostMapping("timeTaskEasyPhotoActivity")
    R timedTaskEasyPhotoActivity();

    /**
     * 分页查询收益结算列表
     * @param pageWalletAdminDTO    请求参数
     * @return  收益结算列表
     */
    @PostMapping("/user/wallet/page")
    R pageUserWalletAdmin(@RequestBody PageComActWalletAdminDTO pageWalletAdminDTO);

    /**
     * 用户结算收益
     * @param settlementAdminDTO    请求参数
     * @return  结算结果
     */
    @PostMapping("/user/wallet/settlement")
    R userWalletSettlementAdmin(@RequestBody ComActWalletSettlementAdminDTO settlementAdminDTO);

    /**
     * 分页查询交易记录
     * @param pageTradeAdminDTO 请求参数
     * @return  交易记录列表
     */
    @PostMapping("/user/wallet/trade/page")
    R pageUserWalletTradeAdmin(@RequestBody PageComActWalletTradeAdminDTO pageTradeAdminDTO);

    /**
     * 社区随手拍列表统计
     * @param communityId   社区id
     * @return  统计结果
     */
    @GetMapping("/easyphoto/statistics")
    R easyPhotoStatistics(@RequestParam("communityId") Long communityId);

    /**
     * 分页查询邻里圈话题列表
     * @param circleTopicAdminDTO   请求参数
     * @return  邻里圈话题列表
     */
    @PostMapping("/neighbor/pageNeighborTopicByAdmin")
    R pageNeighborTopicByAdmin(@RequestBody ComActNeighborCircleTopicAdminDTO circleTopicAdminDTO);

    /**
     * 添加邻里圈话题
     * @param addCircleTopicAdminDTO    请求参数
     * @return  添加结果
     */
    @PostMapping("/neighbor/addNeighborTopicByAdmin")
    R addNeighborTopicByAdmin(@RequestBody AddNeighborCircleTopicAdminDTO addCircleTopicAdminDTO);

    /**
     * 编辑邻里圈话题
     * @param addCircleTopicAdminDTO    请求参数
     * @return  编辑结果
     */
    @PostMapping("/neighbor/editNeighborTopicByAdmin")
    R editNeighborTopicByAdmin(@RequestBody AddNeighborCircleTopicAdminDTO addCircleTopicAdminDTO);

    /**
     * 小程序查询邻里圈话题列表
     * @param communityId   社区id
     * @return  邻里圈话题列表
     */
    @GetMapping("/neighbor/getNeighborTopicByApp")
    R getNeighborTopicByApp(@RequestParam("communityId") Long communityId);

    /**
     * 综治后台-查询社区列表
     * @return  社区列表
     */
    @GetMapping("/eventgrid/community/list")
    R getCommunityLists();
}