From a8bb61ea692006fc3ad8747c0ac0832c7ec8f3be Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期四, 29 七月 2021 18:01:18 +0800
Subject: [PATCH] 防火防汛接口开发
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 233 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 228 insertions(+), 5 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 4315f2a..e4986ac 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
@@ -42,6 +42,7 @@
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
import com.panzhihua.common.model.vos.user.UserElectronicFileVO;
import com.panzhihua.common.model.vos.user.UserPhoneVO;
+import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
@@ -117,7 +118,16 @@
* @return 详情
*/
@PostMapping("detailactivity")
- R detailActivity(@RequestParam("id") Long id, @RequestParam("userId") Long userId);
+ R detailActivity(@RequestParam("id") Long id, @RequestParam(value = "userId",required = false) Long userId);
+
+ /**
+ * 分页活动报名名单
+ *
+ * @param activitySignVO 查询参数
+ * @return 报名人员集合
+ */
+ @PostMapping("listactivitysign")
+ R listActivitySign(@RequestBody ActivitySignVO activitySignVO);
/**
* 活动报名名单
@@ -125,8 +135,8 @@
* @param activitySignVO 查询参数
* @return 报名人员集合
*/
- @PostMapping("listactivitysign")
- R listActivitySign(@RequestBody ActivitySignVO activitySignVO);
+ @PostMapping("listactivitysigns")
+ R listActivitySigns(@RequestBody ActivitySignVO activitySignVO);
/**
* 新增社区动态
@@ -1433,7 +1443,7 @@
* @return
*/
@PostMapping("/common/data/car/export")
- R exportRealCar(ExportComMngCarExcelDTO exportComMngCarExcelDTO);
+ R exportRealCar(@RequestBody ExportComMngCarExcelDTO exportComMngCarExcelDTO);
/**
* 社区后台实有单位管理列表
@@ -1443,6 +1453,15 @@
*/
@PostMapping("/common/data/company/page")
R pageQueryComMngRealCompany(@RequestBody PageComMngRealCompanyDTO pageComMngRealCompanyDTO);
+
+ /**
+ * 社区后台实有单位统计
+ *
+ * @param communityId 社区id
+ * @return 统计结果
+ */
+ @PostMapping("/common/data/company/statistics")
+ R getComMngRealCompanyTotalByAdmin(@RequestParam("communityId") Long communityId);
/**
* 社区后台添加修改实有单位
@@ -1649,6 +1668,15 @@
R listVillage(ComMngVillageVO comMngVillageVO);
/**
+ * 根据房屋id查询实有房屋
+ *
+ * @param villageId 查询条件
+ * @return 查询结果
+ */
+ @PostMapping("/getVillageById")
+ R getVillageById(@RequestParam(value = "villageId")Long villageId);
+
+ /**
* 批量导入实有房屋
*
* @param list 实有房屋数据
@@ -1742,6 +1770,15 @@
*/
@PostMapping("/common/data/population/getList")
R getPopulationLists(@RequestBody List<Long> Ids);
+
+ /**
+ * 根据小区id查询实有人口
+ *
+ * @param villageId 小区id
+ * @return 查询结果
+ */
+ @PostMapping("/common/data/population/getListByVillageId")
+ R getPopulationListByVillageId(@RequestParam("villageId") Long villageId);
/**
* 创建调查问卷
@@ -2333,7 +2370,7 @@
* @return 详情
*/
@GetMapping("/detailworkguide")
- R detailWorkGuide(@RequestParam("workGuideId") Long workGuideId);
+ R detailWorkGuide(@RequestParam("workGuideId") Long workGuideId, @RequestParam("conmunityId") Long conmunityId);
/**
* 办事指南_分页
@@ -3617,4 +3654,190 @@
*/
@GetMapping("/eventgrid/community/list")
R getCommunityLists();
+
+ /**
+ * 分页查询退役军人列表
+ *
+ * @param comExServicemanDTO 请求参数
+ * @return 退役军人列表
+ */
+ @PostMapping("/population/page/exServiceman")
+ R pageExServiceman(@RequestBody ComExServicemanDTO comExServicemanDTO);
+
+ /**
+ * 分页查询社区动态分类列表
+ * @param comActDynTypeDTO 请求参数
+ * @return 动态分类列表
+ */
+ @PostMapping("/dyn/type/page")
+ R pageDynTypeByAdmin(@RequestBody PageComActDynTypeDTO comActDynTypeDTO);
+
+ /**
+ * 查询社区下所有动态分类列表
+ * @param comActDynTypeDTO 请求参数
+ * @return 动态分类列表
+ */
+ @PostMapping("/dyn/type/list")
+ R getDynTypeListByAdmin(@RequestBody PageComActDynTypeDTO comActDynTypeDTO);
+
+ /**
+ * 添加社区动态分类
+ * @param comActDynTypeDTO 请求参数
+ * @return 添加结果
+ */
+ @PostMapping("/dyn/type/add")
+ R addDynTypeByAdmin(@RequestBody AddComActDynTypeDTO comActDynTypeDTO);
+
+ /**
+ * 编辑社区动态分类
+ * @param comActDynTypeDTO 请求参数
+ * @return 编辑结果
+ */
+ @PostMapping("/dyn/type/edit")
+ R editDynTypeByAdmin(@RequestBody EditComActDynTypeDTO comActDynTypeDTO);
+
+ /**
+ * 删除社区动态分类
+ * @param ids 社区动态分类id集合
+ * @return 删除结果
+ */
+ @PostMapping("/dyn/type/delete")
+ R deleteDynTypeByAdmin(@RequestBody List<Long> ids);
+
+ /**
+ * 随手拍发放奖励
+ * @param grantRewardDTO 请求参数
+ * @return 发放结果
+ */
+ @PostMapping("/easyphoto/grantReward")
+ R grantReward(@RequestBody GrantRewardDTO grantRewardDTO);
+
+ /**
+ * 获取最新活动和用户最新收益
+ * @param userId 用户id
+ * @param communityId 社区id
+ * @return 最新活动和用户最新收益
+ */
+ @PostMapping("/easyphoto/getUserReward")
+ R getUserReward(@RequestParam("userId") Long userId,@RequestParam("communityId") Long communityId);
+
+ /**
+ * 读取用户随手拍奖励
+ * @param userId 用户id
+ * @return 读取结果
+ */
+ @PostMapping("/easyphoto/readUserReward")
+ R readUserReward(@RequestParam("userId") Long userId,@RequestParam("communityId") Long communityId);
+
+ /**
+ * 分页查询巡查记录
+ * @param comSwPatrolRecordPageDTO 查询参数
+ * @return 分页集合
+ */
+ @PostMapping("/patrolRecord/page")
+ R pagePatrolRecord(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO);
+
+ /**
+ * 新增巡查记录
+ * @param comSwPatrolRecordAddDTO 新增参数
+ * @return 新增结果
+ */
+ @PostMapping("/patrolRecord/addPatrolRecord")
+ R addPatrolRecord(@RequestBody ComSwPatrolRecordAddDTO comSwPatrolRecordAddDTO);
+
+ /**
+ * 根据巡查记录id查询详情
+ *
+ * @param patrolRecordId 巡查记录id
+ * @return 巡查记录详情查询结果
+ */
+ @PostMapping("/patrolRecord/detail")
+ R detailPatrolRecord(@RequestParam("patrolRecordId") Long patrolRecordId);
+
+ /**
+ * 分页查询安全工作记录
+ * @param comSwPatrolRecordPageDTO 查询参数
+ * @return 安全工作记录分页集合
+ */
+ @PostMapping("/patrolRecord/safetyWorkRecord/page")
+ R pageSafetyWorkRecord(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO);
+
+ /**
+ * 根据安全工作记录id查询详情
+ *
+ * @param safetyWorkRecordId 安全工作记录
+ * @return 安全工作记录详情查询结果
+ */
+ @PostMapping("/patrolRecord/safetyWorkRecord/detail")
+ R detailSafetyWorkRecord(@RequestParam(value = "safetyWorkRecordId") Long safetyWorkRecordId);
+
+ /**
+ * 根据巡查记录id查询安全工作记录详情
+ *
+ * @param patrolRecordId 巡查记录id
+ * @return 安全工作记录详情查询结果
+ */
+ @PostMapping("/patrolRecord/safetyWorkRecord/detailByPrId")
+ R detailSafetyWorkRecordByPrId(@RequestParam(value = "patrolRecordId") Long patrolRecordId);
+
+ /**
+ * 分页查询隐患报告
+ * @param comSwPatrolRecordPageDTO 查询参数
+ * @return 隐患报告分页集合
+ */
+ @PostMapping("/patrolRecord/dangerReport/page")
+ R pageDangerReport(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO);
+
+ /**
+ * 根据隐患报告id查询详情
+ *
+ * @param dangerReportId 隐患报告id
+ * @return 隐患报告详情查询结果
+ */
+ @PostMapping("/patrolRecord/dangerReport/detail")
+ R detailDangerReport(@RequestParam(value = "dangerReportId") Long dangerReportId);
+
+ /**
+ * 根据巡查记录id查询隐患报告详情
+ *
+ * @param patrolRecordId 巡查记录id
+ * @return 隐患报告详情查询结果
+ */
+ @PostMapping("/patrolRecord/dangerReport/detailByPrId")
+ R detailDangerReportByPrId(@RequestParam(value = "patrolRecordId") Long patrolRecordId);
+
+ /**
+ * 处理隐患报告
+ *
+ * @param comSwDangerReportHandleDTO 隐患报告处理参数
+ * @return 处理结果
+ */
+ @PostMapping("/patrolRecord/dangerReport/handle")
+ R handleDangerReport(@RequestBody ComSwDangerReportHandleDTO comSwDangerReportHandleDTO);
+
+ /**
+ * 整改隐患报告
+ *
+ * @param comSwDangerReportRectifyDTO 隐患报告整改参数
+ * @return 整改结果
+ */
+ @PostMapping("/patrolRecord/dangerReport/rectify")
+ R rectifyDangerReport(@RequestBody ComSwDangerReportRectifyDTO comSwDangerReportRectifyDTO);
+
+ /**
+ * 隐患报告台账导出
+ *
+ * @param dangerReportIds
+ * @return
+ */
+ @PostMapping("/patrolRecord/dangerReport/export")
+ R exportDangerReport(@RequestBody List<Long> dangerReportIds);
+
+ /**
+ * 巡查记录统计接口
+ *
+ * @return 统计结果
+ */
+ @PostMapping("/patrolRecord/statistics")
+ R patrolRecordStatistics(@RequestParam(value = "communityId") Long communityId);
}
--
Gitblit v1.7.1