Merge branch 'local_20221024' into haucheng_panzhihua

yanghui

2022-10-27 28e8b38e9de8cc76084d0af6a96d2d9d1e1f739f

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

@@ -3,20 +3,20 @@
import java.util.List;

import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.dtos.civil.*;
import com.panzhihua.common.model.dtos.common.*;
import com.panzhihua.common.model.dtos.community.ActivityInviteDTO;
import com.panzhihua.common.model.dtos.community.DiscussVoteOptionDTO;
import com.panzhihua.common.model.dtos.community.PageActivityInviteDTO;
import com.panzhihua.common.model.dtos.community.PageVoteSituationDTO;
import com.panzhihua.common.model.dtos.community.acid.*;
import com.panzhihua.common.model.dtos.community.dpc.AddDpcDTO;
import com.panzhihua.common.model.dtos.community.dpc.EditDpcDTO;
import com.panzhihua.common.model.dtos.community.dpc.PageDpcDTO;
import com.panzhihua.common.model.dtos.community.enterprise.*;
import com.panzhihua.common.model.dtos.community.reserve.*;
import com.panzhihua.common.model.dtos.community.sanshuo.*;
import com.panzhihua.common.model.dtos.community.warehouse.ComActWarehouseApplyDTO;
import com.panzhihua.common.model.dtos.community.GetIdentityEidTokenDTO;
import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.dtos.community.building.admin.*;
import com.panzhihua.common.model.dtos.community.cluster.PageClusterMemberDto;
import com.panzhihua.common.model.dtos.community.cluster.admin.*;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussDetailDTO;
import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussPublishResultDTO;
@@ -27,10 +27,7 @@
import com.panzhihua.common.model.dtos.neighbor.*;
import com.panzhihua.common.model.dtos.property.PagePropertyWorkerDTO;
import com.panzhihua.common.model.dtos.property.PropertyWorkerDTO;
import com.panzhihua.common.model.vos.*;
import com.panzhihua.common.model.vos.civil.ComActSocialWorkerDetailsVO;
import com.panzhihua.common.model.vos.civil.ComActSocialWorkerVO;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.community.acid.ComActAcidCheckRecordVO;
import com.panzhihua.common.model.vos.community.acid.ComActAcidMemberVO;
import com.panzhihua.common.model.vos.community.acid.ComActAcidRecordVO;
@@ -39,12 +36,7 @@
import com.panzhihua.common.model.vos.community.raffle.ComActRaffleRecordVO;
import com.panzhihua.common.model.vos.community.raffle.ComActRaffleVO;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveDangerAreaVO;
import com.panzhihua.common.model.vos.community.social.*;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import com.panzhihua.common.model.vos.community.*;
import org.springframework.beans.BeanUtils;
import io.swagger.annotations.ApiParam;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.scheduling.annotation.Async;
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -56,7 +48,6 @@
import org.springframework.web.bind.annotation.RequestParam;

