admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
guo 2024-01-30 13:43:26 +08:00
parent 7c5508901a
commit da3d1c154f
5 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/zhgd/xmgl/modules/highformwork/entity/vo/CountHighFormworkMeasurePointVo.java
View File

@ -6,9 +6,9 @@ import lombok.Data;
@Data
public class CountHighFormworkMeasurePointVo {
@ApiModelProperty(value = "总监测点位数")
private String totalPointNum;
private Integer totalPointNum;
@ApiModelProperty(value = "报警点位数")
private String alarmPointNum;
private Integer alarmPointNum;
@ApiModelProperty(value = "监测中点位数")
private String monitoringPointNum;
private Integer monitoringPointNum;
}

18
src/main/java/com/zhgd/xmgl/modules/highformwork/entity/vo/DataPerHourForTheLastDayVo.java
View File

@ -15,12 +15,14 @@ public class DataPerHourForTheLastDayVo {
private String pressure;
@ApiModelProperty(value = "沉降（mm）值")
private String subside;
/*
立杆轴力
水平位移
模板沉降
立杆倾斜
地基沉降
*/
@ApiModelProperty(value = "立杆轴力")
private java.lang.String poleAxialForce;
@ApiModelProperty(value = "水平位移")
private java.lang.String horizontalDisplacement;
@ApiModelProperty(value = "模板沉降")
private java.lang.String formworkSettlement;
@ApiModelProperty(value = "立杆倾斜")
private java.lang.String poleTilt;
@ApiModelProperty(value = "地基沉降")
private java.lang.String foundationSettlement;
}

7
src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/xml/HighFormworkMeasureCurrentDataMapper.xml
View File

@ -59,7 +59,12 @@
avg(cd.angle_x_axis) as angle_x_axis,
avg(cd.angle_y_axis) as angle_y_axis,
avg(cd.pressure) as pressure,
avg(cd.subside) as subside
avg(cd.subside) as subside,
avg(cd.pole_axial_force) as pole_axial_force,
avg(cd.horizontal_displacement) as horizontal_displacement,
avg(cd.formwork_settlement) as formwork_settlement,
avg(cd.pole_tilt) as pole_tilt,
avg(cd.foundation_settlement) as foundation_settlement
from high_formwork_measure_current_data cd
where cd.project_sn = #{projectSn}
and cd.measure_point_number = #{measurePointNumber}

2
src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/xml/HighFormworkMeasurePointMapper.xml
View File

@ -60,7 +60,7 @@
resultType="com.zhgd.xmgl.modules.highformwork.entity.vo.CountHighFormworkMeasurePointVo">
select count(distinct hfmp.id) totalPointNum,
count(distinct hfad.measure_point_id) alarmPointNum,
count(distinct hfmcd.measure_point_number) currentPointNum
count(distinct hfmcd.measure_point_number) monitoringPointNum
from high_formwork_measure_point hfmp
left join high_formwork_alarm_data hfad on hfmp.id = hfad.measure_point_id
left join high_formwork_measure_current_data hfmcd on hfmcd.measure_point_number = hfmp.measure_point_number

5
src/main/java/com/zhgd/xmgl/modules/highformwork/service/impl/HighFormworkMeasureCurrentDataServiceImpl.java
View File

@ -181,6 +181,11 @@ public class HighFormworkMeasureCurrentDataServiceImpl extends ServiceImpl<HighF
v.setAngleYAxis("0");
v.setPressure("0");
v.setSubside("0");
v.setPoleAxialForce("0");
v.setHorizontalDisplacement("0");
v.setFormworkSettlement("0");
v.setPoleTilt("0");
v.setFoundationSettlement("0");
list.add(v);
}
}