From a4a3f30fa1868c7c8b823a947a5cda423acce57d Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期六, 31 七月 2021 10:08:58 +0800
Subject: [PATCH] 防火防汛接口开发
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSwPatrolRecordApi.java | 79 +++++++++++++++++++++++++++++++++++----
1 files changed, 70 insertions(+), 9 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSwPatrolRecordApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSwPatrolRecordApi.java
index 5b366ee..5be004c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSwPatrolRecordApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSwPatrolRecordApi.java
@@ -1,19 +1,20 @@
package com.panzhihua.service_community.api;
-import com.panzhihua.common.model.dtos.community.ComSwDangerReportHandleDTO;
-import com.panzhihua.common.model.dtos.community.ComSwDangerReportRectifyDTO;
-import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordAddDTO;
-import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordPageDTO;
+import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComSwPatrolRecordStatisticsVO;
import com.panzhihua.service_community.dao.ComSwSafetyWorkRecordDAO;
import com.panzhihua.service_community.service.ComSwDangerReportService;
import com.panzhihua.service_community.service.ComSwPatrolRecordService;
+import com.panzhihua.service_community.service.ComSwRotaService;
import com.panzhihua.service_community.service.ComSwSafetyWorkRecordService;
+import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.Date;
import java.util.List;
/**
@@ -34,6 +35,9 @@
@Resource
private ComSwDangerReportService comSwDangerReportService;
+
+ @Resource
+ private ComSwRotaService comSwRotaService;
/**
* 分页查询巡查记录
@@ -62,9 +66,19 @@
* @param patrolRecordId 巡查记录id
* @return 巡查记录详情查询结果
*/
- @PostMapping("/detail")
+ @GetMapping("/detail")
public R detailPatrolRecord(@RequestParam(value = "patrolRecordId") Long patrolRecordId) {
return comSwPatrolRecordService.detailPatrolRecord(patrolRecordId);
+ }
+
+ /**
+ * 巡查记录统计接口
+ *
+ * @return 统计结果
+ */
+ @GetMapping("/statistics")
+ public R patrolRecordStatistics(@RequestParam(value = "communityId") Long communityId) {
+ return comSwPatrolRecordService.patrolRecordStatistics(communityId);
}
/**
@@ -83,7 +97,7 @@
* @param safetyWorkRecordId 安全工作记录
* @return 安全工作记录详情查询结果
*/
- @PostMapping("/safetyWorkRecord/detail")
+ @GetMapping("/safetyWorkRecord/detail")
public R detailSafetyWorkRecord(@RequestParam(value = "safetyWorkRecordId") Long safetyWorkRecordId) {
return comSwSafetyWorkRecordService.detailSafetyWorkRecord(safetyWorkRecordId);
}
@@ -94,7 +108,7 @@
* @param patrolRecordId 巡查记录id
* @return 安全工作记录详情查询结果
*/
- @PostMapping("/safetyWorkRecord/detailByPrId")
+ @GetMapping("/safetyWorkRecord/detailByPrId")
public R detailSafetyWorkRecordByPrId(@RequestParam(value = "patrolRecordId") Long patrolRecordId) {
return comSwSafetyWorkRecordService.detailSafetyWorkRecordByPrId(patrolRecordId);
}
@@ -115,7 +129,7 @@
* @param dangerReportId 隐患报告id
* @return 隐患报告详情查询结果
*/
- @PostMapping("/dangerReport/detail")
+ @GetMapping("/dangerReport/detail")
public R detailDangerReport(@RequestParam(value = "dangerReportId") Long dangerReportId) {
return comSwDangerReportService.detailDangerReport(dangerReportId);
}
@@ -126,7 +140,7 @@
* @param patrolRecordId 巡查记录id
* @return 隐患报告详情查询结果
*/
- @PostMapping("/dangerReport/detailByPrId")
+ @GetMapping("/dangerReport/detailByPrId")
public R detailDangerReportByPrId(@RequestParam(value = "patrolRecordId") Long patrolRecordId) {
return comSwDangerReportService.detailDangerReportByPrId(patrolRecordId);
}
@@ -164,5 +178,52 @@
return comSwDangerReportService.exportDangerReport(dangerReportIds);
}
+ /**
+ * 分页查询值班表
+ * @param comSwRotaPageDTO 查询参数
+ * @return 值班表分页集合
+ */
+ @PostMapping("/rota/page")
+ public R pageRota(@RequestBody ComSwRotaPageDTO comSwRotaPageDTO){
+ return comSwRotaService.pageRota(comSwRotaPageDTO);
+ }
+
+ /**
+ * 新增值班表
+ * @param comSwRotaSaveDTOs 新增参数
+ * @return 新增结果
+ */
+ @PostMapping("/rota/add")
+ public R addRota(@RequestBody List<ComSwRotaSaveDTO> comSwRotaSaveDTOs){
+ return comSwRotaService.addRota(comSwRotaSaveDTOs);
+ }
+
+ /**
+ * 批量删除值班表
+ * @param rotaIds 值班ids
+ * @return 删除结果
+ */
+ @PostMapping("/rota/delete")
+ public R deleteRota(@RequestBody List<Long> rotaIds){
+ return comSwRotaService.deleteRota(rotaIds);
+ }
+
+ /**
+ * 根据日期查询值班人员
+ * @return 查询结果
+ */
+ @GetMapping("/rota/getRotaPersonByDate")
+ public R getRotaPersonByDate(@RequestParam(value = "rotaDate") String rotaDate){
+ return comSwRotaService.getRotaPersonByDate(rotaDate);
+ }
+
+ /**
+ * 根据日期查询值班领导
+ * @return 查询结果
+ */
+ @GetMapping("/rota/getRotaLeaderByDate")
+ public R getRotaLeaderByDate(@RequestParam(value = "rotaDate") String rotaDate){
+ return comSwRotaService.getRotaLeaderByDate(rotaDate);
+ }
}
--
Gitblit v1.7.1