lyf
/
fxkh-txl-service
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DeviceInfo添加“渗压计到孔底距离” 

DeviceDataServiceImpl同步数据时计算出的管水位加上这个数值
mapper同步增加字段
master
李一帆 2022-10-08 11:36:37 +08:00
parent 1175d7d58b
commit c148b2a67a
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/whdc/zhdbaqapi/model/entity/DeviceInfo.java
View File

@ -503,6 +503,14 @@ public class DeviceInfo implements Serializable {
@TableField("INSTALLATION_POSITION_Z") @TableField("INSTALLATION_POSITION_Z")
private Double installationPositionZ; private Double installationPositionZ;
/**
* 渗压计到孔底距离
*/
@ApiParam(value = "渗压计到孔底距离")
@ApiModelProperty(value = "渗压计到孔底距离", dataType = "java.lang.Double")
@TableField("DIST_FROM_OSMOSIS_METER_TO_BOTTOM")
private Double distFromOsmosisMeterToBottom;
/** /**
* 安装纬度 * 安装纬度
*/ */

5
src/main/java/com/whdc/zhdbaqapi/service/impl/DeviceDataServiceImpl.java
View File

@ -152,7 +152,10 @@ public class DeviceDataServiceImpl extends ServiceImpl<DeviceDataMapper, DeviceD
BigDecimal decimal = GR.add(KT); BigDecimal decimal = GR.add(KT);
dd.setOsmometer(decimal); 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)) { if (super.save(dd)) {

4
src/main/resources/mapper/DeviceInfoMapper.xml
View File

@ -21,7 +21,7 @@
<select id="listAll" resultType="com.whdc.zhdbaqapi.model.entity.DeviceInfo"> <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, 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 FROM DEVICE_INFO
WHERE DEL = 0 WHERE DEL = 0
</select> </select>
@ -34,7 +34,7 @@
RANGE, SENSOR_COEFFICIENT, MANUFACTURER, MEASURING_PROBE_NO, STEADY_WATER_LEVEL, INITIAL_WATER_LEVEL, 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, 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, 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 FROM DEVICE_INFO
WHERE DEL = 0 WHERE DEL = 0
<if test="obj.deviceId != null and obj.deviceId != '' "> <if test="obj.deviceId != null and obj.deviceId != '' ">