From 75206d4e4ecd2a7789a21362b85906463d3f2c3d Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 27 十二月 2021 10:08:13 +0800
Subject: [PATCH] Merge branch 'master' into hemenkou_dev
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 731 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 722 insertions(+), 9 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index abfe3f6..32613ff 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -3,6 +3,7 @@
import java.io.Serializable;
import java.util.List;
+import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.dtos.civil.*;
import com.panzhihua.common.model.dtos.community.warehouse.ComActWarehouseApplyDTO;
import com.panzhihua.common.model.dtos.community.GetIdentityEidTokenDTO;
@@ -25,6 +26,7 @@
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;
@@ -63,6 +65,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;
@@ -104,6 +107,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;
@@ -124,6 +128,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;
@@ -165,6 +176,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;
@@ -183,6 +195,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;
@@ -250,7 +263,10 @@
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;
import com.panzhihua.common.model.vos.community.ComActCommiteeVO;
import com.panzhihua.common.model.vos.community.ComActDynVO;
import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
@@ -302,6 +318,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;
@@ -313,6 +330,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;
@@ -1066,10 +1087,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);
/**
* 用户确认心愿
@@ -2497,6 +2519,12 @@
R pagePopulation(ComMngPopulationDTO comMngPopulationVO);
/**
+ * 根据身份证查询实有人口信息
+ */
+ @GetMapping("/common/data/population/selectByIdCard")
+ R selectByIdCard(@RequestParam("idCard") String idCard);
+
+ /**
* 根据id实有人口详细信息
*
* @param populationId
@@ -3835,6 +3863,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 查询结果
@@ -4916,6 +4953,22 @@
R getCommunityLists();
/**
+ * 查询西区社区列表
+ *
+ * @return 社区列表
+ */
+ @GetMapping("/eventgrid/community/westList")
+ R getWestCommunityLists();
+
+ /**
+ * 综治app-小区列表
+ * @param villageListAppDTO 请求参数
+ * @return 小区列表
+ */
+ @PostMapping("/village/grid/list/app")
+ R getGridVillageListApp(@RequestBody ComMngVillageListAppDTO villageListAppDTO);
+
+ /**
* 分页查询退役军人列表
*
* @param comExServicemanDTO
@@ -5268,11 +5321,11 @@
R addIntegralTradeAdmin(@RequestBody AddComActIntegralUserDTO integralUserDTO);
/**
- * 根据社区活动id查询社区活动报名人员列表
+ * 根据社区活动id查询社区活动报名且未参与人员列表
*
* @param activityId
* 活动id
- * @return 社区活动报名人员列表
+ * @return 社区活动报名且未参与人员列表
*/
@PostMapping("/integral/act/activity/admin")
R getTaskActivityPeopleList(@RequestParam("activityId") Long activityId);
@@ -5323,7 +5376,7 @@
* @return 查询结果
*/
@GetMapping("/patrolRecord/rota/getRotaPersonByDate")
- R getRotaPersonByDate(@RequestParam(value = "rotaDate") String rotaDate);
+ R getRotaPersonByDate(@RequestParam(value = "rotaDate") String rotaDate,@RequestParam("communityId")Long communityId);
/**
* 根据日期查询值班领导
@@ -5331,7 +5384,7 @@
* @return 查询结果
*/
@GetMapping("/patrolRecord/rota/getRotaLeaderByDate")
- R getRotaLeaderByDate(@RequestParam(value = "rotaDate") String rotaDate);
+ R getRotaLeaderByDate(@RequestParam(value = "rotaDate") String rotaDate,@RequestParam("communityId")Long communityId);
/**
* 批量导入值班表
@@ -5496,6 +5549,8 @@
@PostMapping("/reserve/commit")
R reserveCommit(@RequestBody ComActReserveCommitVO comActReserveCommitVO);
+ @PostMapping("/reserve/commitNoToken")
+ R reserveCommitNoToken(@RequestBody ComActReserveCommitVO comActReserveCommitVO);
/**
* 我的预约/登记
* @param pageUserReserveDTO
@@ -5670,11 +5725,12 @@
/**
* 导出登记明细数据
- * @param reserveId 登记id
- * @return 登记明细数据
+ *
+ * @param pageReserveRegisterDetailedAdminDTO
+ * @return 登记明细数据
*/
- @GetMapping("/reserve/admin/register/list/export")
- R exportRegisterAdmin(@RequestParam("reserveId") Long reserveId);
+ @PostMapping("/reserve/admin/register/list/export")
+ R exportRegisterAdmin(@RequestBody PageReserveRegisterDetailedAdminDTO pageReserveRegisterDetailedAdminDTO);
/**
* 查询预约登记题目列表
@@ -6979,6 +7035,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 实有房屋数据修复定时任务
*/
@@ -6986,6 +7058,647 @@
R timedTaskHouseJobHandler();
/**
+ * 导出特殊群体
+ *
+ * @param pageInputUserDTO 请求参数
+ * @return 特殊群体列表
+ */
+ @PostMapping("common/data/special/export")
+ R specialInputUserExport(@RequestBody PageInputUserDTO pageInputUserDTO);
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/comActAnnouncement/queryAll")
+ R comActAnnouncementSelectAll(@RequestBody CommonPage commonPage);
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/comActAnnouncement/{id}")
+ R comActAnnouncementSelectOne(@PathVariable("id") Long id);
+
+ /**
+ * 新增数据
+ *
+ * @param comActAnnouncementVO 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/comActAnnouncement")
+ R comActAnnouncementInsert(@RequestBody ComActAnnouncementVO comActAnnouncementVO);
+
+ /**
+ * 修改数据
+ *
+ * @param comActAnnouncementVO 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/comActAnnouncement/update")
+ R comActAnnouncementUpdate(@RequestBody ComActAnnouncementVO comActAnnouncementVO);
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("/comActAnnouncement/del")
+ R comActAnnouncementDelete(@RequestParam("id") Long id);
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/comActColumn/queryAll")
+ R comActColumnSelectAll(@RequestBody CommonPage commonPage);
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/comActColumn/{id}")
+ R comActColumnSelectOne(@PathVariable("id") Long id);
+
+ /**
+ * 新增数据
+ *
+ * @param comActColumn 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/comActColumn")
+ R comActColumnInsert(@RequestBody ComActColumnVO comActColumn);
+
+ /**
+ * 修改数据
+ *
+ * @param comActColumn 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/comActColumn/update")
+ R comActColumnUpdate(@RequestBody ComActColumnVO comActColumn);
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("/comActColumn/del")
+ R comActColumnDelete(@RequestParam("id") Long id);
+
+ /**
+ * 高龄认证添加
+ *
+ * @param comElderAuthRecordVO
+ * @return
+ */
+ @PostMapping("/elders/authRecord/add")
+ R addAuthRecord(@RequestBody ComElderAuthRecordVO comElderAuthRecordVO);
+
+ /**
+ * 养老认证添加
+ *
+ * @param comElderAuthRecordVO
+ * @return
+ */
+ @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);
+
+ /**
+ * 分页查询居家隔离统计
+ * @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();
+
+ /**
+ * 通过社区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
+ */
+ @GetMapping("/bigscreen/party/partyActivityLine")
+ R partyActivityLine(@RequestParam("communityId")Long communityId);
+
+ /**
+ * 党员积分前3
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/bigscreen/party/partyActivityTop")
+ R partyActivityTop(@RequestParam("communityId")Long communityId);
+
+ /**
+ * 社区服务大屏数据分析接口
+ */
+ @GetMapping("/screen/serviceData")
+ R serviceData(@RequestParam("communityId")Long communityId);
+
+ /**
+ * 服务居民接口
+ */
+ @GetMapping("/screen/serviceUser")
+ R serviceUser(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 大数据分析平台-居民自治
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/resident/autonomy")
+ R getResidentAutonomy(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 大数据分析平台-清网治格
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/grids/governance")
+ R getGridsGovernance(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 大数据分析平台-社区服务
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/community/service")
+ R getCommunityServiceStatistics(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 分页获取热度排行商家
+ * @param pagePopularMerchantDTO
+ * @return
+ */
+ @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 commonPage 查询实体
--
Gitblit v1.7.1