From 84b51d9bfddcc8da58823fde1b322a8168db5cff Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 27 五月 2022 09:35:23 +0800
Subject: [PATCH] bug修改
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 288 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 272 insertions(+), 16 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 9fc7cd9..0718357 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
@@ -5,7 +5,8 @@
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.acid.ComActAcidRecordDTO;
+import com.panzhihua.common.model.dtos.community.acid.*;
+import com.panzhihua.common.model.dtos.community.reserve.*;
import com.panzhihua.common.model.dtos.community.warehouse.ComActWarehouseApplyDTO;
import com.panzhihua.common.model.dtos.community.GetIdentityEidTokenDTO;
import com.panzhihua.common.model.dtos.community.*;
@@ -20,15 +21,20 @@
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.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;
import com.panzhihua.common.model.vos.community.cluster.admin.ComClusterMemberExcelVO;
import com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoMemberVO;
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.ApiOperation;
import com.panzhihua.common.model.vos.community.*;
@@ -236,18 +242,6 @@
import com.panzhihua.common.model.dtos.community.rentingHouses.ReleaseOrCancelHouseDTO;
import com.panzhihua.common.model.dtos.community.rentingHouses.RentingHouseRegisterDTO;
import com.panzhihua.common.model.dtos.community.rentingHouses.RentingHousesConfigDTO;
-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;
-import com.panzhihua.common.model.dtos.community.reserve.ComActReserveRegisterStatisticsDTO;
-import com.panzhihua.common.model.dtos.community.reserve.EditComActReserveInfoDTO;
-import com.panzhihua.common.model.dtos.community.reserve.EditComActReserveStatusDTO;
-import com.panzhihua.common.model.dtos.community.reserve.EditReserveAdminDTO;
-import com.panzhihua.common.model.dtos.community.reserve.MakeHandleAdminDTO;
-import com.panzhihua.common.model.dtos.community.reserve.PageReserveAdminDTO;
-import com.panzhihua.common.model.dtos.community.reserve.PageReserveMakeAdminDTO;
-import com.panzhihua.common.model.dtos.community.reserve.PageReserveMakeHandleAdminDTO;
-import com.panzhihua.common.model.dtos.community.reserve.PageReserveRegisterDetailedAdminDTO;
import com.panzhihua.common.model.dtos.community.switchs.SearchCommunityDTO;
import com.panzhihua.common.model.dtos.community.wallet.ComActWalletDetailDTO;
import com.panzhihua.common.model.dtos.community.wallet.ComActWalletSettlementAdminDTO;
@@ -1007,7 +1001,7 @@
* @return 类型列表
*/
@PostMapping("listbuildtype")
- R listBuildType();
+ R listBuildType(@RequestParam("communityId")Long communityId);
/**
* 分页查询 其他建筑
@@ -5027,12 +5021,19 @@
/**
* 小程序查询邻里圈话题列表
*
- * @param communityId
* 社区id
* @return 邻里圈话题列表
*/
@GetMapping("/neighbor/getNeighborTopicByApp")
- R getNeighborTopicByApp(@RequestParam("communityId") Long communityId,@RequestParam("isZero") Integer isZero,@RequestParam("name") String name);
+ R getNeighborTopicByApp(@RequestParam("name") String name);
+
+ /**
+ * 删除话题
+ * @param id
+ * @return
+ */
+ @GetMapping("/neighbor/deleteNeighborTopic")
+ R deleteNeighborTopic(@RequestParam("id") Long id);
/**
* 综治后台-查询社区列表
@@ -5919,6 +5920,26 @@
*/
@PostMapping("/neighbor/deleteNeighborByApp")
R deleteNeighborByApp(@RequestBody DeleteNeighborCircleAppDTO circleTopicAppDTO);
+
+
+ /**
+ * 分页查询邻里圈列表
+ *
+ * @param neighborCircleAppDTO
+ * 请求参数
+ * @return 邻里圈列表
+ */
+ @PostMapping("/neighbor/selectSolve")
+ R selectSolve(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO);
+
+
+ /**
+ * 修改数据
+ * @param editNeighborCircleAdminVO
+ * @return
+ */
+ @PostMapping("/neighbor/update")
+ R order(@RequestBody EditNeighborCircleAdminVO editNeighborCircleAdminVO);
/**
* 获取系统配置value
@@ -6971,6 +6992,14 @@
*/
@PostMapping("/building/house/population/delete/admin")
R deleteBuildingHousePopulationAdmin(@RequestBody DeleteBuildingHousePopulationDto housePopulationDto);
+
+ /**
+ * 删除楼栋
+ * @param id
+ * @return
+ */
+ @GetMapping("/building/delete")
+ R buildingDelete(@RequestParam("id")Long id);
/**
* 分页查询所有数据
@@ -9593,6 +9622,16 @@
@PostMapping("/comActAcidRecord/update")
R updateComActAcidRecord(@RequestBody ComActAcidRecordVO comActAcidRecordVO);
+
+ /**
+ * 小程序修改填报记录
+ *
+ * @param comActAcidRecordVO 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/comActAcidRecord/updateApplets")
+ R updateApplets(@RequestBody ComActAcidRecordVO comActAcidRecordVO);
+
/**
* 删除数据
*
@@ -9605,4 +9644,221 @@
@PostMapping("/comActAcidRecord/export")
R exportComActAcidRecord(@RequestBody ComActAcidRecordDTO comActAcidRecordDTO);
+
+ /**
+ * 5项常规统计
+ * @return
+ */
+ @GetMapping("/comActAcidRecord/fiveCount")
+ R comActAcidRecordFiveCount(@RequestParam("localCity")String localCity);
+
+ /**
+ * 7项常规统计
+ * @return
+ */
+ @GetMapping("/comActAcidRecord/fiveCountPlus")
+ R comActAcidRecordFiveCountPlus(@RequestParam("date")String date,@RequestParam("localCity")String localCity);
+
+ @GetMapping("/comActAcidRecord/statics")
+ R comActAcidRecordStatics(@RequestParam("date")String date);
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/comActReserveDangerArea/queryAll")
+ R selectAllComActReserveDangerArea(@RequestBody CommonPage commonPage);
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/comActReserveDangerArea/{id}")
+ R selectOneComActReserveDangerArea(@PathVariable("id") Long id);
+
+ /**
+ * 修改数据
+ *
+ * @param comActReserveDangerAreaVO 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/comActReserveDangerArea/update")
+ R updateComActReserveDangerArea(@RequestBody ComActReserveDangerAreaVO comActReserveDangerAreaVO);
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("/comActReserveDangerArea/del")
+ R deleteComActReserveDangerArea(@RequestParam("id") Long id);
+
+ /**
+ * 风险区数据统计
+ * @return
+ */
+ @GetMapping("/comActReserveDangerArea/statics")
+ R staticsComActReserveDangerArea();
+
+ /**
+ * 批量设置起始时间
+ * @param editDangerBatchDTO
+ * @return
+ */
+ @PostMapping("/comActReserveDangerArea/updateBatch")
+ R updateBatchComActReserveDangerArea(@RequestBody EditDangerBatchDTO editDangerBatchDTO);
+
+ @GetMapping("/comAreaTownCommunity/areaTownCommunity")
+ R areaTownCommunity(@RequestParam("name")String name,@RequestParam("userId")Long userId);
+
+ /**
+ * 物业公司详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/comProperty/detail")
+ R detailProperty(@RequestParam("id") Long id);
+
+ /**
+ * 添加物业工作人员
+ * @param propertyWorkerDTO
+ * @return
+ */
+ @PostMapping("/comPropertyWorker/add")
+ R addPropertyWorker(@RequestBody PropertyWorkerDTO propertyWorkerDTO);
+
+ /**
+ * 编辑物业工作人员
+ * @param propertyWorkerDTO
+ * @return
+ */
+ @PutMapping("/comPropertyWorker/update")
+ R updatePropertyWorker(@RequestBody PropertyWorkerDTO propertyWorkerDTO);
+
+ /**
+ * 删除物业工作人员
+ * @param id
+ * @return
+ */
+ @DeleteMapping("/comPropertyWorker/delete")
+ R deletePropertyWorker(@RequestParam("id") Long id);
+
+ /**
+ * 分页查询物业工作人员
+ * @param pagePropertyWorkerDTO
+ * @return
+ */
+ @PostMapping("/comPropertyWorker/page")
+ R pagePropertyWorker(@RequestBody PagePropertyWorkerDTO pagePropertyWorkerDTO);
+
+ /**
+ * 物业工作人员详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/comPropertyWorker/detail")
+ R detailPropertyWorker(@RequestParam("id") Long id);
+
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/comActAcidMember/queryAll")
+ R selectAllComActAcidMember(@RequestBody ComActAcidMemberDTO commonPage);
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/comActAcidMember/{id}")
+ R selectOneComActAcidMember(@PathVariable("id") Long id);
+
+ /**
+ * 新增数据
+ *
+ * @param comActAcidMemberVO 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/comActAcidMember")
+ R insertComActAcidMember(@RequestBody ComActAcidMemberVO comActAcidMemberVO);
+
+ /**
+ * 修改数据
+ *
+ * @param comActAcidMemberVO 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/comActAcidMember/update")
+ R updateComActAcidMember(@RequestBody ComActAcidMemberVO comActAcidMemberVO);
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("/comActAcidMember/del")
+ R deleteComActAcidMember(@RequestParam("id") Long id);
+
+ /**
+ * 分页查询风险人员
+ * @param pageDangerMemberDTO
+ * @return
+ */
+ @PostMapping("/comActAcidDangerMember/page")
+ R pageDangerMember(@RequestBody PageDangerMemberDTO pageDangerMemberDTO);
+
+ /**
+ * 后台分页查询风险人员
+ * @param pageDangerMemberDTO
+ * @return
+ */
+ @PostMapping("/comActAcidDangerMember/queryAll")
+ R pageDangerMemberAdmin(@RequestBody ComActAcidDangerMemberDTO pageDangerMemberDTO);
+
+ /**
+ * 列表查询
+ *
+ * @param comActAcidCheckRecordDTO 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/comActAcidCheckRecord/queryAll")
+ R selectAllComActAcidCheckRecord(@RequestBody ComActAcidCheckRecordDTO comActAcidCheckRecordDTO);
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/comActAcidCheckRecord/{id}")
+ R selectOneComActAcidCheckRecord(@PathVariable("id") Long id);
+
+ /**
+ * 新增数据
+ *
+ * @param comActAcidCheckRecordVO 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/comActAcidCheckRecord")
+ R insertComActAcidCheckRecord(@RequestBody ComActAcidCheckRecordVO comActAcidCheckRecordVO);
+
+ /**
+ * 修改数据
+ *
+ * @param comActAcidCheckRecordVO 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/comActAcidCheckRecord/update")
+ R updateComActAcidCheckRecord(@RequestBody ComActAcidCheckRecordVO comActAcidCheckRecordVO);
}
--
Gitblit v1.7.1