import com.panzhihua.common.model.dtos.AppletesBackstageConfigDTO;
import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.dtos.PageDTO;
import com.panzhihua.common.model.dtos.advertisement.ComOpsAdvDTO;
import com.panzhihua.common.model.dtos.advertisement.PageComOpsAdvDTO;
@@ -124,7 +115,6 @@
import com.panzhihua.common.model.dtos.community.ExportComMngCarExcelDTO;
import com.panzhihua.common.model.dtos.community.ExportRealAssetsExcelDTO;
import com.panzhihua.common.model.dtos.community.ExportRealCompanyExcelDTO;
import com.panzhihua.common.model.dtos.community.GetIdentityEidTokenDTO;
import com.panzhihua.common.model.dtos.community.GrantRewardDTO;
import com.panzhihua.common.model.dtos.community.KeyPersonInfoDTO;
import com.panzhihua.common.model.dtos.community.OperationDetailDTO;
@@ -172,7 +162,6 @@
import com.panzhihua.common.model.dtos.community.building.admin.EditBuildingUnitDto;
import com.panzhihua.common.model.dtos.community.building.admin.PageBuildingListDto;
import com.panzhihua.common.model.dtos.community.building.admin.PageBuildingUnitHouseListDto;
import com.panzhihua.common.model.dtos.community.cluster.PageClusterMemberDto;
import com.panzhihua.common.model.dtos.community.cluster.admin.AddClusterAdminDto;
import com.panzhihua.common.model.dtos.community.cluster.admin.AddClusterMemberAdminDto;
import com.panzhihua.common.model.dtos.community.cluster.admin.EditClusterAdminDto;
@@ -195,18 +184,12 @@
import com.panzhihua.common.model.dtos.community.convenient.PagePopularMerchantDTO;
import com.panzhihua.common.model.dtos.community.convenient.PageSearchDTO;
import com.panzhihua.common.model.dtos.community.convenient.ResetPasswordConvenientMerchantDTO;
import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussDetailDTO;
import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussPublishResultDTO;
import com.panzhihua.common.model.dtos.community.easyPhoto.AddEasyPhotoActivityDTO;
import com.panzhihua.common.model.dtos.community.easyPhoto.AddEasyPhotoClassifyDTO;
import com.panzhihua.common.model.dtos.community.easyPhoto.EditEasyPhotoActivityDTO;
import com.panzhihua.common.model.dtos.community.easyPhoto.ExportEasyPhotoDTO;
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.elder.ElderAuthStatisticHeaderDTO;
import com.panzhihua.common.model.dtos.community.elder.PageElderAuthStatisticDTO;
import com.panzhihua.common.model.dtos.community.elder.PagePensionAuthStatisticDTO;
import com.panzhihua.common.model.dtos.community.elder.SignElderAuthStatisticDTO;
import com.panzhihua.common.model.dtos.community.fms.AddFmsClassroomAdminDTO;
import com.panzhihua.common.model.dtos.community.fms.AddFmsServiceAdminDTO;
import com.panzhihua.common.model.dtos.community.fms.AddTeamDTO;
@@ -283,7 +266,6 @@
import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletAdminDTO;
import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeAdminDTO;
import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeDTO;
import com.panzhihua.common.model.dtos.community.warehouse.ComActWarehouseApplyDTO;
import com.panzhihua.common.model.dtos.community.warehouse.ComActWarehouseDonatesDTO;
import com.panzhihua.common.model.dtos.community.warehouse.ExportDonatesDTO;
import com.panzhihua.common.model.dtos.community.warehouse.PageDonatesDTO;
@@ -319,7 +301,6 @@
import com.panzhihua.common.model.dtos.neighbor.DeleteNeighborCircleAppDTO;
import com.panzhihua.common.model.dtos.neighbor.DetailNeighborAllCommentByAdminDTO;
import com.panzhihua.common.model.dtos.neighbor.DetailNeighborCommentReplyByAdminDTO;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.dtos.shop.ComShopAddressDTO;
import com.panzhihua.common.model.dtos.shop.ComShopCartDTO;
import com.panzhihua.common.model.dtos.shop.ComShopEditNubCartDTO;
@@ -353,7 +334,6 @@
import com.panzhihua.common.model.vos.DictionaryVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
import com.panzhihua.common.model.vos.civil.ComActSocialWorkerVO;
import com.panzhihua.common.model.vos.community.ActivitySignVO;
import com.panzhihua.common.model.vos.community.BatchhouseVO;
import com.panzhihua.common.model.vos.community.ComActActEvaluateVO;
@@ -420,7 +400,6 @@
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyActivity;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyBuild;
import com.panzhihua.common.model.vos.community.bigscreen.PartyBuildingMemberVO;
import com.panzhihua.common.model.vos.community.cluster.admin.ComClusterMemberExcelVO;
import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
import com.panzhihua.common.model.vos.community.fms.ComFmsServiceImportExcelVO;
import com.panzhihua.common.model.vos.community.fms.ComFmsTeamMemberImportExcelVO;
@@ -429,8 +408,6 @@
import com.panzhihua.common.model.vos.community.questnaire.EditComActQuestnaireVo;
import com.panzhihua.common.model.vos.community.questnaire.QuestnaireVO;
import com.panzhihua.common.model.vos.community.questnaire.UsersAnswerQuestnaireVO;
import com.panzhihua.common.model.vos.community.raffle.ComActRaffleRecordVO;
import com.panzhihua.common.model.vos.community.raffle.ComActRaffleVO;
import com.panzhihua.common.model.vos.community.rentHouse.RentingHourseOrderVO;
import com.panzhihua.common.model.vos.community.rentHouse.RentingHoursePreOrderVO;
import com.panzhihua.common.model.vos.community.rentHouse.WxPayNotifyOrderVO;
@@ -455,6 +432,7 @@
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
import com.panzhihua.common.model.vos.user.UserElectronicFileVO;
import com.panzhihua.common.model.vos.user.UserPhoneVO;
import org.springframework.web.multipart.MultipartFile;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -1303,7 +1281,7 @@
     * @return
     */
    @PostMapping("listadvertisement")
    R listAdvertisement();
    R listAdvertisement(@RequestParam("type") Integer type);

    /**
     * 新增广告
@@ -1662,12 +1640,12 @@
    /**
     * 议事投票-投票
     *
     * @param comActDiscussOptionUserDTO
     * @param discussVoteOptionDTO
     *            投票信息
     * @return 投票结果
     */
    @PostMapping("adddiscussoptionuser")
    R addDiscussOptionUser(@RequestBody ComActDiscussOptionUserDTO comActDiscussOptionUserDTO);
    R addDiscussOptionUser(@RequestBody DiscussVoteOptionDTO discussVoteOptionDTO);

    /**
     * 议事投票-评论-点赞、取消点赞
@@ -5061,7 +5039,7 @@
     * @return 邻里圈话题列表
     */
    @GetMapping("/neighbor/getNeighborTopicByApp")
    R getNeighborTopicByApp(@RequestParam("name") String name, @RequestParam("belongType") Integer belongType);
    R getNeighborTopicByApp(@RequestParam("name") String name);

    /**
     * 删除话题
@@ -5085,7 +5063,7 @@
     * @return 社区列表
     */
    @GetMapping("/eventgrid/community/westList")
    R getWestCommunityLists(@RequestParam("areaCode")String areaCode);
    R getWestCommunityLists(@RequestParam(value = "areaCode",required = false)String areaCode);

    /**
     * 综治app-小区列表
@@ -5378,14 +5356,23 @@
    R getIntegralReceiveApplets(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId);

    /**
     * 小程序-查询用户积分列表
     * 小程序-积分统计
     *
     * @param userId
     *            用户id
     * @return 用户积分列表
     */
    @PostMapping("/integral/user/list/applets")
    R getIntegralUserListApplets(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId);
    @GetMapping("/integral/user/statistics")
    R getIntegralUserListApplets(@RequestParam("userId") Long userId, @RequestParam(value = "communityId", required = false) Long communityId);

    /**
     * 查询我的积分余额
     * @param userId
     * @param communityId
     * @return
     */
    @GetMapping("/integral/user/balance")
    R getUserIntegralBalance(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId);

    /**
     * 小程序-查询社区积分账户排行榜
@@ -5678,6 +5665,9 @@

    @PostMapping("/reserve/commitNoToken")
    R reserveCommitNoToken(@RequestBody ComActReserveCommitVO comActReserveCommitVO);

    @PostMapping("/reserve/homeQuarantine/commitNoToken")
    R homeQuarantineCommitNoToken(@RequestBody ComActReserveCommitVO comActReserveCommitVO);
    /**
     * 我的预约/登记
     * @param pageUserReserveDTO
@@ -5980,6 +5970,14 @@
    @PostMapping("/neighbor/serviceStatic")
    R serviceStatic(@RequestBody ServiceStaticDTO serviceStaticDTO);

    /**
     * 求助我的问题数量统计
     * @param type
     * @param phone
     * @return
     */
    @GetMapping("/neighbor/selectCount")
    R selectCount(@RequestParam("type")Integer type,@RequestParam(value = "phone",required = false)String phone,@RequestParam("communityId")Long communityId);

    /**
     * 获取系统配置value
@@ -6360,7 +6358,7 @@
     * @return 单条数据
     */
    @GetMapping("/comActFourMember/{id}")
    R comActFourMemberSelectOne(@PathVariable("id") Integer id);
    R comActFourMemberSelectOne(@PathVariable("id") Long id);

    /**
     * 新增数据
@@ -9697,6 +9695,9 @@
    @PostMapping("/comActAcidRecord/export")
    R exportComActAcidRecord(@RequestBody ComActAcidRecordDTO comActAcidRecordDTO);

    @GetMapping("/comActAcidRecord/checkCommit")
    R checkCommit(@RequestParam(value = "userId",required = false)Long userId);


    /**
     * 5项常规统计
@@ -9710,7 +9711,7 @@
     * @return
     */
    @GetMapping("/comActAcidRecord/fiveCountPlus")
    R comActAcidRecordFiveCountPlus(@RequestParam("date")String date,@RequestParam("localCity")String localCity);
    R comActAcidRecordFiveCountPlus(@RequestParam("date")String date,@RequestParam("localCity")String localCity,@RequestParam(value = "loginAccount",required = false)String loginAccount);

    @GetMapping("/comActAcidRecord/statics")
    R comActAcidRecordStatics(@RequestParam("date")String date);
