From 8aae9fe9ab31b2b3d9fc5da7fc1d1086e46591ce Mon Sep 17 00:00:00 2001 From: chenxiwang <1520264117@qq.com> Date: Wed, 14 Aug 2024 10:04:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E6=8E=92=E5=BA=8F=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=B1=9E=E6=80=A7=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xyt/controller/ForecastKController.java | 8 ++++---- .../xyt/controller/ForecastPPaRController.java | 4 ++-- .../controller/ForecastProjectController.java | 8 ++++---- .../controller/ForecastResultsController.java | 8 ++++---- .../xyt/controller/ForecastTaskController.java | 8 ++++---- .../xyt/controller/ForecastUController.java | 8 ++++---- .../controller/ForecastUseparamController.java | 8 ++++---- .../xyt/controller/OsmoticWaterRController.java | 8 ++++---- .../xyt/controller/StWaterRController.java | 16 ++++++++-------- .../controller/StWaterRReorganizeController.java | 8 ++++---- .../xyt/entity/page/GenericPageParams.java | 2 +- 11 files changed, 43 insertions(+), 43 deletions(-) diff --git a/src/main/java/com/gunshi/project/xyt/controller/ForecastKController.java b/src/main/java/com/gunshi/project/xyt/controller/ForecastKController.java index 0b57fc4..9fe834e 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/ForecastKController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/ForecastKController.java @@ -71,8 +71,8 @@ public class ForecastKController { @PostMapping("/list") public R> list(@RequestBody @Validated ForecastK forecastK) { QueryWrapper wrapper = new QueryWrapper(); - if(StringUtils.isNotBlank(forecastK.getSortField())){ - wrapper.orderBy(true, ObjectUtils.isEmpty(forecastK.getIsAsc()) ? false : forecastK.getIsAsc(), forecastK.getSortField()); + if(StringUtils.isNotBlank(forecastK.getOrderField())){ + wrapper.orderBy(true, ObjectUtils.isEmpty(forecastK.getIsAsc()) ? false : forecastK.getIsAsc(), forecastK.getOrderField()); } return R.ok(service.list(wrapper)); } @@ -81,8 +81,8 @@ public class ForecastKController { @PostMapping("/page") public R> page(@RequestBody @Validated ForecastK forecastK) { QueryWrapper wrapper = new QueryWrapper(); - if(StringUtils.isNotBlank(forecastK.getSortField())){ - wrapper.orderBy(true, ObjectUtils.isEmpty(forecastK.getIsAsc()) ? false : forecastK.getIsAsc(), forecastK.getSortField()); + if(StringUtils.isNotBlank(forecastK.getOrderField())){ + wrapper.orderBy(true, ObjectUtils.isEmpty(forecastK.getIsAsc()) ? false : forecastK.getIsAsc(), forecastK.getOrderField()); } return R.ok(service.page(forecastK.getPageSo().toPage(), wrapper)); } diff --git a/src/main/java/com/gunshi/project/xyt/controller/ForecastPPaRController.java b/src/main/java/com/gunshi/project/xyt/controller/ForecastPPaRController.java index f3f2653..9570ac3 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/ForecastPPaRController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/ForecastPPaRController.java @@ -68,8 +68,8 @@ public class ForecastPPaRController { @PostMapping("/page") public R> page(@RequestBody @Validated ForecastPPaR forecastPPaR) { QueryWrapper wrapper = new QueryWrapper(); - if(StringUtils.isNotBlank(forecastPPaR.getSortField())){ - wrapper.orderBy(true, ObjectUtils.isEmpty(forecastPPaR.getIsAsc()) ? false : forecastPPaR.getIsAsc(), forecastPPaR.getSortField()); + if(StringUtils.isNotBlank(forecastPPaR.getOrderField())){ + wrapper.orderBy(true, ObjectUtils.isEmpty(forecastPPaR.getIsAsc()) ? false : forecastPPaR.getIsAsc(), forecastPPaR.getOrderField()); } return R.ok(service.page(forecastPPaR.getPageSo().toPage(), wrapper)); } diff --git a/src/main/java/com/gunshi/project/xyt/controller/ForecastProjectController.java b/src/main/java/com/gunshi/project/xyt/controller/ForecastProjectController.java index ecc811b..b4cbdb3 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/ForecastProjectController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/ForecastProjectController.java @@ -83,8 +83,8 @@ public class ForecastProjectController { .like(ObjectUtils.isNotNull(forecastProject.getName()), "name", forecastProject.getName()) .ge(ObjectUtils.isNotNull(forecastProject.getStartTm()), "forecast_tm", forecastProject.getStartTm()) .le(ObjectUtils.isNotNull(forecastProject.getEndTm()), "forecast_tm", forecastProject.getEndTm()); - if(StringUtils.isNotBlank(forecastProject.getSortField())){ - wrapper.orderBy(true, ObjectUtils.isEmpty(forecastProject.getIsAsc()) ? false : forecastProject.getIsAsc(), forecastProject.getSortField()); + if(StringUtils.isNotBlank(forecastProject.getOrderField())){ + wrapper.orderBy(true, ObjectUtils.isEmpty(forecastProject.getIsAsc()) ? false : forecastProject.getIsAsc(), forecastProject.getOrderField()); } return R.ok(service.list(wrapper)); } @@ -96,8 +96,8 @@ public class ForecastProjectController { .like(ObjectUtils.isNotNull(forecastProject.getName()), "name", forecastProject.getName()) .ge(ObjectUtils.isNotNull(forecastProject.getStartTm()), "forecast_tm", forecastProject.getStartTm()) .le(ObjectUtils.isNotNull(forecastProject.getEndTm()), "forecast_tm", forecastProject.getEndTm()); - if(StringUtils.isNotBlank(forecastProject.getSortField())){ - wrapper.orderBy(true, ObjectUtils.isEmpty(forecastProject.getIsAsc()) ? false : forecastProject.getIsAsc(), forecastProject.getSortField()); + if(StringUtils.isNotBlank(forecastProject.getOrderField())){ + wrapper.orderBy(true, ObjectUtils.isEmpty(forecastProject.getIsAsc()) ? false : forecastProject.getIsAsc(), forecastProject.getOrderField()); } return R.ok(service.page(forecastProject.getPageSo().toPage(), wrapper)); } diff --git a/src/main/java/com/gunshi/project/xyt/controller/ForecastResultsController.java b/src/main/java/com/gunshi/project/xyt/controller/ForecastResultsController.java index 3120fcb..0e876a0 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/ForecastResultsController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/ForecastResultsController.java @@ -65,8 +65,8 @@ public class ForecastResultsController { @PostMapping("/list") public R> list(@RequestBody @Validated ForecastResults forecastResults) { QueryWrapper wrapper = new QueryWrapper(); - if(StringUtils.isNotBlank(forecastResults.getSortField())){ - wrapper.orderBy(true, ObjectUtils.isEmpty(forecastResults.getIsAsc()) ? false : forecastResults.getIsAsc(), forecastResults.getSortField()); + if(StringUtils.isNotBlank(forecastResults.getOrderField())){ + wrapper.orderBy(true, ObjectUtils.isEmpty(forecastResults.getIsAsc()) ? false : forecastResults.getIsAsc(), forecastResults.getOrderField()); } return R.ok(service.list(wrapper)); } @@ -75,8 +75,8 @@ public class ForecastResultsController { @PostMapping("/page") public R> page(@RequestBody @Validated ForecastResults forecastResults) { QueryWrapper wrapper = new QueryWrapper<>(); - if(StringUtils.isNotBlank(forecastResults.getSortField())){ - wrapper.orderBy(true, ObjectUtils.isEmpty(forecastResults.getIsAsc()) ? false : forecastResults.getIsAsc(), forecastResults.getSortField()); + if(StringUtils.isNotBlank(forecastResults.getOrderField())){ + wrapper.orderBy(true, ObjectUtils.isEmpty(forecastResults.getIsAsc()) ? false : forecastResults.getIsAsc(), forecastResults.getOrderField()); } return R.ok(service.page(forecastResults.getPageSo().toPage(), wrapper)); } diff --git a/src/main/java/com/gunshi/project/xyt/controller/ForecastTaskController.java b/src/main/java/com/gunshi/project/xyt/controller/ForecastTaskController.java index 0f989a6..7b5ed1c 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/ForecastTaskController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/ForecastTaskController.java @@ -85,8 +85,8 @@ public class ForecastTaskController { QueryWrapper wrapper = new QueryWrapper() .in("status", "0", "1")// 只返回启用和暂停的 .like(ObjectUtils.isNotNull(forecastTask.getName()), "name", forecastTask.getName()); - if(StringUtils.isNotBlank(forecastTask.getSortField())){ - wrapper.orderBy(true, ObjectUtils.isEmpty(forecastTask.getIsAsc()) ? false : forecastTask.getIsAsc(), forecastTask.getSortField()); + if(StringUtils.isNotBlank(forecastTask.getOrderField())){ + wrapper.orderBy(true, ObjectUtils.isEmpty(forecastTask.getIsAsc()) ? false : forecastTask.getIsAsc(), forecastTask.getOrderField()); } return R.ok(service.list(wrapper)); } @@ -97,8 +97,8 @@ public class ForecastTaskController { QueryWrapper wrapper = new QueryWrapper() .in("status", "0", "1")// 只返回启用和暂停的 .like(ObjectUtils.isNotNull(forecastTask.getName()), "name", forecastTask.getName()); - if(StringUtils.isNotBlank(forecastTask.getSortField())){ - wrapper.orderBy(true, ObjectUtils.isEmpty(forecastTask.getIsAsc()) ? false : forecastTask.getIsAsc(), forecastTask.getSortField()); + if(StringUtils.isNotBlank(forecastTask.getOrderField())){ + wrapper.orderBy(true, ObjectUtils.isEmpty(forecastTask.getIsAsc()) ? false : forecastTask.getIsAsc(), forecastTask.getOrderField()); } return R.ok(service.page(forecastTask.getPageSo().toPage(), wrapper)); } diff --git a/src/main/java/com/gunshi/project/xyt/controller/ForecastUController.java b/src/main/java/com/gunshi/project/xyt/controller/ForecastUController.java index 1836801..b8c9de9 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/ForecastUController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/ForecastUController.java @@ -73,8 +73,8 @@ public class ForecastUController { @PostMapping("/list") public R> list(@RequestBody @Validated ForecastU forecastU) { QueryWrapper wrapper = new QueryWrapper(); - if(StringUtils.isNotBlank(forecastU.getSortField())){ - wrapper.orderBy(true, ObjectUtils.isEmpty(forecastU.getIsAsc()) ? false : forecastU.getIsAsc(), forecastU.getSortField()); + if(StringUtils.isNotBlank(forecastU.getOrderField())){ + wrapper.orderBy(true, ObjectUtils.isEmpty(forecastU.getIsAsc()) ? false : forecastU.getIsAsc(), forecastU.getOrderField()); } return R.ok(service.list(wrapper)); } @@ -83,8 +83,8 @@ public class ForecastUController { @PostMapping("/page") public R> page(@RequestBody @Validated ForecastU forecastU) { QueryWrapper wrapper = new QueryWrapper(); - if(StringUtils.isNotBlank(forecastU.getSortField())){ - wrapper.orderBy(true, ObjectUtils.isEmpty(forecastU.getIsAsc()) ? false : forecastU.getIsAsc(), forecastU.getSortField()); + if(StringUtils.isNotBlank(forecastU.getOrderField())){ + wrapper.orderBy(true, ObjectUtils.isEmpty(forecastU.getIsAsc()) ? false : forecastU.getIsAsc(), forecastU.getOrderField()); } return R.ok(service.page(forecastU.getPageSo().toPage(), wrapper)); } diff --git a/src/main/java/com/gunshi/project/xyt/controller/ForecastUseparamController.java b/src/main/java/com/gunshi/project/xyt/controller/ForecastUseparamController.java index f4bb3b6..8bcdd5e 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/ForecastUseparamController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/ForecastUseparamController.java @@ -72,8 +72,8 @@ public class ForecastUseparamController { @PostMapping("/list") public R> list(@RequestBody @Validated ForecastUseparam forecastUseparam) { QueryWrapper wrapper = new QueryWrapper(); - if(StringUtils.isNotBlank(forecastUseparam.getSortField())){ - wrapper.orderBy(true, ObjectUtils.isEmpty(forecastUseparam.getIsAsc()) ? false : forecastUseparam.getIsAsc(), forecastUseparam.getSortField()); + if(StringUtils.isNotBlank(forecastUseparam.getOrderField())){ + wrapper.orderBy(true, ObjectUtils.isEmpty(forecastUseparam.getIsAsc()) ? false : forecastUseparam.getIsAsc(), forecastUseparam.getOrderField()); } return R.ok(service.list(wrapper)); } @@ -82,8 +82,8 @@ public class ForecastUseparamController { @PostMapping("/page") public R> page(@RequestBody @Validated ForecastUseparam forecastUseparam) { QueryWrapper wrapper = new QueryWrapper(); - if(StringUtils.isNotBlank(forecastUseparam.getSortField())){ - wrapper.orderBy(true, ObjectUtils.isEmpty(forecastUseparam.getIsAsc()) ? false : forecastUseparam.getIsAsc(), forecastUseparam.getSortField()); + if(StringUtils.isNotBlank(forecastUseparam.getOrderField())){ + wrapper.orderBy(true, ObjectUtils.isEmpty(forecastUseparam.getIsAsc()) ? false : forecastUseparam.getIsAsc(), forecastUseparam.getOrderField()); } return R.ok(service.page(forecastUseparam.getPageSo().toPage(), wrapper)); } diff --git a/src/main/java/com/gunshi/project/xyt/controller/OsmoticWaterRController.java b/src/main/java/com/gunshi/project/xyt/controller/OsmoticWaterRController.java index ce537c8..94b10a1 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/OsmoticWaterRController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/OsmoticWaterRController.java @@ -126,8 +126,8 @@ public class OsmoticWaterRController { QueryWrapper wrapper = new QueryWrapper() .ge(ObjectUtils.isNotNull(osmoticWaterR.getStartTime()), "tm", osmoticWaterR.getStartTime()) .le(ObjectUtils.isNotNull(osmoticWaterR.getEndTime()), "tm", osmoticWaterR.getEndTime()); - if(StringUtils.isNotBlank(osmoticWaterR.getSortField())){ - wrapper.orderBy(true, ObjectUtils.isEmpty(osmoticWaterR.getIsAsc()) ? false : osmoticWaterR.getIsAsc(), osmoticWaterR.getSortField()); + if(StringUtils.isNotBlank(osmoticWaterR.getOrderField())){ + wrapper.orderBy(true, ObjectUtils.isEmpty(osmoticWaterR.getIsAsc()) ? false : osmoticWaterR.getIsAsc(), osmoticWaterR.getOrderField()); } return R.ok(service.list(wrapper)); } @@ -138,8 +138,8 @@ public class OsmoticWaterRController { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.ge(ObjectUtils.isNotNull(osmoticWaterR.getStartTime()), "tm", osmoticWaterR.getStartTime()) .le(ObjectUtils.isNotNull(osmoticWaterR.getEndTime()), "tm", osmoticWaterR.getEndTime()); - if(StringUtils.isNotBlank(osmoticWaterR.getSortField())){ - wrapper.orderBy(true, ObjectUtils.isEmpty(osmoticWaterR.getIsAsc()) ? false : osmoticWaterR.getIsAsc(), osmoticWaterR.getSortField()); + if(StringUtils.isNotBlank(osmoticWaterR.getOrderField())){ + wrapper.orderBy(true, ObjectUtils.isEmpty(osmoticWaterR.getIsAsc()) ? false : osmoticWaterR.getIsAsc(), osmoticWaterR.getOrderField()); } return R.ok(service.page(osmoticWaterR.getPageSo().toPage(), wrapper)); } diff --git a/src/main/java/com/gunshi/project/xyt/controller/StWaterRController.java b/src/main/java/com/gunshi/project/xyt/controller/StWaterRController.java index c11ca79..90a1216 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/StWaterRController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/StWaterRController.java @@ -82,8 +82,8 @@ public class StWaterRController { .eq(StringUtils.isNotBlank(stWaterR.getStcd()), "stcd", stWaterR.getStcd()) .ge(ObjectUtils.isNotNull(stWaterR.getStartTime()), "tm", stWaterR.getStartTime()) .le(ObjectUtils.isNotNull(stWaterR.getEndTime()), "tm", stWaterR.getEndTime()); - if(StringUtils.isNotBlank(stWaterR.getSortField())){ - wrapper.orderBy(true, ObjectUtils.isEmpty(stWaterR.getIsAsc()) ? false : stWaterR.getIsAsc(), stWaterR.getSortField()); + if(StringUtils.isNotBlank(stWaterR.getOrderField())){ + wrapper.orderBy(true, ObjectUtils.isEmpty(stWaterR.getIsAsc()) ? false : stWaterR.getIsAsc(), stWaterR.getOrderField()); } return R.ok(service.list(wrapper)); } @@ -109,8 +109,8 @@ public class StWaterRController { wrapper.eq(StringUtils.isNotBlank(stWaterR.getStcd()), "stcd", stWaterR.getStcd()) .ge(ObjectUtils.isNotNull(stWaterR.getStartTime()), "tm", stWaterR.getStartTime()) .le(ObjectUtils.isNotNull(stWaterR.getEndTime()), "tm", stWaterR.getEndTime()); - if(StringUtils.isNotBlank(stWaterR.getSortField())){ - wrapper.orderBy(true, ObjectUtils.isEmpty(stWaterR.getIsAsc()) ? false : stWaterR.getIsAsc(), stWaterR.getSortField()); + if(StringUtils.isNotBlank(stWaterR.getOrderField())){ + wrapper.orderBy(true, ObjectUtils.isEmpty(stWaterR.getIsAsc()) ? false : stWaterR.getIsAsc(), stWaterR.getOrderField()); } return R.ok(service.page(stWaterR.getPageSo().toPage(), wrapper)); } @@ -143,8 +143,8 @@ public class StWaterRController { .eq("stcd", stStbprpB.getStcd()) .ge(ObjectUtils.isNotNull(stWaterR.getStartTime()), "tm", stWaterR.getStartTime()) .le(ObjectUtils.isNotNull(stWaterR.getEndTime()), "tm", stWaterR.getEndTime()); - if(StringUtils.isNotBlank(stWaterR.getSortField())){ - wrapper.orderBy(true, ObjectUtils.isEmpty(stWaterR.getIsAsc()) ? false : stWaterR.getIsAsc(), stWaterR.getSortField()); + if(StringUtils.isNotBlank(stWaterR.getOrderField())){ + wrapper.orderBy(true, ObjectUtils.isEmpty(stWaterR.getIsAsc()) ? false : stWaterR.getIsAsc(), stWaterR.getOrderField()); } return R.ok(service.list(wrapper)); } @@ -161,8 +161,8 @@ public class StWaterRController { .eq("stcd", stStbprpB.getStcd()) .ge(ObjectUtils.isNotNull(stWaterR.getStartTime()), "tm", stWaterR.getStartTime()) .le(ObjectUtils.isNotNull(stWaterR.getEndTime()), "tm", stWaterR.getEndTime()); - if(StringUtils.isNotBlank(stWaterR.getSortField())){ - wrapper.orderBy(true, ObjectUtils.isEmpty(stWaterR.getIsAsc()) ? false : stWaterR.getIsAsc(), stWaterR.getSortField()); + if(StringUtils.isNotBlank(stWaterR.getOrderField())){ + wrapper.orderBy(true, ObjectUtils.isEmpty(stWaterR.getIsAsc()) ? false : stWaterR.getIsAsc(), stWaterR.getOrderField()); } return R.ok(service.page(stWaterR.getPageSo().toPage(), wrapper)); } diff --git a/src/main/java/com/gunshi/project/xyt/controller/StWaterRReorganizeController.java b/src/main/java/com/gunshi/project/xyt/controller/StWaterRReorganizeController.java index 598f79b..41e9858 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/StWaterRReorganizeController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/StWaterRReorganizeController.java @@ -85,8 +85,8 @@ public class StWaterRReorganizeController { .ge(ObjectUtils.isNotNull(stWaterRReorganize.getStartTime()), "tm", stWaterRReorganize.getStartTime()) .le(ObjectUtils.isNotNull(stWaterRReorganize.getEndTime()), "tm", stWaterRReorganize.getEndTime()) .groupBy(groupBy); - if(StringUtils.isNotBlank(stWaterRReorganize.getSortField())){ - wrapper.orderBy(true, ObjectUtils.isEmpty(stWaterRReorganize.getIsAsc()) ? false : stWaterRReorganize.getIsAsc(), stWaterRReorganize.getSortField()); + if(StringUtils.isNotBlank(stWaterRReorganize.getOrderField())){ + wrapper.orderBy(true, ObjectUtils.isEmpty(stWaterRReorganize.getIsAsc()) ? false : stWaterRReorganize.getIsAsc(), stWaterRReorganize.getOrderField()); } return R.ok(service.list(wrapper)); } @@ -110,8 +110,8 @@ public class StWaterRReorganizeController { .ge(ObjectUtils.isNotNull(stWaterRReorganize.getStartTime()), "tm", stWaterRReorganize.getStartTime()) .le(ObjectUtils.isNotNull(stWaterRReorganize.getEndTime()), "tm", stWaterRReorganize.getEndTime()) .groupBy(groupBy); - if(StringUtils.isNotBlank(stWaterRReorganize.getSortField())){ - wrapper.orderBy(true, ObjectUtils.isEmpty(stWaterRReorganize.getIsAsc()) ? false : stWaterRReorganize.getIsAsc(), stWaterRReorganize.getSortField()); + if(StringUtils.isNotBlank(stWaterRReorganize.getOrderField())){ + wrapper.orderBy(true, ObjectUtils.isEmpty(stWaterRReorganize.getIsAsc()) ? false : stWaterRReorganize.getIsAsc(), stWaterRReorganize.getOrderField()); } return R.ok(service.page(stWaterRReorganize.getPageSo().toPage(), wrapper)); } diff --git a/src/main/java/com/gunshi/project/xyt/entity/page/GenericPageParams.java b/src/main/java/com/gunshi/project/xyt/entity/page/GenericPageParams.java index 55fa551..4fd0025 100644 --- a/src/main/java/com/gunshi/project/xyt/entity/page/GenericPageParams.java +++ b/src/main/java/com/gunshi/project/xyt/entity/page/GenericPageParams.java @@ -21,7 +21,7 @@ public class GenericPageParams { @Schema(description = "排序字段") @TableField(exist = false) - private String sortField; + private String orderField; @Schema(description = "排序规则，是否升序") @TableField(exist = false)