From fac56264f7ed00546a758162dc73abdf2f1debf2 Mon Sep 17 00:00:00 2001 From: yangzhe123 <2824096059@qq.com> Date: Thu, 11 Sep 2025 13:26:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B0=B4=E8=B5=84=E6=BA=90=E8=B0=83=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WaterDispatchController.java | 23 +++++++++++---- .../hsz/mapper/FileAssociationsMapper.java | 28 ++++++++++++++++++- .../project/hsz/model/WaterDispatch.java | 20 ++++++++++++- .../hsz/service/FileAssociationsService.java | 5 ++++ .../hsz/service/WaterDispatchService.java | 13 +++++++-- .../project/hsz/timetask/WaterRTask.java | 3 +- 6 files changed, 82 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/gunshi/project/hsz/controller/WaterDispatchController.java b/src/main/java/com/gunshi/project/hsz/controller/WaterDispatchController.java index 4610e78..122ee0e 100644 --- a/src/main/java/com/gunshi/project/hsz/controller/WaterDispatchController.java +++ b/src/main/java/com/gunshi/project/hsz/controller/WaterDispatchController.java @@ -3,6 +3,7 @@ package com.gunshi.project.hsz.controller; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gunshi.core.result.R; +import com.gunshi.core.session.entity.SessionUser; import com.gunshi.project.hsz.entity.so.WaterDispatchPageSo; import com.gunshi.project.hsz.entity.so.XlPlanPageSo; import com.gunshi.project.hsz.entity.vo.WdCountVo; @@ -16,6 +17,7 @@ import com.gunshi.project.hsz.validate.markers.Update; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletRequest; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -61,10 +63,15 @@ public class WaterDispatchController extends AbstractCommonFileController { @Operation(summary = "反馈") @PostMapping("/feedback") - public R feedback(@RequestBody WaterDispatch dto) { + public R feedback(@RequestBody WaterDispatch dto, HttpServletRequest request) { + SessionUser sessionUser = checkLogin(request); + if(sessionUser != null){ + dto.setResPerson(sessionUser.getUserId().toString()); + dto.setResPersonName(sessionUser.getUserName()); + } boolean flag = waterDispatchService.feedBack(dto); if(flag){ - fileService.saveFile(dto.getFiles(),getGroupId(),dto.getId().toString()); + fileService.saveFile(dto.getResFiles(),getResGroupId(),dto.getId().toString()); } return R.ok(dto); } @@ -89,6 +96,7 @@ public class WaterDispatchController extends AbstractCommonFileController { boolean flag = waterDispatchService.removeById(id); if(flag){ fileService.deleteFile(getGroupId(),byId.getId().toString()); + fileService.deleteFile(getResGroupId(),byId.getId().toString()); } return R.ok(true); } @@ -98,9 +106,10 @@ public class WaterDispatchController extends AbstractCommonFileController { public R> page(@RequestBody WaterDispatchPageSo pageSo) { Page res = waterDispatchService.pageQuery(pageSo); if(!CollectionUtils.isEmpty(res.getRecords())){ - res.getRecords().forEach(o -> o.setFiles( - fileService.getFiles(getGroupId(),o.getId().toString()) - )); + res.getRecords().stream().forEach(o ->{ + o.setFiles(fileService.getFiles(getGroupId(),o.getId().toString())); + o.setResFiles(fileService.getFiles2(getResGroupId(),o.getId().toString())); + }); } return R.ok(res); } @@ -116,4 +125,8 @@ public class WaterDispatchController extends AbstractCommonFileController { public String getGroupId() { return "waterDispatch"; } + + public String getResGroupId(){ + return "waterDispatchRes"; + } } diff --git a/src/main/java/com/gunshi/project/hsz/mapper/FileAssociationsMapper.java b/src/main/java/com/gunshi/project/hsz/mapper/FileAssociationsMapper.java index 0e8851e..1016ddb 100644 --- a/src/main/java/com/gunshi/project/hsz/mapper/FileAssociationsMapper.java +++ b/src/main/java/com/gunshi/project/hsz/mapper/FileAssociationsMapper.java @@ -30,11 +30,34 @@ public interface FileAssociationsMapper extends BaseMapper { fa.del = '1' AND fa.business_id = #{businessId} AND fa."table_name" = #{tableName} - AND fd.group_id = #{tableName} + AND fd.group_id = #{tableName} ORDER BY fa.tm desc """) List getFiles(@Param("tableName") String tableName,@Param("businessId") String businessId); + + @Select(""" + + """) + List getFiles2(@Param("tableName") String tableName,@Param("businessId") String businessId); + + + + @Select(""" """) List getFilesByIds(@Param("ids") List ids); + + + } \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/hsz/model/WaterDispatch.java b/src/main/java/com/gunshi/project/hsz/model/WaterDispatch.java index 2c76558..4b8bfd1 100644 --- a/src/main/java/com/gunshi/project/hsz/model/WaterDispatch.java +++ b/src/main/java/com/gunshi/project/hsz/model/WaterDispatch.java @@ -32,7 +32,7 @@ public class WaterDispatch { private Long id; - @TableField(exist = false) + @TableField("is_distribute") @Schema(description = "是否下发 0 是 1 否") private Integer isDistribute; @@ -109,6 +109,19 @@ public class WaterDispatch { @Schema(description = "执行结果反馈") private String resFb; + @TableField("res_person") + @Schema(description = "反馈人员id") + private String resPerson; + + @TableField("res_person_name") + @Schema(description = "反馈人员名称") + private String resPersonName; + + @TableField("res_tm") + @Schema(description = "反馈时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date resTm; + /** * 是否完成 0是 1否 */ @@ -122,4 +135,9 @@ public class WaterDispatch { @TableField(exist = false) @Schema(description = "文件列表") private List files; + + + @TableField(exist = false) + @Schema(description = "反馈文件列表") + private List resFiles; } \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/hsz/service/FileAssociationsService.java b/src/main/java/com/gunshi/project/hsz/service/FileAssociationsService.java index 778635f..786c164 100644 --- a/src/main/java/com/gunshi/project/hsz/service/FileAssociationsService.java +++ b/src/main/java/com/gunshi/project/hsz/service/FileAssociationsService.java @@ -210,6 +210,11 @@ public class FileAssociationsService extends ServiceImpl getFiles2(String tName, String bId) { + return this.baseMapper.getFiles2(tName,bId); + } + + @Cacheable(value = THIS_REDIS_KEY, key = "#p0 +':'+ #p1 +':'+ #p2", unless = "false") public List getFiles(String tName, String bId,String num) { return this.baseMapper.getFiles1(tName,bId,num); diff --git a/src/main/java/com/gunshi/project/hsz/service/WaterDispatchService.java b/src/main/java/com/gunshi/project/hsz/service/WaterDispatchService.java index 39220c4..282d9c0 100644 --- a/src/main/java/com/gunshi/project/hsz/service/WaterDispatchService.java +++ b/src/main/java/com/gunshi/project/hsz/service/WaterDispatchService.java @@ -41,11 +41,13 @@ public class WaterDispatchService extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.orderByDesc(StWaterRReorganize::getTm)