From 51a98cdf44ddceebd01b6df96e5ce0e85ae7f240 Mon Sep 17 00:00:00 2001 From: lyf66 Date: Fri, 28 Oct 2022 10:41:51 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E4=B8=A4=E4=B8=AA=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=EF=BC=9A=E7=AE=A1=E5=8F=A3=E9=AB=98=E7=A8=8B=E3=80=81?= =?UTF-8?q?=E7=AE=A1=E5=BA=95=E9=AB=98=E7=A8=8B=E3=80=82=E9=83=BD=E6=98=AF?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B=E9=83=BD=E6=98=AF=E6=B5=AE?= =?UTF-8?q?=E7=82=B9=EF=BC=8C=E5=8F=AF=E4=B8=BA=E7=A9=BA=E3=80=82=E5=8F=AA?= =?UTF-8?q?=E6=98=AF=E8=AE=B0=E5=BD=95=E7=94=A8=EF=BC=8C=E4=B8=8D=E5=8F=82?= =?UTF-8?q?=E4=B8=8E=E5=85=B6=E4=BB=96=E7=9A=84=E8=AE=A1=E7=AE=97=202.?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9F=8B=E8=AE=BE=E9=AB=98=E7=A8=8B=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=EF=BC=9A=E6=8A=8A=20=E5=9F=8B=E8=AE=BE=E9=AB=98?= =?UTF-8?q?=E7=A8=8B=20=E5=AD=97=E6=AE=B5=E6=94=B9=E6=88=90=E5=BF=85?= =?UTF-8?q?=E5=A1=AB=E9=A1=B9=EF=BC=8C=E9=BB=98=E8=AE=A4=E5=80=BC=E6=98=AF?= =?UTF-8?q?0=E3=80=82=E7=8E=B0=E5=9C=A8=E5=B7=B2=E7=BB=8F=E6=9C=89?= =?UTF-8?q?=E8=BF=99=E4=B8=AA=E5=AD=97=E6=AE=B5=E4=BA=86=EF=BC=8C=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E5=85=88=E5=B0=86=E8=BF=99=E4=B8=AA=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=B8=AD=EF=BC=8C=E4=B8=BA=E7=A9=BA=E7=9A=84=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E4=B8=BA=200=20=EF=BC=8C=E7=84=B6=E5=90=8E=E5=86=8D=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=AD=97=E6=AE=B5=E5=B1=9E=E6=80=A7=203.=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=B8=97=E5=8E=8B=E8=AE=A1=E5=88=B0=E5=AD=94=E5=BA=95?= =?UTF-8?q?=E8=B7=9D=E7=A6=BB=E5=AD=97=E6=AE=B5=EF=BC=8C=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E5=8F=AF=E4=B8=BA=E7=A9=BA=204.=E4=BF=AE=E6=94=B9=E6=B8=97?= =?UTF-8?q?=E5=8E=8B=E5=85=A5=E5=BA=93=E5=85=AC=E5=BC=8F=EF=BC=9A=E5=9C=A8?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=E6=97=B6=EF=BC=8C=E7=94=A8=E2=80=9C=E5=9F=8B?= =?UTF-8?q?=E8=AE=BE=E9=AB=98=E7=A8=8B=E2=80=9D=E4=BB=A3=E6=9B=BF=E2=80=9C?= =?UTF-8?q?=E6=B8=97=E5=8E=8B=E8=AE=A1=E5=88=B0=E5=AD=94=E5=BA=95=E8=B7=9D?= =?UTF-8?q?=E7=A6=BB=E2=80=9D=E5=AD=97=E6=AE=B5=205.=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=EF=BC=9A=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E5=88=97=E8=A1=A8=E5=8E=BB=E6=8E=89=E2=80=9C?= =?UTF-8?q?=E6=B8=97=E5=8E=8B=E8=AE=A1=E5=88=B0=E5=AD=94=E5=BA=95=E8=B7=9D?= =?UTF-8?q?=E7=A6=BB=E2=80=9D=EF=BC=8C=E5=8A=A0=E4=B8=8A=E2=80=9C=E5=9F=8B?= =?UTF-8?q?=E8=AE=BE=E9=AB=98=E7=A8=8B=E2=80=9D=E3=80=82=E7=9B=91=E6=B5=8B?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=97=E8=A1=A8=E5=8F=AA=E6=98=AF=E6=94=B9?= =?UTF-8?q?=E5=AD=97=EF=BC=8C=E5=B0=86=E2=80=9C=E7=AE=A1=E5=86=85=E6=B0=B4?= =?UTF-8?q?=E4=BD=8D=E2=80=9D=E8=BF=99=E5=87=A0=E4=B8=AA=E5=AD=97=E6=94=B9?= =?UTF-8?q?=E6=88=90=E2=80=9C=E6=B5=8B=E5=8E=8B=E7=AE=A1=E6=B0=B4=E4=BD=8D?= =?UTF-8?q?=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/whdc/zhdbaqapi/model/entity/DeviceInfo.java | 11 +++++++++++ .../zhdbaqapi/service/impl/DeviceDataServiceImpl.java | 7 ++++++- src/main/resources/mapper/DeviceInfoMapper.xml | 4 +++- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/whdc/zhdbaqapi/model/entity/DeviceInfo.java b/src/main/java/com/whdc/zhdbaqapi/model/entity/DeviceInfo.java index d7852be..626c98c 100644 --- a/src/main/java/com/whdc/zhdbaqapi/model/entity/DeviceInfo.java +++ b/src/main/java/com/whdc/zhdbaqapi/model/entity/DeviceInfo.java @@ -344,6 +344,7 @@ public class DeviceInfo implements Serializable { @ApiParam(value = "埋设高程（m）") @ApiModelProperty(value = "埋设高程（m）", dataType = "java.math.BigDecimal") @Excel(name = "埋设高程（m）") + @NotNull(message = "埋设高程必填") @TableField("EMBEDDING_ELEVATION") private BigDecimal embeddingElevation; @@ -530,4 +531,14 @@ public class DeviceInfo implements Serializable { @Excel(name = "埋设示意图说明", type = 2, savePath = "img") @TableField(exist = false) private String picPath; + + @ApiParam(value = "管口高程") + @ApiModelProperty(value = "管口高程", dataType = "java.lang.Double") + @TableField("PIPE_TOP_HEIGHT") + private Double pipeTopHeight; + + @ApiParam(value = "管底高程") + @ApiModelProperty(value = "管底高程", dataType = "java.lang.Double") + @TableField("PIPE_BOTTOM_HEIGHT") + private Double pipeBottomHeight; } diff --git a/src/main/java/com/whdc/zhdbaqapi/service/impl/DeviceDataServiceImpl.java b/src/main/java/com/whdc/zhdbaqapi/service/impl/DeviceDataServiceImpl.java index 9bed68b..57d4ea7 100644 --- a/src/main/java/com/whdc/zhdbaqapi/service/impl/DeviceDataServiceImpl.java +++ b/src/main/java/com/whdc/zhdbaqapi/service/impl/DeviceDataServiceImpl.java @@ -155,7 +155,12 @@ public class DeviceDataServiceImpl extends ServiceImpl SELECT ID, DEVICE_ID, STATION_CODE, CHANNEL_NUM, LATEST_REPORTING_TIME, TEMPERATURE_K, START_TEMPERATURE, - CALIBRATION_COEFFICIENT, INITIAL_READING, DIST_FROM_OSMOSIS_METER_TO_BOTTOM + CALIBRATION_COEFFICIENT, INITIAL_READING, DIST_FROM_OSMOSIS_METER_TO_BOTTOM, EMBEDDING_ELEVATION FROM DEVICE_INFO WHERE DEL = 0 @@ -43,6 +43,8 @@ AND STATION_CODE LIKE CONCAT('%', #{obj.stationCode}, '%') + + ORDER BY STATION_CODE ASC