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 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 @@ -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