yangzhe
/
gunshi-project-ss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更换排序字段属性名

master
chenxiwang 2024-08-14 10:04:27 +08:00
parent abce68b34b
commit 8aae9fe9ab
11 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/gunshi/project/xyt/controller/ForecastKController.java
View File

@ -71,8 +71,8 @@ public class ForecastKController {
@PostMapping("/list")
public R<List<ForecastK>> list(@RequestBody @Validated ForecastK forecastK) {
QueryWrapper<ForecastK> wrapper = new QueryWrapper<ForecastK>();
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<ForecastK>> page(@RequestBody @Validated ForecastK forecastK) {
QueryWrapper<ForecastK> wrapper = new QueryWrapper<ForecastK>();
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));
}

4
src/main/java/com/gunshi/project/xyt/controller/ForecastPPaRController.java
View File

@ -68,8 +68,8 @@ public class ForecastPPaRController {
@PostMapping("/page")
public R<Page<ForecastPPaR>> page(@RequestBody @Validated ForecastPPaR forecastPPaR) {
QueryWrapper<ForecastPPaR> wrapper = new QueryWrapper<ForecastPPaR>();
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));
}

8
src/main/java/com/gunshi/project/xyt/controller/ForecastProjectController.java
View File

@ -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));
}

8
src/main/java/com/gunshi/project/xyt/controller/ForecastResultsController.java
View File

@ -65,8 +65,8 @@ public class ForecastResultsController {
@PostMapping("/list")
public R<List<ForecastResults>> list(@RequestBody @Validated ForecastResults forecastResults) {
QueryWrapper<ForecastResults> wrapper = new QueryWrapper<ForecastResults>();
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<ForecastResults>> page(@RequestBody @Validated ForecastResults forecastResults) {
QueryWrapper<ForecastResults> 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));
}

8
src/main/java/com/gunshi/project/xyt/controller/ForecastTaskController.java
View File

@ -85,8 +85,8 @@ public class ForecastTaskController {
QueryWrapper<ForecastTask> wrapper = new QueryWrapper<ForecastTask>()
.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<ForecastTask> wrapper = new QueryWrapper<ForecastTask>()
.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));
}

8
src/main/java/com/gunshi/project/xyt/controller/ForecastUController.java
View File

@ -73,8 +73,8 @@ public class ForecastUController {
@PostMapping("/list")
public R<List<ForecastU>> list(@RequestBody @Validated ForecastU forecastU) {
QueryWrapper<ForecastU> wrapper = new QueryWrapper<ForecastU>();
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<ForecastU>> page(@RequestBody @Validated ForecastU forecastU) {
QueryWrapper<ForecastU> wrapper = new QueryWrapper<ForecastU>();
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));
}

8
src/main/java/com/gunshi/project/xyt/controller/ForecastUseparamController.java
View File

@ -72,8 +72,8 @@ public class ForecastUseparamController {
@PostMapping("/list")
public R<List<ForecastUseparam>> list(@RequestBody @Validated ForecastUseparam forecastUseparam) {
QueryWrapper<ForecastUseparam> wrapper = new QueryWrapper<ForecastUseparam>();
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<ForecastUseparam>> page(@RequestBody @Validated ForecastUseparam forecastUseparam) {
QueryWrapper<ForecastUseparam> wrapper = new QueryWrapper<ForecastUseparam>();
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));
}

8
src/main/java/com/gunshi/project/xyt/controller/OsmoticWaterRController.java
View File

@ -126,8 +126,8 @@ public class OsmoticWaterRController {
QueryWrapper<OsmoticWaterR> wrapper = new QueryWrapper<OsmoticWaterR>()
.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<OsmoticWaterR> 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));
}

16
src/main/java/com/gunshi/project/xyt/controller/StWaterRController.java
View File

@ -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));
}

8
src/main/java/com/gunshi/project/xyt/controller/StWaterRReorganizeController.java
View File

@ -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));
}

2
src/main/java/com/gunshi/project/xyt/entity/page/GenericPageParams.java
View File

@ -21,7 +21,7 @@ public class GenericPageParams {
@Schema(description = "排序字段")
@TableField(exist = false)
private String sortField;
private String orderField;
@Schema(description = "排序规则，是否升序")
@TableField(exist = false)