@@ -9933,7 +9934,7 @@
                                       @RequestParam(value = "page",required = false) Integer page,
                                       @RequestParam(value = "size",required = false) Integer size,
                                       @RequestParam(value = "belongTo",required = false) String  belongTo,
                                       @RequestParam(value = "unitId",required = false) Long unitId);
                                       @RequestParam(value = "unitId",required = false) Long unitId,@RequestParam(value = "loginAccount",required = false) String loginAccount);
    /**
     * 批量删除活动
     * @param ids
@@ -10284,4 +10285,283 @@
     */
    @GetMapping("/comActEasyPhotoHandler/detail")
    R detailEasyPhotoHandler(@RequestParam("id") Long id);

    /**
     * 活动邀请列表
     * @param pageActivityInviteDTO
     * @return
     */
    @PostMapping("/activity/invite/list")
    R pageActivityInviteList(@RequestBody PageActivityInviteDTO pageActivityInviteDTO);

    /**
     * 添加邀请人员
     * @param list
     * @return
     */
    @PostMapping("/activity/invite/add")
    R activityInviteAdd(@RequestBody List<ActivityInviteDTO> list);

    /**
     * 删除邀请人员
     * @param id
     * @return
     */
    @DeleteMapping("/activity/invite/delete")
    R activityInviteDelete(@RequestParam("id") Long id);

    /**
     * 获取积分详情
     * @param id
     * @return
     */
    @GetMapping("/integral/user/detail")
    R getUserIntegralDetail(@RequestParam("id") Long id);

    /**
     * 分页查询可关联清单列表
     * @param neighborCircleAppDTO
     * @return
     */
    @PostMapping("/neighbor/pageRelationList")
    R pageRelationList(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO);

    /**
     * 投票情况-分页查询
     * @param pageVoteSituationDTO
     * @return
     */
    @PostMapping("pageVoteSituation")
    R pageVoteSituation(@RequestBody PageVoteSituationDTO pageVoteSituationDTO);

    /**
     * 投票情况详情
     * @param optionUserId
     * @return
     */
    @GetMapping("detailVoteSituation")
    R detailVoteSituation(@RequestParam("optionUserId") Long optionUserId);

    /**
     * 批量核对防疫信息数据
     * @param batchCheckAcidRecordDTO
     * @return
     */
    @PostMapping("/comActAcidRecord/batchCheck")
    R batchCheck(@RequestBody BatchCheckAcidRecordDTO batchCheckAcidRecordDTO);

    /**
     * 小程序获取可用的行业中心列表
     * @return
     * */
    @GetMapping("/sanshuo/industryCenter/appletsList")
    R    industryCenterAppList();

    /**
     * 后台获取行业中心列表
     * */
    @GetMapping("/sanshuo/industryCenter/list")
    R backIndustrytList(@RequestParam(value = "keyWord",required = false)String keyWord,
                       @RequestParam(value = "page",required = false)Integer page,
                       @RequestParam(value = "size",required = false)Integer size);

    /**
     * 添加业务中心
     * */
    @PostMapping("/sanshuo/industryCenter")
    R addIndustry(@RequestBody ComSanShuoIndustryCenterDTO comSanShuoIndustryCenterDTO);

    /**
     * 修改业务中心
     * */
    @PutMapping("/sanshuo/industryCenter")
    R updateIndustry(@RequestBody ComSanShuoIndustryCenterDTO comSanShuoIndustryCenterDTO);

    /**
     * 删除业务中心
     * */
    @DeleteMapping("/sanshuo/industryCenter/remove")
    R removeIndustry(@RequestParam("id") Long id);

    /**
     * 重置业务中心密码
     * */
    @PostMapping("/sanshuo/industryCenter/resetPass")
    R resetIndustryPassword(@RequestBody ComSanShuoIndustryCenterDTO comSanShuoIndustryCenterDTO);

    /**
     * 业务中心详情
     * */
    @GetMapping("/sanshuo/industryCenter/detail")
    R industryCenterDetail(@RequestParam("id") Long id);

    /**
     * 后台获取专家列表
     * */
    @GetMapping("/sanshuo/expert/backstageList")
    R backExpertList(@RequestParam(value = "keyWord",required = false)@ApiParam("搜索关键字") String keyWord,
                     @RequestParam(value = "page",required = false)Integer page,
                     @RequestParam(value = "size",required = false)Integer size,
                     @RequestParam(value = "level",required = false)Integer level);

    /**
     * 添加专家
     * */
    @PostMapping("/sanshuo/expert")
    R addExpert(@RequestBody ComSanshuoExpertDTO comSanshuoExpertDTO);

    /**
     * 修改专家
     * */
    @PutMapping("/sanshuo/expert")
    R updateExpert(@RequestBody ComSanshuoExpertDTO comSanshuoExpertDTO);

    /**
     * 删除专家
     * */
    @DeleteMapping("/sanshuo/expert/remove")
    R removeExpert(@RequestParam("id")Long id);

    /**
     * 重置专家登陆密码
     * */
    @PostMapping("/sanshuo/expert/resetPassword")
    R resetExpertPassword(@RequestBody ComSanshuoExpertDTO comSanshuoExpertDTO);

    /**
     * 小程序获取可选择专家列表
     * */
    @GetMapping("/sanshuo/expert/appletsList")
    R expertAppList(@RequestParam (value = "type",required = false)Integer type,@RequestParam(value = "id",required = false)Long id);

    /**
     * 获取专家详情
     * */
    @GetMapping("/sanshuo/expert/detail")
    R expertDetail(@RequestParam("id") Long id);

    /**
     * 后台事件列表
     * */
    @GetMapping("/sanshuo/event/list")
    R backEventList(@RequestParam(value = "keyWord",required = false)String keyWord,
                    @RequestParam(value = "page",required = false)Integer page,
                    @RequestParam(value = "size",required = false)Integer size);

    /**
     * 事件详情
     * */
    @GetMapping("/sanshuo/event/detail")
    R eventDetail(@RequestParam(value = "id",required = false)Long id);

    /**
     * 小程序获取事件列表
     * */
    @GetMapping("/sanshuo/event/appletsList")
    R eventAppList();

    /**
     * 新增事件类型
     * */
    @PostMapping("/sanshuo/event")
    R addEvent(@RequestBody ComMediateTypeDTO comSanshuoEventDTO);

    /**
     * 新增事件类型
     * */
    @PutMapping("/sanshuo/event")
    R updateEvent(@RequestBody ComMediateTypeDTO comSanshuoEventDTO);

    /**
     * 删除事件类型
     * */
    @DeleteMapping("/sanshuo/event/remove")
    R removeEvent(@RequestParam(value = "id",required = false)Long id);

    /**
     * 专家风采
     * */
    @GetMapping("/sanshuo/expert/expertShow")
    R expertShow();


    @GetMapping("/sanshuo/expert/expertRange")
    R expertRange();

    /**
     * 大屏事件统计
     * */
    @PostMapping("/sanshuo/comEvent/indexData")
    R sanshuoIndexDate(IndexDateDTO indexDateDTO);

    /**
     * 事件占比统计饼图
     * */
    @GetMapping("sanshuo/comEvent/indexData/event")
    R eventIndexData(@RequestParam("type") Integer type);

    /**
     * 专家风采列表
     * */
    @GetMapping("/sanshuo/expert/expertShowList")
    R expertShowList(@RequestParam(value = "level",required = false)Integer level,@RequestParam(value = "id",required = false)Long id);

    /**
     * 修改街道信息
     * */
    @PostMapping("/updateStreet")
    R updateStreet(@RequestBody ComStreetVO comStreetVO);

    /**
     * 删除街道
     * */
    @GetMapping("/removeStreet")
    R removeStreet(@RequestParam(value = "id",required = false)Long id);

    /***
     * 删除社区
     * */
    @GetMapping("/removeCommunity")
    R removeCommunity(@RequestParam(value = "id",required = false)Long id);

    @PostMapping("/repassCommunity")
    R repassCommunity(@RequestBody ComActVO comActVO);

    @PostMapping("/repassStreet")
    R repassStreet(@RequestBody ComStreetVO comActVO);

    /**
     * 是否有绑定手机号码的专家账号
     * */
    @GetMapping("/sanshuo/expert/checkExpert")
    R isExpert(@RequestParam(value = "number",required = false) String number);

    @GetMapping("/sanshuo/comEvent/streetList")
    R streetList();

    @PostMapping("/sanshuo/expert/importExpert")
    R importExpert(@RequestBody MultipartFile file);

    @GetMapping("/sanshuo/comEvent/communityList")
    R westList();

    @GetMapping("/sanshuo/expert/backstageList2")
    R expertBackStageList(@RequestParam(value = "level",required = false)Integer level,@RequestParam(value = "page",required = false)Integer page,
                          @RequestParam(value = "size",required = false)Integer size);

    /**
     * 查询社区id集合
     * @param id
     * @return
     */
    @GetMapping("selectCommunityIds")
    R selectCommunityIds(@RequestParam("id") Long id);

    /**
     * 查询社区id集合
     * @param id
     * @return
     */
    @GetMapping("selectAutomessageSysUserById")
    R selectAutomessageSysUserById(@RequestParam("id") Long id);
}