From 3b53e7f07f5ce3d8235652c22faf814fd387755f Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 17 一月 2022 14:36:47 +0800
Subject: [PATCH] 仁和社区修改
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 481 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 469 insertions(+), 12 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 0d4f02c..a0036be 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
@@ -2,7 +2,9 @@
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;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
@@ -152,6 +154,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;
@@ -310,6 +313,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;
@@ -1063,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);
/**
* 用户确认心愿
@@ -1162,7 +1170,7 @@
* @return 社区集合 按照创建顺序倒序排列
*/
@PostMapping("listcommunityall")
- R listCommunityAll();
+ R listCommunityAll(@RequestParam("areaCode")String areaCode);
/**
* 首页广告banner
@@ -3320,7 +3328,7 @@
* @date 2021/8/31 15:03
*/
@GetMapping("/workGuide/classify/getList")
- R getWorkGuideClassifyList();
+ R getWorkGuideClassifyList(@RequestParam("areaCode")String areaCode);
/**
* 分页查询邻里圈
@@ -4933,7 +4941,7 @@
* @return 社区列表
*/
@GetMapping("/eventgrid/community/westList")
- R getWestCommunityLists();
+ R getWestCommunityLists(String areaCode);
/**
* 综治app-小区列表
@@ -5296,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);
@@ -5388,7 +5396,7 @@
* @return 社区列表
*/
@GetMapping("/switch/community/all/list")
- R communitySwitchList();
+ R communitySwitchList(@RequestParam("areaCode") String areaCode);
/**
* 根据名字查询所有社区列表
@@ -5398,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);
/**
* 根据经纬度以及距离搜索附近社区列表
@@ -7200,6 +7208,14 @@
R pageRegisterHomeQuarantine(PageReserveRegisterDetailedAdminDTO detailedAdminDTO);
/**
+ * 居家隔离导出
+ * @param pageReserveRegisterDetailedAdminDTO
+ * @return
+ */
+ @PostMapping("/reserve/admin/homeQuarantine/export")
+ R exportHomeQuarantine(@RequestBody PageReserveRegisterDetailedAdminDTO pageReserveRegisterDetailedAdminDTO);
+
+ /**
* 分页查询物业宣传
* @param pageComPropertyPublicityDTO
* @return
@@ -7266,10 +7282,451 @@
R incrPropertyPublicityView(@RequestParam("id") Long id);
/**
- * 居家隔离导出
- * @param pageReserveRegisterDetailedAdminDTO
+ * 获取预设图片
+ * @param type
+ * @param subtype
* @return
*/
- @PostMapping("/reserve/admin/homeQuarantine/export")
- R exportHomeQuarantine(@RequestBody PageReserveRegisterDetailedAdminDTO pageReserveRegisterDetailedAdminDTO);
+ @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 pageBigScreenStatisticPartyOrg
+ * @return
+ */
+ @PostMapping("/bigscreen/party/partyActivityTop")
+ R partyActivityTop(@RequestBody PageBigScreenStatisticPartyOrg pageBigScreenStatisticPartyOrg);
+
+ /**
+ * 社区服务大屏数据分析接口
+ */
+ @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 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);
}
--
Gitblit v1.7.1