From e328b32b1ab8a6f807c6584447da864877f6547e Mon Sep 17 00:00:00 2001 From: xjm Date: Mon, 15 Jul 2024 17:38:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B0=B4=E5=BA=93=E5=9F=BA=E6=9C=AC=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=96=B0=E5=A2=9E,=E4=B8=BB=E8=A6=81=E7=89=B9?= =?UTF-8?q?=E5=BE=81=E5=8F=82=E6=95=B0=E6=96=B0=E5=A2=9E,=E6=B0=B4?= =?UTF-8?q?=E5=BA=93=E5=BA=93=E5=AE=B9=E6=9B=B2=E7=BA=BF=E6=96=B0=E5=A2=9E?= =?UTF-8?q?,=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2,=E6=B0=B4=E5=BA=93?= =?UTF-8?q?=E6=B3=84=E6=B5=81=E6=9B=B2=E7=BA=BF=E6=96=B0=E5=A2=9E,?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2,=20=E6=9C=88=E7=94=9F?= =?UTF-8?q?=E6=80=81=E6=B5=81=E9=87=8F=E6=9F=A5=E8=AF=A2,=20=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=8D=95=E4=BD=8D=E6=96=B0=E5=A2=9E,=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E8=B4=A3=E4=BB=BB=E4=BD=93=E7=B3=BB=E6=96=B0=E5=A2=9E?= =?UTF-8?q?,=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E9=98=B2=E6=B1=9B?= =?UTF-8?q?=E9=A2=84=E6=A1=88=E8=B0=83=E5=BA=A6=E8=A7=84=E7=A8=8B,?= =?UTF-8?q?=E6=96=B0=E5=A2=9E,=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xyt/controller/AttResBaseController.java | 6 ++++- .../xyt/controller/ResMangUnitController.java | 5 ++-- .../controller/ResMonthEcoFlowController.java | 8 ++++-- .../xyt/controller/ResPlanBController.java | 7 +++--- .../controller/ResProjectImgController.java | 6 ++--- .../controller/ResSafePersonBController.java | 5 ++-- .../xyt/controller/StZqrlBController.java | 2 +- .../xyt/controller/StZvarlBController.java | 2 +- .../project/xyt/entity/so/ResCodeSo.java | 25 +++++++++++++++++++ .../xyt/entity/so/ResMonthEcoFlowListSo.java | 21 ++++++++++++++++ 10 files changed, 72 insertions(+), 15 deletions(-) create mode 100644 src/main/java/com/gunshi/project/xyt/entity/so/ResCodeSo.java create mode 100644 src/main/java/com/gunshi/project/xyt/entity/so/ResMonthEcoFlowListSo.java diff --git a/src/main/java/com/gunshi/project/xyt/controller/AttResBaseController.java b/src/main/java/com/gunshi/project/xyt/controller/AttResBaseController.java index 035578c..93ca6d6 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/AttResBaseController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/AttResBaseController.java @@ -22,7 +22,7 @@ import java.util.List; @Tag(name = "水库基本信息表") @RestController @RequestMapping(value="/attResBase") -public class AttResBaseController { +public class AttResBaseController extends AbstractCommonFileController { @Autowired private AttResBaseService service; @@ -60,4 +60,8 @@ public class AttResBaseController { return R.ok(service.page(null,null)); } + @Override + public String getGroupId() { + return "attResBase"; + } } \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/controller/ResMangUnitController.java b/src/main/java/com/gunshi/project/xyt/controller/ResMangUnitController.java index 96e4270..ffb13db 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/ResMangUnitController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/ResMangUnitController.java @@ -1,6 +1,7 @@ package com.gunshi.project.xyt.controller; import com.gunshi.core.result.R; +import com.gunshi.project.xyt.entity.so.ResCodeSo; import com.gunshi.project.xyt.model.ResMangUnit; import com.gunshi.project.xyt.service.ResMangUnitService; import com.gunshi.project.xyt.validate.markers.Insert; @@ -50,8 +51,8 @@ public class ResMangUnitController { @Operation(summary = "列表") @PostMapping("/list") - public R> list() { - return R.ok(service.lambdaQuery().list()); + public R> list(@Validated @RequestBody ResCodeSo so) { + return R.ok(service.lambdaQuery().eq(ResMangUnit::getResCode,so.getResCode()).list()); } @Operation(summary = "分页") diff --git a/src/main/java/com/gunshi/project/xyt/controller/ResMonthEcoFlowController.java b/src/main/java/com/gunshi/project/xyt/controller/ResMonthEcoFlowController.java index 73c4e78..8f0866e 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/ResMonthEcoFlowController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/ResMonthEcoFlowController.java @@ -1,6 +1,7 @@ package com.gunshi.project.xyt.controller; import com.gunshi.core.result.R; +import com.gunshi.project.xyt.entity.so.ResMonthEcoFlowListSo; import com.gunshi.project.xyt.model.ResMonthEcoFlow; import com.gunshi.project.xyt.service.ResMonthEcoFlowService; import com.gunshi.project.xyt.validate.markers.Insert; @@ -13,6 +14,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.io.Serializable; +import java.time.LocalDateTime; import java.util.List; /** * 描述: 水库月核定生态流量表 @@ -50,8 +52,10 @@ public class ResMonthEcoFlowController { @Operation(summary = "列表") @PostMapping("/list") - public R> list() { - return R.ok(service.lambdaQuery().list()); + public R> list(@Validated ResMonthEcoFlowListSo vo) { + LocalDateTime stm = LocalDateTime.of(vo.getYear(), 1, 1, 0, 0, 0); + LocalDateTime etm = LocalDateTime.of(vo.getYear(), 12, 31, 23, 59, 59); + return R.ok(service.lambdaQuery().between(ResMonthEcoFlow::getModitime,stm,etm).orderByAsc(ResMonthEcoFlow::getMonth).list()); } @Operation(summary = "分页") diff --git a/src/main/java/com/gunshi/project/xyt/controller/ResPlanBController.java b/src/main/java/com/gunshi/project/xyt/controller/ResPlanBController.java index 20f4b14..e4e74bd 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/ResPlanBController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/ResPlanBController.java @@ -1,7 +1,9 @@ package com.gunshi.project.xyt.controller; import com.gunshi.core.result.R; +import com.gunshi.project.xyt.entity.so.ResCodeSo; import com.gunshi.project.xyt.model.ResPlanB; +import com.gunshi.project.xyt.model.ResSafePersonB; import com.gunshi.project.xyt.service.ResPlanBService; import com.gunshi.project.xyt.validate.markers.Insert; import com.gunshi.project.xyt.validate.markers.Update; @@ -50,10 +52,9 @@ public class ResPlanBController { @Operation(summary = "列表") @PostMapping("/list") - public R> list() { - return R.ok(service.lambdaQuery().list()); + public R> list(@Validated @RequestBody ResCodeSo so) { + return R.ok(service.lambdaQuery().eq(ResPlanB::getResCode,so.getResCode()).list()); } - @Operation(summary = "分页") @PostMapping("/page") public R> page() { diff --git a/src/main/java/com/gunshi/project/xyt/controller/ResProjectImgController.java b/src/main/java/com/gunshi/project/xyt/controller/ResProjectImgController.java index 06b4425..4922b28 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/ResProjectImgController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/ResProjectImgController.java @@ -1,6 +1,7 @@ package com.gunshi.project.xyt.controller; import com.gunshi.core.result.R; +import com.gunshi.project.xyt.entity.so.ResCodeSo; import com.gunshi.project.xyt.model.ResProjectImg; import com.gunshi.project.xyt.service.ResProjectImgService; import com.gunshi.project.xyt.validate.markers.Insert; @@ -50,10 +51,9 @@ public class ResProjectImgController { @Operation(summary = "列表") @PostMapping("/list") - public R> list() { - return R.ok(service.lambdaQuery().list()); + public R> list(@Validated @RequestBody ResCodeSo so) { + return R.ok(service.lambdaQuery().eq(ResProjectImg::getResCode,so.getResCode()).list()); } - @Operation(summary = "分页") @PostMapping("/page") public R> page() { diff --git a/src/main/java/com/gunshi/project/xyt/controller/ResSafePersonBController.java b/src/main/java/com/gunshi/project/xyt/controller/ResSafePersonBController.java index de5926b..14f048f 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/ResSafePersonBController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/ResSafePersonBController.java @@ -1,6 +1,7 @@ package com.gunshi.project.xyt.controller; import com.gunshi.core.result.R; +import com.gunshi.project.xyt.entity.so.ResCodeSo; import com.gunshi.project.xyt.model.ResSafePersonB; import com.gunshi.project.xyt.service.ResSafePersonBService; import com.gunshi.project.xyt.validate.markers.Insert; @@ -50,8 +51,8 @@ public class ResSafePersonBController { @Operation(summary = "列表") @PostMapping("/list") - public R> list() { - return R.ok(service.lambdaQuery().list()); + public R> list(@Validated @RequestBody ResCodeSo so) { + return R.ok(service.lambdaQuery().eq(ResSafePersonB::getResCode,so.getResCode()).list()); } @Operation(summary = "分页") diff --git a/src/main/java/com/gunshi/project/xyt/controller/StZqrlBController.java b/src/main/java/com/gunshi/project/xyt/controller/StZqrlBController.java index 2de442b..19bc652 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/StZqrlBController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/StZqrlBController.java @@ -51,7 +51,7 @@ public class StZqrlBController { @Operation(summary = "列表") @PostMapping("/list") public R> list() { - return R.ok(service.lambdaQuery().list()); + return R.ok(service.lambdaQuery().orderByDesc(StZqrlB::getModitime).list()); } @Operation(summary = "分页") diff --git a/src/main/java/com/gunshi/project/xyt/controller/StZvarlBController.java b/src/main/java/com/gunshi/project/xyt/controller/StZvarlBController.java index 07ca321..5809e3f 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/StZvarlBController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/StZvarlBController.java @@ -51,7 +51,7 @@ public class StZvarlBController { @Operation(summary = "列表") @PostMapping("/list") public R> list() { - return R.ok(service.lambdaQuery().list()); + return R.ok(service.lambdaQuery().orderByDesc(StZvarlB::getMstm).list()); } @Operation(summary = "分页") diff --git a/src/main/java/com/gunshi/project/xyt/entity/so/ResCodeSo.java b/src/main/java/com/gunshi/project/xyt/entity/so/ResCodeSo.java new file mode 100644 index 0000000..44c6fa0 --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/entity/so/ResCodeSo.java @@ -0,0 +1,25 @@ +package com.gunshi.project.xyt.entity.so; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import lombok.Data; + +/** + * Description: + * Created by XuSan on 2024/7/15. + * + * @author XuSan + * @version 1.0 + */ +@Data +@Schema(description = "水库代码查询对象") +public class ResCodeSo { + + + /** + * 水库代码 + */ + @Schema(description="水库代码") + @NotBlank(message = "水库代码不能为空") + private String resCode; +} diff --git a/src/main/java/com/gunshi/project/xyt/entity/so/ResMonthEcoFlowListSo.java b/src/main/java/com/gunshi/project/xyt/entity/so/ResMonthEcoFlowListSo.java new file mode 100644 index 0000000..63464b5 --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/entity/so/ResMonthEcoFlowListSo.java @@ -0,0 +1,21 @@ +package com.gunshi.project.xyt.entity.so; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +/** + * Description: + * Created by XuSan on 2024/7/15. + * + * @author XuSan + * @version 1.0 + */ +@Data +@Schema(description = "水库月核定生态流量列表查询对象") +public class ResMonthEcoFlowListSo { + + @NotNull(message = "年度不能为空") + @Schema(description = "年度") + private Integer year; +}