Merge remote-tracking branch 'origin/master'

huanghongfa

2021-12-14 d7ea73196c8eb7df71c20b4fdccbc1ef9eff96fe

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

@@ -2,25 +2,8 @@

import java.util.List;

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;
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.neighbor.*;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.community.cluster.admin.ComClusterMemberExcelVO;
import io.swagger.annotations.ApiOperation;
import com.panzhihua.common.model.vos.community.*;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.scheduling.annotation.Async;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
@@ -59,6 +42,7 @@
import com.panzhihua.common.model.dtos.community.ComMngPopulationTagDTO;
import com.panzhihua.common.model.dtos.community.ComMngRealCompanyBelongsDTO;
import com.panzhihua.common.model.dtos.community.ComOpsHouseDTO;
import com.panzhihua.common.model.dtos.community.ComPropertyPublicityDTO;
import com.panzhihua.common.model.dtos.community.ComSwDangerReportEditDTO;
import com.panzhihua.common.model.dtos.community.ComSwDangerReportHandleDTO;
import com.panzhihua.common.model.dtos.community.ComSwDangerReportRectifyDTO;
@@ -100,6 +84,7 @@
import com.panzhihua.common.model.dtos.community.PageComMngRealCompanyDTO;
import com.panzhihua.common.model.dtos.community.PageComMngVillageDTO;
import com.panzhihua.common.model.dtos.community.PageComOpsHouseDTO;
import com.panzhihua.common.model.dtos.community.PageComPropertyPublicityDTO;
import com.panzhihua.common.model.dtos.community.PageComStreetDTO;
import com.panzhihua.common.model.dtos.community.PageElderAuthRecordsDTO;
import com.panzhihua.common.model.dtos.community.PageEldersAuthDTO;
@@ -120,6 +105,13 @@
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.building.admin.AddBuildingHouseDto;
import com.panzhihua.common.model.dtos.community.building.admin.AddBuildingUnitDto;
import com.panzhihua.common.model.dtos.community.building.admin.DeleteBuildingHousePopulationDto;
import com.panzhihua.common.model.dtos.community.building.admin.EditBuildingHouseDto;
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;
@@ -161,6 +153,7 @@
import com.panzhihua.common.model.dtos.community.integral.admin.PageComActIntegralRuleDTO;
import com.panzhihua.common.model.dtos.community.integral.admin.PageComActIntegralTradeDTO;
import com.panzhihua.common.model.dtos.community.questnaire.StatisticsSummaryDTO;
import com.panzhihua.common.model.dtos.community.rentingHouses.*;
import com.panzhihua.common.model.dtos.community.reserve.AddReserveAdminDTO;
import com.panzhihua.common.model.dtos.community.reserve.CancelReserveRecordDTO;
import com.panzhihua.common.model.dtos.community.reserve.ComActReserveMakeStatisticsDTO;
@@ -179,6 +172,7 @@
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;
@@ -252,6 +246,8 @@
import com.panzhihua.common.model.vos.community.ComActActEvaluateVO;
import com.panzhihua.common.model.vos.community.ComActActRegistVO;
import com.panzhihua.common.model.vos.community.ComActActivityVO;
import com.panzhihua.common.model.vos.community.ComActAnnouncementVO;
import com.panzhihua.common.model.vos.community.ComActColumnVO;
import com.panzhihua.common.model.vos.community.ComActCommiteeVO;
import com.panzhihua.common.model.vos.community.ComActDynVO;
import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
@@ -314,6 +310,10 @@
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.rentHouse.RentingHourseOrderVO;
import com.panzhihua.common.model.vos.community.rentHouse.RentingHoursePreOrderVO;
import com.panzhihua.common.model.vos.community.rentHouse.WxPayNotifyOrderVO;
import com.panzhihua.common.model.vos.community.rentHouse.WxPayOrderVO;
import com.panzhihua.common.model.vos.community.warehouse.ComActWarehouseApplyVO;
import com.panzhihua.common.model.vos.community.warehouse.ComActWarehouseBaseVO;
import com.panzhihua.common.model.vos.community.warehouse.QRCodeVO;
@@ -2498,6 +2498,12 @@
    R pagePopulation(ComMngPopulationDTO comMngPopulationVO);

    /**
     * 根据身份证查询实有人口信息
     */
    @GetMapping("/common/data/population/selectByIdCard")
    R selectByIdCard(@RequestParam("idCard") String idCard);

    /**
     * 根据id实有人口详细信息
     *
     * @param populationId
@@ -3836,6 +3842,15 @@
    R exportElderAuthRecordsStatistic(@RequestBody PageElderAuthStatisticDTO pageElderAuthRecordsDTO);

    /**
     * 导出高龄认证记录 exportElderAuthRecords  导出高龄认证记录
     * @param    pageElderAuthRecordsDTO   查询参数
     * @return    R  查询结果
     * @date 2021/9/02 11:03
     */
    @PostMapping("/elders/authRecords/export")
    R exportElderAuthRecords(@RequestBody PageElderAuthRecordsDTO pageElderAuthRecordsDTO);

    /**
     * 分页查询养老金人员认证记录  pagePensionAuthRecords  分页查询养老金人员认证记录
     * @param    pageElderAuthRecordsDTO   查询参数
     * @return    R  查询结果
@@ -4917,6 +4932,14 @@
    R getCommunityLists();

    /**
     * 查询西区社区列表
     *
     * @return 社区列表
     */
    @GetMapping("/eventgrid/community/westList")
    R getWestCommunityLists();

    /**
     * 分页查询退役军人列表
     *
     * @param comExServicemanDTO
@@ -5324,7 +5347,7 @@
     * @return 查询结果
     */
    @GetMapping("/patrolRecord/rota/getRotaPersonByDate")
    R getRotaPersonByDate(@RequestParam(value = "rotaDate") String rotaDate);
    R getRotaPersonByDate(@RequestParam(value = "rotaDate") String rotaDate,@RequestParam("communityId")Long communityId);

    /**
     * 根据日期查询值班领导
@@ -5332,7 +5355,7 @@
     * @return 查询结果
     */
    @GetMapping("/patrolRecord/rota/getRotaLeaderByDate")
    R getRotaLeaderByDate(@RequestParam(value = "rotaDate") String rotaDate);
    R getRotaLeaderByDate(@RequestParam(value = "rotaDate") String rotaDate,@RequestParam("communityId")Long communityId);

    /**
     * 批量导入值班表
@@ -5497,6 +5520,8 @@
    @PostMapping("/reserve/commit")
    R reserveCommit(@RequestBody ComActReserveCommitVO comActReserveCommitVO);

    @PostMapping("/reserve/commitNoToken")
    R reserveCommitNoToken(@RequestBody ComActReserveCommitVO comActReserveCommitVO);
    /**
     * 我的预约/登记
     * @param pageUserReserveDTO
@@ -7103,4 +7128,314 @@
     */
    @PostMapping("/elders/pensionAuthRecord/add")
    R addPensionAuthRecordVO(@RequestBody ComElderAuthRecordVO comElderAuthRecordVO);

    /**
     * 分页查询居家隔离统计
     * @param detailedAdminDTO
     * @return
     */
    @PostMapping("/reserve/admin/register/homeQuarantine/page")
    R pageRegisterHomeQuarantine(PageReserveRegisterDetailedAdminDTO detailedAdminDTO);

    /**
     * 居家隔离导出
     * @param pageReserveRegisterDetailedAdminDTO
     * @return
     */
    @PostMapping("/reserve/admin/homeQuarantine/export")
    R exportHomeQuarantine(@RequestBody PageReserveRegisterDetailedAdminDTO pageReserveRegisterDetailedAdminDTO);

    /**
     * 分页查询物业宣传
     * @param pageComPropertyPublicityDTO
     * @return
     */
    @PostMapping("/property/publicity/page")
    R pageComPropertyPublicity(@RequestBody PageComPropertyPublicityDTO pageComPropertyPublicityDTO);

    /**
     * 新增物业宣传
     * @param comPropertyPublicityDTO
     * @return
     */
    @PostMapping("/property/publicity/add")
    R addComPropertyPublicity(@RequestBody ComPropertyPublicityDTO comPropertyPublicityDTO);

    /**
     * 修改物业宣传
     * @param comPropertyPublicityDTO
     * @return
     */
    @PostMapping("/property/publicity/update")
    R updateComPropertyPublicity(@RequestBody ComPropertyPublicityDTO comPropertyPublicityDTO);

    /**
     * 查看物业宣传信息
     * @param id
     * @return
     */
    @GetMapping("/property/publicity/get")
    R getComPropertyPublicity(@RequestParam("id") Long id);

    /**
     * 删除物业宣传
     * @param id
     * @return
     */
    @DeleteMapping("/property/publicity/delete")
    R deleteComPropertyPublicity(@RequestParam("id") Long id);

    /**
     * 物业公司列表
     *
     * @param villageId
     * @param communityId
     * @return
     */
    @GetMapping("/property/publicity/list/property")
    R listProperty(@RequestParam(value = "villageId", required = false) Long villageId, @RequestParam("communityId") Long communityId);

    /**
     * 分页查询物业宣传-小程序
     * @param pageComPropertyPublicityDTO
     * @return
     */
    @PostMapping("/property/publicity/page/applet")
    R pageComPropertyPublicityApplet(@RequestBody PageComPropertyPublicityDTO pageComPropertyPublicityDTO);

    /**
     * 增加物业宣传浏览量
     * @param id
     * @return
     */
    @GetMapping("/property/publicity/incr-view")
    R incrPropertyPublicityView(@RequestParam("id") Long id);

    /**
     * 获取预设图片
     * @param type
     * @param subtype
     * @return
     */
    @GetMapping("/picture/library/get")
    R getPresetPictureLibrary(@RequestParam("type") Integer type, @RequestParam("subtype") Integer subtype);

    /**
     * 分页查询房屋租赁基础配置
     * @param pageRentingHousesConfigDTO
     * @return
     */
    @PostMapping("/rentingHousesConfig/page")
    R pageRentingHousesConfig(@RequestBody PageRentingHousesConfigDTO pageRentingHousesConfigDTO);

    /**
     * 更新配置信息
     * @param rentingHousesConfigDTO
     * @return
     */
    @PutMapping("/rentingHousesConfig/update")
    R updateRentingHousesConfig(@RequestBody RentingHousesConfigDTO rentingHousesConfigDTO);

    /**
     * 新增房源信息
     * @param registerDTO
     * @return
     */
    @PostMapping("/rentingHourseRegister/register")
    R registerRentingHouse(@RequestBody RentingHouseRegisterDTO registerDTO);

    /**
     * 编辑房源信息
     * @param registerDTO
     * @return
     */
    @PostMapping("/rentingHourseRegister/update")
    R updateRentingHouse(@RequestBody RentingHouseRegisterDTO registerDTO);

    /**
     * 分页获取房源信息
     * @param pageRegisterDTO
     * @return
     */
    @PostMapping("/rentingHourseRegister/page")
    R pageRentingHouse(@RequestBody PageRentingHouseRegisterDTO pageRegisterDTO);

    /**
     * 发布/取消发布 房源信
     * @param releaseOrCancelHouseDTO
     * @return
     */
    @PutMapping("/rentingHourseRegister/releaseOrCancel")
    R releaseOrCancelHouse(@RequestBody ReleaseOrCancelHouseDTO releaseOrCancelHouseDTO);

    /**
     * 删除房源信息
     * @param registerId
     * @return
     */
    @DeleteMapping("/rentingHourseRegister/delete")
    R deleteRentingHouse(@RequestParam("registerId") Long registerId);

    /**
     * 获取详情-房源信息
     * @param registerId
     * @return
     */
    @GetMapping("/rentingHourseRegister/get")
    R getRentingHouse(@RequestParam("registerId") Long registerId);

    /**
     * 附近的房源
     */
    @PostMapping("/rentingHourseRegister/nearby")
    R nearby(@RequestBody NearbyDTO nearbyDTO);

    /**
     * 小程序分页获取房源信息
     * @param pageRegisterDTO
     * @return
     */
    @PostMapping("/rentingHourseRegister/houseList")
    R pageRentingHouseApplet(@RequestBody PageRentingHouseRegisterDTO pageRegisterDTO);

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @PostMapping("/rentingHourseOrder/queryAll")
    R selectRentingHourseOrderAll(@RequestBody CommonPage commonPage);

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("/rentingHourseOrder/{id}")
    R selectRentingHourseOrderOne(@PathVariable("id") Long id);

    /**
     * 新增数据
     *
     * @param rentingHourseOrder 实体对象
     * @return 新增结果
     */
    @PostMapping("/rentingHourseOrder")
    R insertRentingHourseOrder(@RequestBody RentingHourseOrderVO rentingHourseOrder);

    /**
     * 修改数据
     *
     * @param rentingHourseOrdervo 实体对象
     * @return 修改结果
     */
    @PostMapping("/rentingHourseOrder/update")
    R updateRentingHourseOrder(@RequestBody RentingHourseOrderVO rentingHourseOrdervo);

    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @GetMapping("/rentingHourseOrder/del")
    R deleteRentingHourseOrder(@RequestParam("id") Long id);

    /**
     * 支付回调处理订单状态以及房屋状态
     */
    @PostMapping("/rentingHourseOrder/wxNotify")
    R wxNotifyRentingHourseOrder(@RequestBody WxPayNotifyOrderVO wxPayNotifyOrderVO);

    /**
     * 支付付款
     */
    @PostMapping("/rentingHourseOrder/wxPay")
    R wxPayRentingHourseOrder(@RequestBody WxPayOrderVO wxPayOrderVO);

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @PostMapping("/rentingHoursePreOrder/queryAll")
    R selectAllRentingHoursePreOrder(@RequestBody CommonPage commonPage);
    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("/rentingHoursePreOrder/{id}")
    R selectOneRentingHoursePreOrder(@PathVariable("id") Long id);

    /**
     * 新增数据
     *
     * @param rentingHoursePreOrderVO 实体对象
     * @return 新增结果
     */
    @PostMapping("/rentingHoursePreOrder")
    R insertRentingHoursePreOrder(@RequestBody RentingHoursePreOrderVO rentingHoursePreOrderVO);

    /**
     * 修改数据
     *
     * @param rentingHoursePreOrderVO 实体对象
     * @return 修改结果
     */
    @PostMapping("/rentingHoursePreOrder/update")
    R updateRentingHoursePreOrder(@RequestBody RentingHoursePreOrderVO rentingHoursePreOrderVO);

    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @GetMapping("/rentingHoursePreOrder/del")
    R deleteRentingHoursePreOrder(@RequestParam("id") Long id);

    /**
     * 普通订单统计
     */
    @PostMapping("/rentingHourseOrder/statics")
    R staticsRentingHourseOrder(@RequestBody RentingHourseOrderVO rentingHourseOrderVO);

    /**
     * 定金订单统计
     */
    @PostMapping("/rentingHoursePreOrder/statics")
    R staticsRentingHoursePreOrder(@RequestBody RentingHoursePreOrderVO rentingHoursePreOrderVO);

    /**
     * 获取房屋租赁配置
     * @return
     * @param type
     */
    @GetMapping("/rentingHousesConfig/getConfig")
    R getRentingHouseConfig(@RequestParam("type") Integer type);

    @GetMapping("/rentingHourseRegister/updateAllHouseUnionAppCode")
    @Async
    void updateAllHouseUnionAppCode();

    /**
     * 西区大屏治理数据
     */
    @GetMapping("/screen/getWestScreenStatics")
    R westScreenStatics();

    /**
     * 西区大屏一标三实数据
     * @return  西区大屏一标三实数据
     */
    @GetMapping("/screen/getComprehensivePopulationStatics")
    R getComprehensivePopulationStatics(@RequestParam("streetId") Long streetId);

    @GetMapping("/screen/getComprehensiveStreetList")
    R getComprehensiveStreetList();
}