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

1.添加两个字段：管口高程、管底高程。都是数据类型都是浮点，可为空。只是记录用，不参与其他的计算 

2.修改埋设高程字段：把 埋设高程 字段改成必填项，默认值是0。现在已经有这个字段了，可以先将这个字段中，为空的设置为 0 ，然后再修改字段属性
3.修改渗压计到孔底距离字段，改为可为空
4.修改渗压入库公式：在计算时，用“埋设高程”代替“渗压计到孔底距离”字段
5.修改展示：基础信息分页列表去掉“渗压计到孔底距离”，加上“埋设高程”。监测数据列表只是改字，将“管内水位”这几个字改成“测压管水位”
master
李一帆 2022-10-28 10:41:51 +08:00
parent a542ce39dc
commit 51a98cdf44
3 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -155,7 +155,12 @@ public class DeviceDataServiceImpl extends ServiceImpl<DeviceDataMapper, DeviceD
// dd.setPipeZ(decimal.multiply(BigDecimal.valueOf(o_z_modulus)));
//加“渗压计到孔底距离”，浮点（三位小数）同步数据时计算出的管水位加上这个数值
// 2022-10-08 lyf
dd.setPipeZ(decimal.multiply(BigDecimal.valueOf(o_z_modulus)).add(BigDecimal.valueOf(di.getDistFromOsmosisMeterToBottom())));
// dd.setPipeZ(decimal.multiply(BigDecimal.valueOf(o_z_modulus)).add(BigDecimal.valueOf(di.getDistFromOsmosisMeterToBottom())));
// 2022-10-27 lyf
//修改渗压入库公式：在计算时，用“埋设高程”代替“渗压计到孔底距离”字段
System.out.println("修改渗压入库公式：在计算时，用“埋设高程”代替“渗压计到孔底距离”字段");
System.out.println(di.getStationCode() + "---" + di.getEmbeddingElevation());
dd.setPipeZ(decimal.multiply(BigDecimal.valueOf(o_z_modulus)).add(di.getEmbeddingElevation()));
}
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, 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
</select>
@ -43,6 +43,8 @@
<if test="obj.stationCode != null and obj.stationCode != '' ">
AND STATION_CODE LIKE CONCAT('%', #{obj.stationCode}, '%')
</if>
ORDER BY STATION_CODE ASC
</select>
<select id="listBySC" resultType="com.whdc.zhdbaqapi.model.entity.DeviceInfo">