From 2c7d6db898705a26274d93b703156d1446edad3d Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 13 四月 2022 14:06:18 +0800
Subject: [PATCH] Merge branch 'huacheng' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java |   65 ++++++++++++++++++++++++++------
 1 files changed, 53 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 9fc7cd9..af7bcfd 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
@@ -6,6 +6,7 @@
 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.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.*;
@@ -29,6 +30,7 @@
 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 +238,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;
@@ -9605,4 +9595,55 @@
     @PostMapping("/comActAcidRecord/export")
     R exportComActAcidRecord(@RequestBody ComActAcidRecordDTO comActAcidRecordDTO);
 
+
+    /**
+     * 分页查询所有数据
+     *
+     * @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);
 }

--
Gitblit v1.7.1