From da3d1c154f4dfcf67a9557be02941635a7913dd4 Mon Sep 17 00:00:00 2001
From: guo <guo@guo>
Date: Tue, 30 Jan 2024 13:43:26 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vo/CountHighFormworkMeasurePointVo.java    |  6 +++---
 .../entity/vo/DataPerHourForTheLastDayVo.java  | 18 ++++++++++--------
 .../HighFormworkMeasureCurrentDataMapper.xml   |  7 ++++++-
 .../xml/HighFormworkMeasurePointMapper.xml     |  2 +-
 ...hFormworkMeasureCurrentDataServiceImpl.java |  5 +++++
 5 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/vo/CountHighFormworkMeasurePointVo.java b/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/vo/CountHighFormworkMeasurePointVo.java
index 56eef523c..d3a33c547 100644
--- a/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/vo/CountHighFormworkMeasurePointVo.java
+++ b/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/vo/CountHighFormworkMeasurePointVo.java
@@ -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;
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/vo/DataPerHourForTheLastDayVo.java b/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/vo/DataPerHourForTheLastDayVo.java
index 8643fbb20..46bc28440 100644
--- a/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/vo/DataPerHourForTheLastDayVo.java
+++ b/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/vo/DataPerHourForTheLastDayVo.java
@@ -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;
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/xml/HighFormworkMeasureCurrentDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/xml/HighFormworkMeasureCurrentDataMapper.xml
index e559efbbc..57c5994ab 100644
--- a/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/xml/HighFormworkMeasureCurrentDataMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/xml/HighFormworkMeasureCurrentDataMapper.xml
@@ -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}
diff --git a/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/xml/HighFormworkMeasurePointMapper.xml b/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/xml/HighFormworkMeasurePointMapper.xml
index f0bef5f1e..55594ae29 100644
--- a/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/xml/HighFormworkMeasurePointMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/xml/HighFormworkMeasurePointMapper.xml
@@ -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
diff --git a/src/main/java/com/zhgd/xmgl/modules/highformwork/service/impl/HighFormworkMeasureCurrentDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/highformwork/service/impl/HighFormworkMeasureCurrentDataServiceImpl.java
index dd1b8ab23..bce720110 100644
--- a/src/main/java/com/zhgd/xmgl/modules/highformwork/service/impl/HighFormworkMeasureCurrentDataServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/highformwork/service/impl/HighFormworkMeasureCurrentDataServiceImpl.java
@@ -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);
             }
         }