diff --git a/src/main/java/com/gunshi/project/xyt/controller/SysDictBController.java b/src/main/java/com/gunshi/project/xyt/controller/SysDictBController.java index 7a4e867..99d9c8b 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/SysDictBController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/SysDictBController.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.IdWorker; +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; @@ -104,7 +106,9 @@ public class SysDictBController { @PostMapping("/page") public R> page(@RequestBody GenericPageParams page) { - Page data = service.page(page.getPageSo().toPage(), service.lambdaQuery().isNull(SysDictB::getPid)); + LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(); + + Page data = service.page(page.getPageSo().toPage(), queryWrapper.isNull(SysDictB::getPid)); return R.ok(data); } diff --git a/src/main/java/com/gunshi/project/xyt/model/OsmoticPressDevice.java b/src/main/java/com/gunshi/project/xyt/model/OsmoticPressDevice.java index d21d02f..242c747 100644 --- a/src/main/java/com/gunshi/project/xyt/model/OsmoticPressDevice.java +++ b/src/main/java/com/gunshi/project/xyt/model/OsmoticPressDevice.java @@ -15,6 +15,7 @@ import jakarta.validation.constraints.Size; import lombok.Data; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; import java.util.List; @@ -127,7 +128,7 @@ public class OsmoticPressDevice implements Serializable { @TableField(value="sensitivity") @Schema(description="灵敏度") // @Size(max = 0,message = "灵敏度最大长度要小于 0") - private String sensitivity; + private BigDecimal sensitivity; /** * 温度修正系数 @@ -135,7 +136,35 @@ public class OsmoticPressDevice implements Serializable { @TableField(value="temp_cor_coe") @Schema(description="温度修正系数") // @Size(max = 0,message = "温度修正系数最大长度要小于 0") - private String tempCorCoe; + private BigDecimal tempCorCoe; + + /** + * 温度实时测量值T + */ + @TableField(value="t") + @Schema(description="温度实时测量值T") + private BigDecimal t; + + /** + * 温度的基准值T₀ + */ + @TableField(value="t") + @Schema(description="温度的基准值T₀") + private BigDecimal t0; + + /** + * 气压的基准值Q₀ + */ + @TableField(value="q0") + @Schema(description="气压的基准值Q₀") + private BigDecimal q0; + + /** + * 气压实时测量值Q + */ + @TableField(value="q") + @Schema(description="气压实时测量值Q") + private BigDecimal q; /** * 非直线度 @@ -143,7 +172,7 @@ public class OsmoticPressDevice implements Serializable { @TableField(value="l") @Schema(description="非直线度") // @Size(max = 0,message = "非直线度最大长度要小于 0") - private String l; + private BigDecimal l; /** * 不重复度 @@ -151,7 +180,7 @@ public class OsmoticPressDevice implements Serializable { @TableField(value="r") @Schema(description="不重复度") // @Size(max = 0,message = "不重复度最大长度要小于 0") - private String r; + private BigDecimal r; /** * 滞后 @@ -159,7 +188,7 @@ public class OsmoticPressDevice implements Serializable { @TableField(value="h") @Schema(description="滞后") // @Size(max = 0,message = "滞后最大长度要小于 0") - private String h; + private BigDecimal h; /** * 综合误差 @@ -167,7 +196,7 @@ public class OsmoticPressDevice implements Serializable { @TableField(value="ec") @Schema(description="综合误差") // @Size(max = 0,message = "综合误差最大长度要小于 0") - private String ec; + private BigDecimal ec; /** * 分辨力 @@ -175,7 +204,7 @@ public class OsmoticPressDevice implements Serializable { @TableField(value="re") @Schema(description="分辨力") // @Size(max = 0,message = "分辨力最大长度要小于 0") - private String re; + private BigDecimal re; /** * 经度