From 179c4d64313c9b7572778da4aaaf6c6584fe457d Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 20 五月 2025 23:48:08 +0800
Subject: [PATCH] 修改文件上传类型限制
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComSwPatrolRecordApi.java | 118 ++++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 88 insertions(+), 30 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComSwPatrolRecordApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComSwPatrolRecordApi.java
index 025af16..9e0e17e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComSwPatrolRecordApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComSwPatrolRecordApi.java
@@ -1,5 +1,9 @@
package com.panzhihua.applets.api;
+import javax.annotation.Resource;
+
+import org.springframework.web.bind.annotation.*;
+
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.ComSwDangerReportRectifyDTO;
import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordAddDTO;
@@ -9,12 +13,11 @@
import com.panzhihua.common.model.vos.community.ComSwPatrolRecordVO;
import com.panzhihua.common.model.vos.community.ComSwSafetyWorkRecordVO;
import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.service.partybuilding.PartyBuildingService;
+
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
/**
* @auther txb
@@ -30,55 +33,67 @@
@Resource
private CommunityService communityService;
+ @Resource
+ private PartyBuildingService partyBuildingService;
+
/**
* 分页查询巡查记录
- * @param comSwPatrolRecordPageDTO 查询参数
+ *
+ * @param comSwPatrolRecordPageDTO
+ * 查询参数
* @return 分页集合
*/
@ApiOperation(value = "分页查询巡查记录", response = ComSwPatrolRecordVO.class)
- @PostMapping("/pagePatrolRecord")
- public R pagePatrolRecord(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO){
+ @PostMapping("/app/pagePatrolRecord")
+ public R pagePatrolRecord(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO) {
Long communityId = this.getCommunityId();
- if (comSwPatrolRecordPageDTO.getSelectPerson().equals(1)) {
- comSwPatrolRecordPageDTO.setPatrolPerson(String.valueOf(this.getLoginUserInfo().getUserId()));
+ if (!comSwPatrolRecordPageDTO.getSelectPerson().equals(1)) {
+ comSwPatrolRecordPageDTO.setPatrolPerson(String.valueOf(this.getLoginUserInfo().getPhone()));
}
comSwPatrolRecordPageDTO.setCommunityId(communityId);
+ comSwPatrolRecordPageDTO.setAreaCode(this.getAreaCode());
return communityService.pagePatrolRecord(comSwPatrolRecordPageDTO);
}
/**
* 新增巡查记录
- * @param comSwPatrolRecordAddDTO 新增参数
+ *
+ * @param comSwPatrolRecordAddDTO
+ * 新增参数
* @return 新增结果
*/
@ApiOperation(value = "新增巡查记录")
- @PostMapping("/addPatrolRecord")
- public R addPatrolRecord(@RequestBody ComSwPatrolRecordAddDTO comSwPatrolRecordAddDTO){
+ @PostMapping("/app/addPatrolRecord")
+ public R addPatrolRecord(@RequestBody ComSwPatrolRecordAddDTO comSwPatrolRecordAddDTO) {
Long communityId = this.getCommunityId();
comSwPatrolRecordAddDTO.setCommunityId(communityId);
+ comSwPatrolRecordAddDTO.setCreateBy(this.getUserId());
return communityService.addPatrolRecord(comSwPatrolRecordAddDTO);
}
/**
* 根据巡查记录id查询详情
*
- * @param patrolRecordId 巡查记录id
+ * @param patrolRecordId
+ * 巡查记录id
* @return 巡查记录详情查询结果
*/
@ApiOperation(value = "根据巡查记录id查询详情", response = ComSwPatrolRecordVO.class)
- @PostMapping("/detailPatrolRecord")
+ @GetMapping("/app/detailPatrolRecord")
public R detailPatrolRecord(@RequestParam(value = "patrolRecordId") Long patrolRecordId) {
return communityService.detailPatrolRecord(patrolRecordId);
}
/**
* 分页查询安全工作记录
- * @param comSwPatrolRecordPageDTO 查询参数
+ *
+ * @param comSwPatrolRecordPageDTO
+ * 查询参数
* @return 安全工作记录分页集合
*/
@ApiOperation(value = "分页查询安全工作记录", response = ComSwSafetyWorkRecordVO.class)
- @PostMapping("/pageSafetyWorkRecord")
- public R pageSafetyWorkRecord(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO){
+ @PostMapping("/app/pageSafetyWorkRecord")
+ public R pageSafetyWorkRecord(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO) {
Long communityId = this.getCommunityId();
comSwPatrolRecordPageDTO.setCommunityId(communityId);
return communityService.pageSafetyWorkRecord(comSwPatrolRecordPageDTO);
@@ -87,36 +102,42 @@
/**
* 根据安全工作记录id查询详情
*
- * @param safetyWorkRecordId 安全工作记录
+ * @param safetyWorkRecordId
+ * 安全工作记录
* @return 安全工作记录详情查询结果
*/
@ApiOperation(value = "根据安全工作记录id查询详情", response = ComSwSafetyWorkRecordVO.class)
- @PostMapping("/detailSafetyWorkRecord")
+ @GetMapping("/app/detailSafetyWorkRecord")
public R detailSafetyWorkRecord(@RequestParam(value = "safetyWorkRecordId") Long safetyWorkRecordId) {
- return communityService.detailSafetyWorkRecord(safetyWorkRecordId);
+ Long communityId = this.getLoginUserInfo().getCommunityId();
+ return communityService.detailSafetyWorkRecord(safetyWorkRecordId, communityId);
}
/**
* 分页查询隐患报告
- * @param comSwPatrolRecordPageDTO 查询参数
+ *
+ * @param comSwPatrolRecordPageDTO
+ * 查询参数
* @return 隐患报告分页集合
*/
@ApiOperation(value = "分页查询隐患报告", response = ComSwDangerReportVO.class)
- @PostMapping("/pageDangerReport")
- public R pageDangerReport(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO){
+ @PostMapping("/app/pageDangerReport")
+ public R pageDangerReport(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO) {
Long communityId = this.getCommunityId();
comSwPatrolRecordPageDTO.setCommunityId(communityId);
+ comSwPatrolRecordPageDTO.setAreaCode(this.getAreaCode());
return communityService.pageDangerReport(comSwPatrolRecordPageDTO);
}
/**
* 根据隐患报告id查询详情
*
- * @param dangerReportId 隐患报告id
+ * @param dangerReportId
+ * 隐患报告id
* @return 隐患报告详情查询结果
*/
@ApiOperation(value = "根据隐患报告id查询详情", response = ComSwDangerReportVO.class)
- @PostMapping("/detailDangerReport")
+ @GetMapping("/app/detailDangerReport")
public R detailDangerReport(@RequestParam(value = "dangerReportId") Long dangerReportId) {
return communityService.detailDangerReport(dangerReportId);
}
@@ -124,11 +145,12 @@
/**
* 根据巡查记录id查询隐患报告详情
*
- * @param patrolRecordId 巡查记录id
+ * @param patrolRecordId
+ * 巡查记录id
* @return 隐患报告详情查询结果
*/
@ApiOperation(value = "根据巡查记录id查询隐患报告详情", response = ComSwDangerReportVO.class)
- @PostMapping("/detailDangerReportByPrId")
+ @GetMapping("/app/detailDangerReportByPrId")
public R detailDangerReportByPrId(@RequestParam(value = "patrolRecordId") Long patrolRecordId) {
return communityService.detailDangerReportByPrId(patrolRecordId);
}
@@ -136,14 +158,50 @@
/**
* 整改隐患报告
*
- * @param comSwDangerReportRectifyDTO 隐患报告整改参数
+ * @param comSwDangerReportRectifyDTO
+ * 隐患报告整改参数
* @return 整改结果
*/
@ApiOperation(value = "整改隐患报告")
- @PostMapping("/rectifyDangerReport")
- public R rectifyDangerReport(@RequestBody ComSwDangerReportRectifyDTO comSwDangerReportRectifyDTO){
+ @PostMapping("/app/rectifyDangerReport")
+ public R rectifyDangerReport(@RequestBody ComSwDangerReportRectifyDTO comSwDangerReportRectifyDTO) {
return communityService.rectifyDangerReport(comSwDangerReportRectifyDTO);
}
-}
+ /**
+ * 根据日期查询值班人员
+ *
+ * @return 查询结果
+ */
+ @ApiOperation(value = "根据日期查询值班人员")
+ @GetMapping("/app/getRotaPersonByDate")
+ public R getRotaPersonByDate(@RequestParam(value = "rotaDate") String rotaDate) {
+ return communityService.getRotaPersonByDate(rotaDate,this.getCommunityId());
+ }
+ /**
+ * 根据日期查询值班领导
+ *
+ * @return 查询结果
+ */
+ @ApiOperation(value = "根据日期查询值班领导")
+ @GetMapping("/app/getRotaLeaderByDate")
+ public R getRotaLeaderByDate(@RequestParam(value = "rotaDate") String rotaDate) {
+ return communityService.getRotaLeaderByDate(rotaDate,this.getCommunityId());
+ }
+
+ /**
+ * 选择人员
+ *
+ * @param param
+ * 查询条件
+ * @return 查询结果
+ */
+ @ApiOperation(value = "选择人员")
+ @PostMapping("/app/getTotlePerson")
+ public R getTotlePerson(@RequestParam(value = "param", required = false) String param) {
+ Long communityId = this.getLoginUserInfo().getCommunityId();
+ return partyBuildingService.getTotlePerson(param, communityId);
+ }
+
+}
--
Gitblit v1.7.1