From c148b2a67a6d28b0c71a005254e1fb81500c2547 Mon Sep 17 00:00:00 2001
From: lyf66 <admin@cloudowr.com>
Date: Sat, 8 Oct 2022 11:36:37 +0800
Subject: [PATCH] =?UTF-8?q?DeviceInfo=E6=B7=BB=E5=8A=A0=E2=80=9C=E6=B8=97?=
 =?UTF-8?q?=E5=8E=8B=E8=AE=A1=E5=88=B0=E5=AD=94=E5=BA=95=E8=B7=9D=E7=A6=BB?=
 =?UTF-8?q?=E2=80=9D=20DeviceDataServiceImpl=E5=90=8C=E6=AD=A5=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=97=B6=E8=AE=A1=E7=AE=97=E5=87=BA=E7=9A=84=E7=AE=A1?=
 =?UTF-8?q?=E6=B0=B4=E4=BD=8D=E5=8A=A0=E4=B8=8A=E8=BF=99=E4=B8=AA=E6=95=B0?=
 =?UTF-8?q?=E5=80=BC=20mapper=E5=90=8C=E6=AD=A5=E5=A2=9E=E5=8A=A0=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/whdc/zhdbaqapi/model/entity/DeviceInfo.java  | 8 ++++++++
 .../zhdbaqapi/service/impl/DeviceDataServiceImpl.java     | 5 ++++-
 src/main/resources/mapper/DeviceInfoMapper.xml            | 4 ++--
 3 files changed, 14 insertions(+), 3 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 4d61abe..d7852be 100644
--- a/src/main/java/com/whdc/zhdbaqapi/model/entity/DeviceInfo.java
+++ b/src/main/java/com/whdc/zhdbaqapi/model/entity/DeviceInfo.java
@@ -503,6 +503,14 @@ public class DeviceInfo implements Serializable {
     @TableField("INSTALLATION_POSITION_Z")
     private Double installationPositionZ;
 
+    /**
+     * 渗压计到孔底距离
+     */
+    @ApiParam(value = "渗压计到孔底距离")
+    @ApiModelProperty(value = "渗压计到孔底距离", dataType = "java.lang.Double")
+    @TableField("DIST_FROM_OSMOSIS_METER_TO_BOTTOM")
+    private Double distFromOsmosisMeterToBottom;
+
     /**
      * 安装纬度
      */
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 84882bf..27766de 100644
--- a/src/main/java/com/whdc/zhdbaqapi/service/impl/DeviceDataServiceImpl.java
+++ b/src/main/java/com/whdc/zhdbaqapi/service/impl/DeviceDataServiceImpl.java
@@ -152,7 +152,10 @@ public class DeviceDataServiceImpl extends ServiceImpl<DeviceDataMapper, DeviceD
                         BigDecimal decimal = GR.add(KT);
 
                         dd.setOsmometer(decimal);
-                        dd.setPipeZ(decimal.multiply(BigDecimal.valueOf(o_z_modulus)));
+//                        dd.setPipeZ(decimal.multiply(BigDecimal.valueOf(o_z_modulus)));
+                        //加“渗压计到孔底距离”，浮点（三位小数）同步数据时计算出的管水位加上这个数值
+                        // 2022-10-08 lyf
+                        dd.setPipeZ(decimal.multiply(BigDecimal.valueOf(o_z_modulus)).multiply(BigDecimal.valueOf(di.getDistFromOsmosisMeterToBottom())));
                     }
 
                     if (super.save(dd)) {
diff --git a/src/main/resources/mapper/DeviceInfoMapper.xml b/src/main/resources/mapper/DeviceInfoMapper.xml
index 05353b2..7de48c6 100644
--- a/src/main/resources/mapper/DeviceInfoMapper.xml
+++ b/src/main/resources/mapper/DeviceInfoMapper.xml
@@ -21,7 +21,7 @@
 
     <select id="listAll" resultType="com.whdc.zhdbaqapi.model.entity.DeviceInfo">
         SELECT ID, DEVICE_ID, STATION_CODE, CHANNEL_NUM, LATEST_REPORTING_TIME, TEMPERATURE_K, START_TEMPERATURE,
-        CALIBRATION_COEFFICIENT, INITIAL_READING
+        CALIBRATION_COEFFICIENT, INITIAL_READING, DIST_FROM_OSMOSIS_METER_TO_BOTTOM
         FROM DEVICE_INFO
         WHERE DEL = 0
     </select>
@@ -34,7 +34,7 @@
         RANGE, SENSOR_COEFFICIENT, MANUFACTURER, MEASURING_PROBE_NO, STEADY_WATER_LEVEL, INITIAL_WATER_LEVEL,
         DRILLING_SIZE, DRILLING_NO, TEMPERATURE_K, START_TEMPERATURE, PRESSURE, RECENT_DATA, CALIBRATION_COEFFICIENT,
         INITIAL_READING, LATEST_REPORTING_TIME, CROSS_SECTION, DAM, MOUNTING_HEIGHT, INSTALLATION_POSITION_Z,
-        INSTALLATION_POSITION_Y, INSTALLATION_POSITION_X, STATION_CODE, DEVICE_ID
+        INSTALLATION_POSITION_Y, INSTALLATION_POSITION_X, STATION_CODE, DEVICE_ID, DIST_FROM_OSMOSIS_METER_TO_BOTTOM
         FROM DEVICE_INFO
         WHERE DEL = 0
         <if test="obj.deviceId != null and obj.deviceId != '' ">