From bbcd52d83ee62e4aa778ebac3b9693205b95f9d0 Mon Sep 17 00:00:00 2001 From: wany <13995595726@qq.com> Date: Fri, 16 Aug 2024 17:39:14 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B5=8B=E7=AB=99=E5=9F=BA=E6=9C=AC?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gunshi/project/xyt/controller/StStbprpBController.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gunshi/project/xyt/controller/StStbprpBController.java b/src/main/java/com/gunshi/project/xyt/controller/StStbprpBController.java index 07323db..92a2e6c 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/StStbprpBController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/StStbprpBController.java @@ -1,6 +1,8 @@ package com.gunshi.project.xyt.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gunshi.core.result.R; @@ -21,6 +23,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.io.Serializable; +import java.util.Date; import java.util.List; import java.util.Objects; @@ -44,6 +47,7 @@ public class StStbprpBController { if (Objects.nonNull(service.getById(dto.getStcd()))){ throw new RuntimeException("测站编号已存在"); } + dto.setModitime(new Date()); boolean result = service.save(dto); return R.ok(result ? dto : null); } @@ -85,7 +89,7 @@ public class StStbprpBController { @Operation(summary = "分页") @PostMapping("/page") public R> page(@RequestBody @Validated StStbprpBPage page) { - LambdaQueryChainWrapper query = service.lambdaQuery(); + LambdaQueryWrapper query = Wrappers.lambdaQuery(); if (ObjectUtils.isNotNull(page.getCode())) { query.like(StStbprpB::getStcd, page.getCode()); } @@ -95,6 +99,7 @@ public class StStbprpBController { if (ObjectUtils.isNotNull(page.getAgreement())) { query.like(StStbprpB::getAgreement, page.getAgreement()); } + query.orderByDesc(StStbprpB::getModitime); return R.ok(service.page(page.getPageSo().toPage(), query)); } From 817ea5f3ed2b8a6588c5b8ea4030ef9c3c58193a Mon Sep 17 00:00:00 2001 From: wany <13995595726@qq.com> Date: Fri, 16 Aug 2024 17:51:55 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B5=8B=E7=AB=99=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gunshi/project/xyt/model/StStbprpB.java | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/gunshi/project/xyt/model/StStbprpB.java b/src/main/java/com/gunshi/project/xyt/model/StStbprpB.java index 71b2b89..354f744 100644 --- a/src/main/java/com/gunshi/project/xyt/model/StStbprpB.java +++ b/src/main/java/com/gunshi/project/xyt/model/StStbprpB.java @@ -95,13 +95,6 @@ public class StStbprpB implements Serializable { @Size(max = 500,message = "站址最大长度要小于 500") private String stlc; - /** - * 弃用，使用adcd，行政区划码 - */ - @TableField(value="addvcd") - @Schema(description="弃用，使用adcd，行政区划码") - @Size(max = 15,message = "弃用，使用adcd，行政区划码最大长度要小于 15") - private String addvcd; /** * alt @@ -529,6 +522,20 @@ public class StStbprpB implements Serializable { @TableField(value="agreement") private String agreement; + /** + * SIM卡 + */ + @Schema(description="SIM卡") + @TableField(value="sim_card") + private String simCard; + + /** + * 北斗卡号 + */ + @Schema(description="北斗卡号") + @TableField(value="bd_card") + private String bdCard; + public static final String COL_STCD = "stcd"; }