From a4a2ff45a260e11c1666bb860eb2ee35a25463cd Mon Sep 17 00:00:00 2001 From: yangzhe123 <2824096059@qq.com> Date: Fri, 5 Sep 2025 15:38:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B4=E5=88=A9=E8=AE=A1=E5=88=92-=E6=B0=B4?= =?UTF-8?q?=E9=87=8F=E8=B0=83=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WaterDispatchController.java | 4 +-- .../hsz/controller/XlPlanController.java | 2 +- .../project/hsz/model/WaterDispatch.java | 3 +-- .../service/WaterCountAnalysisService.java | 7 +++--- .../hsz/service/WaterDispatchService.java | 25 ++++++++++++++++--- 5 files changed, 30 insertions(+), 11 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 59b56c6..df94518 100644 --- a/src/main/java/com/gunshi/project/hsz/controller/WaterDispatchController.java +++ b/src/main/java/com/gunshi/project/hsz/controller/WaterDispatchController.java @@ -58,8 +58,8 @@ public class WaterDispatchController extends AbstractCommonFileController { } @Operation(summary = "反馈") - @PostMapping("feedback") - public R feedback(@Validated(Update.class) @RequestBody WaterDispatch dto) { + @PostMapping("/feedback") + public R feedback(@RequestBody WaterDispatch dto) { boolean flag = waterDispatchService.feedBack(dto); if(flag){ fileService.saveFile(dto.getFiles(),getGroupId(),dto.getId().toString()); diff --git a/src/main/java/com/gunshi/project/hsz/controller/XlPlanController.java b/src/main/java/com/gunshi/project/hsz/controller/XlPlanController.java index 217320f..01bc99c 100644 --- a/src/main/java/com/gunshi/project/hsz/controller/XlPlanController.java +++ b/src/main/java/com/gunshi/project/hsz/controller/XlPlanController.java @@ -84,7 +84,7 @@ public class XlPlanController extends AbstractCommonFileController { @Operation(summary = "列表") @GetMapping("/list") - public R> list(@RequestBody XlPlanPageSo pageSo) { + public R> list() { List list = xlPlanService.lambdaQuery().list(); if(!CollectionUtils.isEmpty(list)){ list.forEach(o -> o.setFiles(fileService.getFiles(getGroupId(),o.getId().toString()))); 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 2e0c08d..2c76558 100644 --- a/src/main/java/com/gunshi/project/hsz/model/WaterDispatch.java +++ b/src/main/java/com/gunshi/project/hsz/model/WaterDispatch.java @@ -107,8 +107,7 @@ public class WaterDispatch { */ @TableField("res_fb") @Schema(description = "执行结果反馈") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date resFb; + private String resFb; /** * 是否完成 0是 1否 diff --git a/src/main/java/com/gunshi/project/hsz/service/WaterCountAnalysisService.java b/src/main/java/com/gunshi/project/hsz/service/WaterCountAnalysisService.java index 82da904..37e7e79 100644 --- a/src/main/java/com/gunshi/project/hsz/service/WaterCountAnalysisService.java +++ b/src/main/java/com/gunshi/project/hsz/service/WaterCountAnalysisService.java @@ -39,7 +39,7 @@ public class WaterCountAnalysisService { private StZvarlBService stZvarlBService;//水位-库容 @Autowired - private StRsvrRService stRsvrRService; + private StRsvrRService stRsvrRService;//水库历史水位 public List waterSupplyAnalysis(Serializable id) { @@ -78,8 +78,9 @@ public class WaterCountAnalysisService { } public List waterDispatchAnalysis(Serializable year) { - List list = waterDispatchService.listByYear(year.toString()); - return list; + return waterDispatchService.lambdaQuery().apply("EXTRACT(YEAR FROM dis_start) = {0}", year) + .in(WaterDispatch::getExeStatus, 0, 2) + .list(); } public List waterCapacityAnalysis(DateRangeSo dateRangeSo){ 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 ae7ea26..21864c7 100644 --- a/src/main/java/com/gunshi/project/hsz/service/WaterDispatchService.java +++ b/src/main/java/com/gunshi/project/hsz/service/WaterDispatchService.java @@ -2,16 +2,21 @@ package com.gunshi.project.hsz.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.gunshi.project.hsz.entity.so.WaterDispatchPageSo; import com.gunshi.project.hsz.mapper.WaterDispatchMapper; import com.gunshi.project.hsz.model.WaterDispatch; +import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.system.mapper.SysUserMapper; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.Date; import java.util.List; import java.util.Objects; @@ -19,6 +24,10 @@ import java.util.Objects; @Slf4j @Transactional(rollbackFor = Exception.class) public class WaterDispatchService extends ServiceImpl { + + @Autowired + private SysUserMapper sysUserMapper; + public boolean saveData(WaterDispatch dto) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(WaterDispatch::getName, dto.getName()); @@ -26,6 +35,12 @@ public class WaterDispatchService extends ServiceImpl listByYear(String year) { - return this.lambdaQuery().eq(WaterDispatch::getDisYear, year).in(WaterDispatch::getExeStatus,0,2).list(); - } }