From 7e472e2b1f4acd9f77e971908f6da367a1896ab9 Mon Sep 17 00:00:00 2001 From: wany <13995595726@qq.com> Date: Wed, 10 Jul 2024 09:27:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B8=97=E5=8E=8B=E7=9B=91=E6=B5=8B=EF=BC=8C?= =?UTF-8?q?=E6=B8=97=E6=B5=81=E7=9B=91=E6=B5=8B=EF=BC=8C=E4=BD=8D=E7=A7=BB?= =?UTF-8?q?=E7=9B=91=E6=B5=8B=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/OsmoticFlowRController.java | 6 +- .../controller/OsmoticPressRController.java | 6 +- .../controller/OsmoticShiftRController.java | 6 +- .../controller/OsmoticWarnRuleController.java | 5 +- .../xyt/controller/RescueTeamBController.java | 1 - .../xyt/entity/so/OsmoticQueryPageSo.java | 32 ++++++++ .../project/xyt/entity/vo/OsmoticWarnVo.java | 3 + .../xyt/mapper/OsmoticPressRMapper.java | 28 +++++++ .../project/xyt/model/OsmoticFlowR.java | 62 ++++++++-------- .../project/xyt/model/OsmoticPressR.java | 73 ++++++++++++------- .../project/xyt/model/OsmoticShiftR.java | 49 +++++-------- .../project/xyt/model/OsmoticWarnRule.java | 3 + .../project/xyt/model/RescueGoodsFile.java | 3 + .../gunshi/project/xyt/model/RescueTeamB.java | 3 + .../project/xyt/model/RescueTeamDetail.java | 4 + .../project/xyt/model/RescueTeamFile.java | 5 +- .../xyt/service/OsmoticFlowRService.java | 17 ++++- .../xyt/service/OsmoticPressRService.java | 10 ++- .../xyt/service/OsmoticShiftRService.java | 21 +++++- 19 files changed, 234 insertions(+), 103 deletions(-) create mode 100644 src/main/java/com/gunshi/project/xyt/entity/so/OsmoticQueryPageSo.java diff --git a/src/main/java/com/gunshi/project/xyt/controller/OsmoticFlowRController.java b/src/main/java/com/gunshi/project/xyt/controller/OsmoticFlowRController.java index df70641..f8ebbba 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/OsmoticFlowRController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/OsmoticFlowRController.java @@ -1,6 +1,8 @@ package com.gunshi.project.xyt.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gunshi.core.result.R; +import com.gunshi.project.xyt.entity.so.OsmoticQueryPageSo; import com.gunshi.project.xyt.model.OsmoticFlowR; import com.gunshi.project.xyt.service.OsmoticFlowRService; import com.gunshi.project.xyt.validate.markers.Insert; @@ -56,8 +58,8 @@ public class OsmoticFlowRController { @Operation(summary = "分页") @PostMapping("/page") - public R> page() { - return R.ok(service.page(null,null)); + public R> page(@RequestBody OsmoticQueryPageSo osmoticQueryPageSo) { + return R.ok(service.queryPage(osmoticQueryPageSo)); } } \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/controller/OsmoticPressRController.java b/src/main/java/com/gunshi/project/xyt/controller/OsmoticPressRController.java index 677b17f..d8fd09d 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/OsmoticPressRController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/OsmoticPressRController.java @@ -1,6 +1,8 @@ package com.gunshi.project.xyt.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gunshi.core.result.R; +import com.gunshi.project.xyt.entity.so.OsmoticQueryPageSo; import com.gunshi.project.xyt.model.OsmoticPressR; import com.gunshi.project.xyt.service.OsmoticPressRService; import com.gunshi.project.xyt.validate.markers.Insert; @@ -56,8 +58,8 @@ public class OsmoticPressRController { @Operation(summary = "分页") @PostMapping("/page") - public R> page() { - return R.ok(service.page(null,null)); + public R> page(@RequestBody OsmoticQueryPageSo osmoticQueryPageSo) { + return R.ok(service.queryPage(osmoticQueryPageSo)); } } \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/controller/OsmoticShiftRController.java b/src/main/java/com/gunshi/project/xyt/controller/OsmoticShiftRController.java index 7dd0c04..69bef0c 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/OsmoticShiftRController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/OsmoticShiftRController.java @@ -1,6 +1,8 @@ package com.gunshi.project.xyt.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gunshi.core.result.R; +import com.gunshi.project.xyt.entity.so.OsmoticQueryPageSo; import com.gunshi.project.xyt.model.OsmoticShiftR; import com.gunshi.project.xyt.service.OsmoticShiftRService; import com.gunshi.project.xyt.validate.markers.Insert; @@ -56,8 +58,8 @@ public class OsmoticShiftRController { @Operation(summary = "分页") @PostMapping("/page") - public R> page() { - return R.ok(service.page(null,null)); + public R> page(@RequestBody OsmoticQueryPageSo osmoticQueryPageSo) { + return R.ok(service.queryPage(osmoticQueryPageSo)); } } \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/controller/OsmoticWarnRuleController.java b/src/main/java/com/gunshi/project/xyt/controller/OsmoticWarnRuleController.java index 42ffccb..f028b6f 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/OsmoticWarnRuleController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/OsmoticWarnRuleController.java @@ -1,5 +1,6 @@ package com.gunshi.project.xyt.controller; +import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gunshi.core.result.R; import com.gunshi.project.xyt.entity.so.WarnRulePageSo; @@ -14,7 +15,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import java.io.Serializable; import java.util.List; /** * 描述: 预警规则配置表 @@ -33,6 +33,7 @@ public class OsmoticWarnRuleController { @Operation(summary = "新增") @PostMapping("/insert") public R insert(@Validated(Insert.class) @RequestBody OsmoticWarnRule dto) { + dto.setId(IdWorker.getId()); boolean result = service.save(dto); return R.ok(result ? dto : null); } @@ -46,7 +47,7 @@ public class OsmoticWarnRuleController { @Operation(summary = "删除") @GetMapping("/del/{id}") - public R del(@Schema(name = "id") @PathVariable("id") Serializable id) { + public R del(@Schema(name = "id") @PathVariable("id") Long id) { return R.ok(service.removeById(id)); } diff --git a/src/main/java/com/gunshi/project/xyt/controller/RescueTeamBController.java b/src/main/java/com/gunshi/project/xyt/controller/RescueTeamBController.java index e447741..bd7627d 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/RescueTeamBController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/RescueTeamBController.java @@ -89,7 +89,6 @@ public class RescueTeamBController extends AbstractCommonFileController implemen } - /** * 列表查询 */ diff --git a/src/main/java/com/gunshi/project/xyt/entity/so/OsmoticQueryPageSo.java b/src/main/java/com/gunshi/project/xyt/entity/so/OsmoticQueryPageSo.java new file mode 100644 index 0000000..4f44593 --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/entity/so/OsmoticQueryPageSo.java @@ -0,0 +1,32 @@ +package com.gunshi.project.xyt.entity.so; + +import com.gunshi.db.dto.DateTimeRangeSo; +import com.gunshi.db.dto.PageSo; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +/** + * Description: + * Created by wanyan on 2024/3/19 + * + * @author wanyan + * @version 1.0 + */ +@Data +@Schema(description = "渗压/渗流/位移分页查询对象") +public class OsmoticQueryPageSo extends WarnSo{ + + @NotNull(message = "分页参数不能为空") + @Schema(description = "分页参数") + private PageSo pageSo; + + @Schema(description = "上报时间") + private DateTimeRangeSo dateTimeRangeSo; + + @Schema(description = "监测断面") + private String profileCode; + + @Schema(description = "测点编号") + private String stationCode; +} diff --git a/src/main/java/com/gunshi/project/xyt/entity/vo/OsmoticWarnVo.java b/src/main/java/com/gunshi/project/xyt/entity/vo/OsmoticWarnVo.java index f6ca127..17e115d 100644 --- a/src/main/java/com/gunshi/project/xyt/entity/vo/OsmoticWarnVo.java +++ b/src/main/java/com/gunshi/project/xyt/entity/vo/OsmoticWarnVo.java @@ -1,6 +1,8 @@ package com.gunshi.project.xyt.entity.vo; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.gunshi.core.dateformat.DateFormatString; import com.gunshi.project.xyt.model.OsmoticWarnRule; import io.swagger.v3.oas.annotations.media.Schema; @@ -22,6 +24,7 @@ public class OsmoticWarnVo extends OsmoticWarnRule { * 主键 */ @Schema(description="主键") + @JsonSerialize(using = ToStringSerializer.class) private Long id; /** diff --git a/src/main/java/com/gunshi/project/xyt/mapper/OsmoticPressRMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/OsmoticPressRMapper.java index 4a87e75..ac9ec84 100644 --- a/src/main/java/com/gunshi/project/xyt/mapper/OsmoticPressRMapper.java +++ b/src/main/java/com/gunshi/project/xyt/mapper/OsmoticPressRMapper.java @@ -1,8 +1,12 @@ package com.gunshi.project.xyt.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.gunshi.project.xyt.entity.so.OsmoticQueryPageSo; import com.gunshi.project.xyt.model.OsmoticPressR; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; /** * 描述: 渗压监测记录表 @@ -12,4 +16,28 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface OsmoticPressRMapper extends BaseMapper { + @Select(""" + + """) + Page queryPage(Page page,@Param("obj") OsmoticQueryPageSo osmoticQueryPageSo); } \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/model/OsmoticFlowR.java b/src/main/java/com/gunshi/project/xyt/model/OsmoticFlowR.java index adeb255..33a9c16 100644 --- a/src/main/java/com/gunshi/project/xyt/model/OsmoticFlowR.java +++ b/src/main/java/com/gunshi/project/xyt/model/OsmoticFlowR.java @@ -1,18 +1,16 @@ package com.gunshi.project.xyt.model; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; import com.gunshi.core.dateformat.DateFormatString; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.Size; import lombok.Data; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; /** @@ -29,37 +27,41 @@ public class OsmoticFlowR implements Serializable { private static final long serialVersionUID = 1L; /** - * 主键 - */ - @TableId(value="id", type= IdType.AUTO) - @Schema(description="主键") - // @Size(max = 0,message = "主键最大长度要小于 0") - @NotBlank(message = "主键不能为空") - private Long id; + * 测点编码 + */ + @TableField(value="station_code") + @MppMultiId + @Schema(description="测点编码") + private String stationCode; /** - * 渗流id - */ - @TableField(value="device_id") - @Schema(description="渗流id") - // @Size(max = 0,message = "渗流id最大长度要小于 0") - private Long deviceId; - - /** - * 渗流量 - */ - @TableField(value="value") - @Schema(description="渗流量") - // @Size(max = 0,message = "渗流量最大长度要小于 0") - private String value; - - /** - * 监测时间 - */ + * 监测时间 + */ + @MppMultiId @TableField(value="tm") @Schema(description="监测时间") - // @Size(max = 0,message = "监测时间最大长度要小于 0") @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") private Date tm; + /** + * 通道号 + */ + @TableField(value="chan") + @Schema(description="通道号") + private String chan; + + /** + * 水深 + */ + @TableField(value="l") + @Schema(description="水深") + private BigDecimal l; + + /** + * 流量 + */ + @TableField(value="q") + @Schema(description="流量") + private BigDecimal q; + } \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/model/OsmoticPressR.java b/src/main/java/com/gunshi/project/xyt/model/OsmoticPressR.java index 53a20da..3068660 100644 --- a/src/main/java/com/gunshi/project/xyt/model/OsmoticPressR.java +++ b/src/main/java/com/gunshi/project/xyt/model/OsmoticPressR.java @@ -1,18 +1,16 @@ package com.gunshi.project.xyt.model; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; import com.gunshi.core.dateformat.DateFormatString; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.Size; import lombok.Data; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; /** @@ -28,38 +26,61 @@ public class OsmoticPressR implements Serializable { private static final long serialVersionUID = 1L; - /** - * 主键 - */ - @TableId(value="id", type= IdType.AUTO) - @Schema(description="主键") - // @Size(max = 0,message = "主键最大长度要小于 0") - @NotBlank(message = "主键不能为空") - private Long id; /** - * 渗流id + * 测点编码 */ - @TableField(value="device_id") - @Schema(description="渗流id") - // @Size(max = 0,message = "渗流id最大长度要小于 0") - private Long deviceId; + @TableField(value="station_code") + @MppMultiId + @Schema(description="测点编码") + private String stationCode; + + /** + * 监测时间 + */ + @MppMultiId + @TableField(value="tm") + @Schema(description="监测时间") + @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") + private Date tm; + + /** + * 通道号 + */ + @TableField(value="chan") + @Schema(description="通道号") + private String chan; /** * 管水位 */ @TableField(value="value") @Schema(description="管水位") - // @Size(max = 0,message = "管水位最大长度要小于 0") - private String value; + private BigDecimal value; /** - * 监测时间 - */ - @TableField(value="tm") - @Schema(description="监测时间") - // @Size(max = 0,message = "监测时间最大长度要小于 0") - @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") - private Date tm; + * 渗压 + */ + @TableField(value="press") + @Schema(description="渗压") + private BigDecimal press; + + /** + * 振弦 + */ + @TableField(value="vib") + @Schema(description="振弦") + private BigDecimal vib; + + /** + * 温度 + */ + @TableField(value="temp") + @Schema(description="温度") + private BigDecimal temp; + + @TableField(exist = false) + @Schema(description = "断面名称") + private String profileName; } \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/model/OsmoticShiftR.java b/src/main/java/com/gunshi/project/xyt/model/OsmoticShiftR.java index 5a550fe..93f8756 100644 --- a/src/main/java/com/gunshi/project/xyt/model/OsmoticShiftR.java +++ b/src/main/java/com/gunshi/project/xyt/model/OsmoticShiftR.java @@ -1,18 +1,16 @@ package com.gunshi.project.xyt.model; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; import com.gunshi.core.dateformat.DateFormatString; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.Size; import lombok.Data; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; /** @@ -29,53 +27,42 @@ public class OsmoticShiftR implements Serializable { private static final long serialVersionUID = 1L; /** - * 主键 - */ - @TableId(value="id", type= IdType.AUTO) - @Schema(description="主键") - // @Size(max = 0,message = "主键最大长度要小于 0") - @NotBlank(message = "主键不能为空") - private Long id; + * 测点编码 + */ + @TableField(value="station_code") + @MppMultiId + @Schema(description="测点编码") + private String stationCode; /** - * 位移id - */ - @TableField(value="device_id") - @Schema(description="位移id") - // @Size(max = 0,message = "位移id最大长度要小于 0") - private Long deviceId; + * 监测时间 + */ + @MppMultiId + @TableField(value="tm") + @Schema(description="监测时间") + @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") + private Date tm; /** * x方向 */ @TableField(value="x") @Schema(description="x方向") - // @Size(max = 0,message = "x方向最大长度要小于 0") - private String x; + private BigDecimal x; /** * y方向 */ @TableField(value="y") @Schema(description="y方向") - // @Size(max = 0,message = "y方向最大长度要小于 0") - private String y; + private BigDecimal y; /** * h方向 */ @TableField(value="h") @Schema(description="h方向") - // @Size(max = 0,message = "h方向最大长度要小于 0") - private String h; + private BigDecimal h; - /** - * 监测时间 - */ - @TableField(value="tm") - @Schema(description="监测时间") - // @Size(max = 0,message = "监测时间最大长度要小于 0") - @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") - private Date tm; } \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/model/OsmoticWarnRule.java b/src/main/java/com/gunshi/project/xyt/model/OsmoticWarnRule.java index ec6b8fe..6dcfa65 100644 --- a/src/main/java/com/gunshi/project/xyt/model/OsmoticWarnRule.java +++ b/src/main/java/com/gunshi/project/xyt/model/OsmoticWarnRule.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; @@ -32,6 +34,7 @@ public class OsmoticWarnRule implements Serializable { @TableId(value="id", type= IdType.AUTO) @Schema(description="主键") @NotBlank(message = "主键不能为空") + @JsonSerialize(using = ToStringSerializer.class) private Long id; /** diff --git a/src/main/java/com/gunshi/project/xyt/model/RescueGoodsFile.java b/src/main/java/com/gunshi/project/xyt/model/RescueGoodsFile.java index cbbb1b7..e280e10 100644 --- a/src/main/java/com/gunshi/project/xyt/model/RescueGoodsFile.java +++ b/src/main/java/com/gunshi/project/xyt/model/RescueGoodsFile.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; import lombok.Data; @@ -38,6 +40,7 @@ public class RescueGoodsFile implements Serializable { */ @TableField(value = "file_id") @Schema(description="文件id") + @JsonSerialize(using = ToStringSerializer.class) private Long fileId; /** diff --git a/src/main/java/com/gunshi/project/xyt/model/RescueTeamB.java b/src/main/java/com/gunshi/project/xyt/model/RescueTeamB.java index c408083..e39649a 100644 --- a/src/main/java/com/gunshi/project/xyt/model/RescueTeamB.java +++ b/src/main/java/com/gunshi/project/xyt/model/RescueTeamB.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.gunshi.core.dateformat.DateFormatString; import com.gunshi.file.model.FileDescriptor; import com.gunshi.project.xyt.service.AbstractModelWithAttachService; @@ -38,6 +40,7 @@ public class RescueTeamB implements Serializable, AbstractModelWithAttachService @TableId(value="team_id", type= IdType.AUTO) @Schema(description="主键") @NotBlank(message = "主键不能为空") + @JsonSerialize(using = ToStringSerializer.class) private Long teamId; /** diff --git a/src/main/java/com/gunshi/project/xyt/model/RescueTeamDetail.java b/src/main/java/com/gunshi/project/xyt/model/RescueTeamDetail.java index 16b31b7..a718aba 100644 --- a/src/main/java/com/gunshi/project/xyt/model/RescueTeamDetail.java +++ b/src/main/java/com/gunshi/project/xyt/model/RescueTeamDetail.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.gunshi.core.dateformat.DateFormatString; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; @@ -34,6 +36,7 @@ public class RescueTeamDetail implements Serializable { @TableId(value="detail_id", type= IdType.AUTO) @Schema(description="主键") @NotBlank(message = "主键不能为空") + @JsonSerialize(using = ToStringSerializer.class) private Long detailId; /** @@ -41,6 +44,7 @@ public class RescueTeamDetail implements Serializable { */ @TableField(value="team_id") @Schema(description="队伍id") + @JsonSerialize(using = ToStringSerializer.class) private Long teamId; /** diff --git a/src/main/java/com/gunshi/project/xyt/model/RescueTeamFile.java b/src/main/java/com/gunshi/project/xyt/model/RescueTeamFile.java index ec60149..9eb239d 100644 --- a/src/main/java/com/gunshi/project/xyt/model/RescueTeamFile.java +++ b/src/main/java/com/gunshi/project/xyt/model/RescueTeamFile.java @@ -6,10 +6,11 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.gunshi.core.dateformat.DateFormatString; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.Size; import lombok.Data; import java.io.Serializable; @@ -34,6 +35,7 @@ public class RescueTeamFile implements Serializable { @TableId(value="id", type= IdType.AUTO) @Schema(description="主键") @NotBlank(message = "主键不能为空") + @JsonSerialize(using = ToStringSerializer.class) private Long id; /** @@ -48,6 +50,7 @@ public class RescueTeamFile implements Serializable { */ @TableField(value="file_id") @Schema(description="文件id") + @JsonSerialize(using = ToStringSerializer.class) private Long fileId; /** diff --git a/src/main/java/com/gunshi/project/xyt/service/OsmoticFlowRService.java b/src/main/java/com/gunshi/project/xyt/service/OsmoticFlowRService.java index c06a583..52b5c07 100644 --- a/src/main/java/com/gunshi/project/xyt/service/OsmoticFlowRService.java +++ b/src/main/java/com/gunshi/project/xyt/service/OsmoticFlowRService.java @@ -1,14 +1,16 @@ package com.gunshi.project.xyt.service; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gunshi.project.xyt.entity.so.OsmoticQueryPageSo; import com.gunshi.project.xyt.mapper.OsmoticFlowRMapper; import com.gunshi.project.xyt.model.OsmoticFlowR; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Date; - /** * 描述: 渗流监测记录表 * author: xusan @@ -20,6 +22,17 @@ import java.util.Date; public class OsmoticFlowRService extends ServiceImpl { + public Page queryPage(OsmoticQueryPageSo osmoticQueryPageSo) { + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + if(osmoticQueryPageSo.getDateTimeRangeSo() != null && osmoticQueryPageSo.getDateTimeRangeSo().getStart() != null){ + wrapper.ge(OsmoticFlowR::getTm,osmoticQueryPageSo.getDateTimeRangeSo().getStart()); + } + if(osmoticQueryPageSo.getDateTimeRangeSo() != null && osmoticQueryPageSo.getDateTimeRangeSo().getEnd() != null){ + wrapper.le(OsmoticFlowR::getTm,osmoticQueryPageSo.getDateTimeRangeSo().getEnd()); + } + wrapper.orderByDesc(OsmoticFlowR::getTm); + return this.page(osmoticQueryPageSo.getPageSo().toPage(),wrapper); + } } diff --git a/src/main/java/com/gunshi/project/xyt/service/OsmoticPressRService.java b/src/main/java/com/gunshi/project/xyt/service/OsmoticPressRService.java index 2ca837d..dcb5100 100644 --- a/src/main/java/com/gunshi/project/xyt/service/OsmoticPressRService.java +++ b/src/main/java/com/gunshi/project/xyt/service/OsmoticPressRService.java @@ -1,14 +1,15 @@ package com.gunshi.project.xyt.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gunshi.project.xyt.entity.so.OsmoticQueryPageSo; import com.gunshi.project.xyt.mapper.OsmoticPressRMapper; import com.gunshi.project.xyt.model.OsmoticPressR; +import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Date; - /** * 描述: 渗压监测记录表 * author: xusan @@ -19,7 +20,12 @@ import java.util.Date; @Transactional(rollbackFor = Exception.class) public class OsmoticPressRService extends ServiceImpl { + @Resource + private OsmoticPressRMapper mapper; + public Page queryPage(OsmoticQueryPageSo osmoticQueryPageSo) { + return mapper.queryPage(osmoticQueryPageSo.getPageSo().toPage(),osmoticQueryPageSo); + } } diff --git a/src/main/java/com/gunshi/project/xyt/service/OsmoticShiftRService.java b/src/main/java/com/gunshi/project/xyt/service/OsmoticShiftRService.java index 56eab0f..fe2b26f 100644 --- a/src/main/java/com/gunshi/project/xyt/service/OsmoticShiftRService.java +++ b/src/main/java/com/gunshi/project/xyt/service/OsmoticShiftRService.java @@ -1,14 +1,17 @@ package com.gunshi.project.xyt.service; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gunshi.project.xyt.entity.so.OsmoticQueryPageSo; import com.gunshi.project.xyt.mapper.OsmoticShiftRMapper; import com.gunshi.project.xyt.model.OsmoticShiftR; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Date; - /** * 描述: 位移监测记录表 * author: xusan @@ -20,6 +23,20 @@ import java.util.Date; public class OsmoticShiftRService extends ServiceImpl { + public Page queryPage(OsmoticQueryPageSo osmoticQueryPageSo) { + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + if(osmoticQueryPageSo.getDateTimeRangeSo() != null && osmoticQueryPageSo.getDateTimeRangeSo().getStart() != null){ + wrapper.ge(OsmoticShiftR::getTm,osmoticQueryPageSo.getDateTimeRangeSo().getStart()); + } + if(osmoticQueryPageSo.getDateTimeRangeSo() != null && osmoticQueryPageSo.getDateTimeRangeSo().getEnd() != null){ + wrapper.le(OsmoticShiftR::getTm,osmoticQueryPageSo.getDateTimeRangeSo().getEnd()); + } + if(StringUtils.isNotEmpty(osmoticQueryPageSo.getStationCode())){ + wrapper.eq(OsmoticShiftR::getStationCode,osmoticQueryPageSo.getStationCode()); + } + wrapper.orderByDesc(OsmoticShiftR::getTm); + return this.page(osmoticQueryPageSo.getPageSo().toPage(),wrapper); + } }