From db2ca61f839a0b15bc7821bbabfb3f3267811a23 Mon Sep 17 00:00:00 2001 From: yangzhe123 <2824096059@qq.com> Date: Mon, 8 Sep 2025 15:43:17 +0800 Subject: [PATCH] =?UTF-8?q?1=20=E7=99=BD=E8=9A=81-=E6=97=A5=E5=BF=97-bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=202=20=E6=B0=B4=E9=87=8F=E8=B0=83=E5=BA=A6?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B9=B4=E5=BA=A6=E5=AE=8C=E6=88=90=E6=AC=A1?= =?UTF-8?q?=E6=95=B0=E7=BB=9F=E8=AE=A1=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AbstractCommonFileController.java | 20 ++++++++++++------- .../hsz/controller/RiverWaterController.java | 2 +- .../controller/WaterDispatchController.java | 9 +++++++++ .../project/hsz/entity/vo/WdCountVo.java | 15 ++++++++++++++ .../project/hsz/mapper/ByLogDetailMapper.java | 4 ++-- .../hsz/mapper/WaterDispatchMapper.java | 12 +++++++++++ .../hsz/service/WaterDispatchService.java | 12 +++++++++-- 7 files changed, 62 insertions(+), 12 deletions(-) create mode 100644 src/main/java/com/gunshi/project/hsz/entity/vo/WdCountVo.java diff --git a/src/main/java/com/gunshi/project/hsz/controller/AbstractCommonFileController.java b/src/main/java/com/gunshi/project/hsz/controller/AbstractCommonFileController.java index d8e6c16..acb906f 100644 --- a/src/main/java/com/gunshi/project/hsz/controller/AbstractCommonFileController.java +++ b/src/main/java/com/gunshi/project/hsz/controller/AbstractCommonFileController.java @@ -3,6 +3,7 @@ package com.gunshi.project.hsz.controller; import com.gunshi.core.GunShiCoreProperties; import com.gunshi.core.result.R; import com.gunshi.core.session.entity.SessionUser; +import com.gunshi.core.session.service.BaseSessionService; import com.gunshi.file.model.FileDescriptor; import com.gunshi.file.service.IFileService; import com.gunshi.file.service.LoginFileService; @@ -76,8 +77,8 @@ public abstract class AbstractCommonFileController implements ICommonFileControl @Autowired private GunShiCoreProperties properties; -// @Autowired -// private BaseSessionService sessionService; + @Autowired + private BaseSessionService sessionService; @Override public IFileService getService() { @@ -86,11 +87,16 @@ public abstract class AbstractCommonFileController implements ICommonFileControl @Override public SessionUser checkLogin(HttpServletRequest request) { -// String token = sessionService.getToken(request); -// return sessionService.getSessionUser(token); - SessionUser user = new SessionUser(); - user.setUserId(1L); - return user; + String token = sessionService.getToken(request); + SessionUser sessionUser = null; + if(token != null){ + sessionUser = sessionService.getSessionUser(token); + } + if(sessionUser == null){ + sessionUser = new SessionUser(); + sessionUser.setUserId(1L); + } + return sessionUser; } @Override diff --git a/src/main/java/com/gunshi/project/hsz/controller/RiverWaterController.java b/src/main/java/com/gunshi/project/hsz/controller/RiverWaterController.java index d38f3c7..61361b1 100644 --- a/src/main/java/com/gunshi/project/hsz/controller/RiverWaterController.java +++ b/src/main/java/com/gunshi/project/hsz/controller/RiverWaterController.java @@ -36,7 +36,7 @@ public class RiverWaterController { @Autowired private RiverWaterService riverWaterService; - @Get(path = "/list", summary = "河道水情列表") + @Get(path = "/get", summary = "河道水情上下游") public R> list(@RequestParam("stcd") String stcd) { return R.ok(riverWaterService.list(stcd)); } 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 df94518..4610e78 100644 --- a/src/main/java/com/gunshi/project/hsz/controller/WaterDispatchController.java +++ b/src/main/java/com/gunshi/project/hsz/controller/WaterDispatchController.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gunshi.core.result.R; import com.gunshi.project.hsz.entity.so.WaterDispatchPageSo; import com.gunshi.project.hsz.entity.so.XlPlanPageSo; +import com.gunshi.project.hsz.entity.vo.WdCountVo; import com.gunshi.project.hsz.model.IaCDanad; import com.gunshi.project.hsz.model.WaterDispatch; import com.gunshi.project.hsz.model.XlPlan; @@ -21,6 +22,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.io.Serializable; +import java.time.LocalDateTime; import java.util.Objects; @Tag(name = "水量调度") @@ -103,6 +105,13 @@ public class WaterDispatchController extends AbstractCommonFileController { return R.ok(res); } + @Operation(summary = "统计当年完成调度次数") + @GetMapping("/count") + public R getCount(){ + WdCountVo vo = waterDispatchService.getCount(); + return R.ok(vo); + } + @Override public String getGroupId() { return "waterDispatch"; diff --git a/src/main/java/com/gunshi/project/hsz/entity/vo/WdCountVo.java b/src/main/java/com/gunshi/project/hsz/entity/vo/WdCountVo.java new file mode 100644 index 0000000..2769f1d --- /dev/null +++ b/src/main/java/com/gunshi/project/hsz/entity/vo/WdCountVo.java @@ -0,0 +1,15 @@ +package com.gunshi.project.hsz.entity.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +@Schema(description = "水量调度年度完成次数返回Vo") +public class WdCountVo { + + @Schema(description = "年份") + private String year; + + @Schema(description = "完成数量") + private Integer count; +} diff --git a/src/main/java/com/gunshi/project/hsz/mapper/ByLogDetailMapper.java b/src/main/java/com/gunshi/project/hsz/mapper/ByLogDetailMapper.java index 51c0878..437638c 100644 --- a/src/main/java/com/gunshi/project/hsz/mapper/ByLogDetailMapper.java +++ b/src/main/java/com/gunshi/project/hsz/mapper/ByLogDetailMapper.java @@ -15,7 +15,7 @@ public interface ByLogDetailMapper extends BaseMapper { @Select("""