diff --git a/src/main/java/com/gunshi/project/xyt/controller/AttGateValveController.java b/src/main/java/com/gunshi/project/xyt/controller/AttGateValveController.java index bcfc7c6..97544e2 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/AttGateValveController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/AttGateValveController.java @@ -19,6 +19,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; @@ -40,6 +41,7 @@ public class AttGateValveController { @PostMapping("/insert") public R insert(@Validated(Insert.class) @RequestBody AttGateValve dto) { dto.setValveCode(String.valueOf(IdWorker.getId())); + dto.setCreateTime(new Date()); boolean result = service.save(dto); return R.ok(result ? dto : null); } @@ -80,6 +82,7 @@ public class AttGateValveController { if (ObjectUtils.isNotNull(page.getName())){ query.like(AttGateValve::getValveName, page.getName()); } + query.orderByDesc(AttGateValve::getCreateTime); return R.ok(service.page(page.getPageSo().toPage(),query)); } diff --git a/src/main/java/com/gunshi/project/xyt/controller/AttMeaWeirController.java b/src/main/java/com/gunshi/project/xyt/controller/AttMeaWeirController.java index 6768ae0..67d63e4 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/AttMeaWeirController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/AttMeaWeirController.java @@ -21,6 +21,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; @@ -45,6 +46,7 @@ public class AttMeaWeirController { @PostMapping("/insert") public R insert(@Validated(Insert.class) @RequestBody AttMeaWeir dto) { dto.setWeirCode(String.valueOf(IdWorker.getId())); + dto.setCreateTime(new Date()); if (StringUtils.isNotBlank(dto.getAdcd()) && Objects.isNull(stAddvcdDService.getById(dto.getAdcd()))){ throw new IllegalArgumentException("当前行政区划不存在"); } @@ -92,6 +94,7 @@ public class AttMeaWeirController { if (ObjectUtils.isNotNull(page.getName())) { query.like(AttMeaWeir::getWeirName, page.getName()); } + query.orderByDesc(AttMeaWeir::getCreateTime); return R.ok(service.page(page.getPageSo().toPage(), query)); } } \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/model/AttGateValve.java b/src/main/java/com/gunshi/project/xyt/model/AttGateValve.java index bb19263..956f54d 100644 --- a/src/main/java/com/gunshi/project/xyt/model/AttGateValve.java +++ b/src/main/java/com/gunshi/project/xyt/model/AttGateValve.java @@ -35,7 +35,7 @@ public class AttGateValve implements Serializable { */ @TableId(value="valve_code", type= IdType.AUTO) @Schema(description="闸阀编码") - @Size(max = 20,message = "闸阀编码最大长度要小于 20") + @Size(max = 20,message = "闸阀编码最大长度要小于 32") @NotBlank(message = "闸阀编码不能为空",groups = {Insert.class, Update.class}) private String valveCode;