* 协议测试接口

+ 回带量

bd-park/park-backend/park-collect/src/main/java/com/huashe/park/collect/event/MachineRealtimeEventListener.java

@@ -57,8 +57,8 @@ public class MachineRealtimeEventListener {
         pileHoleIndexRealtime.setSprayPressure(event.getMessage().getSprayPressure());
         pileHoleIndexRealtime.setTiltAngle(event.getMessage().getTiltAngle());
         pileHoleIndexRealtime.setForwardTiltAngle(event.getMessage().getForwardTiltAngle());
-        // 回带量
-        pileHoleIndexRealtime.setSprayVolume(event.getMessage().getSprayVolume());
+        // 送带量
+        pileHoleIndexRealtime.setSendSprayVolume(event.getMessage().getSprayVolume());
         pileHoleIndexRealtime.setVerticalDeviation(event.getMessage().getVerticalAngle());
         pileHoleIndexRealtime.setStatus(CONS_STATUS_02.getCode());
         pileHoleIndexRealtime.setRealLat(event.getMessage().getLatitude());

bd-park/park-backend/park-core/src/main/resources/mapper/cons/ConsPileHoleInfoMapper.xml

@@ -63,9 +63,10 @@
         cphir.current,
         cphir.vertical_deviation,
         cphir.spray_volume,
+        cphir.send_spray_volume,
         cphir.spray_pressure,
-        cphir.start_time,
-        cphir.end_time,
+        cphir.start_time index_start_time,
+        cphir.end_time index_end_time,
         cphir.status,
         cphir.tilt_angle,
         cphir.forward_tilt_angle,

bd-park/park-backend/park-core/src/main/resources/mapper/cons/PileHoleIndexRealtimeMapper.xml

@@ -14,6 +14,7 @@
         <result property="current" column="current"/>
         <result property="verticalDeviation" column="vertical_deviation"/>
         <result property="sprayVolume" column="spray_volume"/>
+        <result property="sendSprayVolume" column="send_spray_volume"/>
         <result property="sprayPressure" column="spray_pressure"/>
         <result property="startTime" column="start_time"/>
         <result property="endTime" column="end_time"/>
@@ -43,6 +44,7 @@
                `current`,
                vertical_deviation,
                spray_volume,
+               send_spray_volume,
                spray_pressure,
                start_time,
                end_time,
@@ -99,6 +101,7 @@
             <if test="current != null">current,</if>
             <if test="verticalDeviation != null">vertical_deviation,</if>
             <if test="sprayVolume != null">spray_volume,</if>
+            <if test="sendSprayVolume != null">send_spray_volume,</if>
             <if test="sprayPressure != null">spray_pressure,</if>
             <if test="startTime != null">start_time,</if>
             <if test="endTime != null">end_time,</if>
@@ -125,6 +128,7 @@
             <if test="current != null">#{current},</if>
             <if test="verticalDeviation != null">#{verticalDeviation},</if>
             <if test="sprayVolume != null">#{sprayVolume},</if>
+            <if test="sendSprayVolume != null">#{sendSprayVolume},</if>
             <if test="sprayPressure != null">#{sprayPressure},</if>
             <if test="startTime != null">#{startTime},</if>
             <if test="endTime != null">#{endTime},</if>
@@ -155,6 +159,7 @@
             <if test="current != null">current = #{current},</if>
             <if test="verticalDeviation != null">vertical_deviation = #{verticalDeviation},</if>
             <if test="sprayVolume != null">spray_volume = #{sprayVolume},</if>
+            <if test="sendSprayVolume != null">send_spray_volume = #{sendSprayVolume},</if>
             <if test="sprayPressure != null">spray_pressure = #{sprayPressure},</if>
             <if test="startTime != null">start_time = #{startTime},</if>
             <if test="endTime != null">end_time = #{endTime},</if>
@@ -182,6 +187,7 @@
             <if test="current != null">current = #{current},</if>
             <if test="verticalDeviation != null">vertical_deviation = #{verticalDeviation},</if>
             <if test="sprayVolume != null">spray_volume = #{sprayVolume},</if>
+            <if test="sendSprayVolume != null">send_spray_volume = #{sendSprayVolume},</if>
             <if test="sprayPressure != null">spray_pressure = #{sprayPressure},</if>
             <if test="startTime != null">start_time = #{startTime},</if>
             <if test="endTime != null">end_time = #{endTime},</if>

bd-park/park-backend/park-domain/src/main/java/com/huashe/park/domain/dto/cons/PileRealtimeIndex.java

@@ -34,9 +34,12 @@ public class PileRealtimeIndex extends ConsPileHoleInfo {
     private Double verticalDeviation;
 
     /** 灌浆体积（m³）ups200送带量 */
-    @Excel(name = "灌浆体积", readConverterExp = "m=³")
+    @Excel(name = "回带量", readConverterExp = "m=³")
     private Double sprayVolume;
 
+    @Excel(name = "送带量", readConverterExp = "m=³")
+    private Double sendSprayVolume;
+
     /** 喷浆压力 ups200 压力值 */
     @Excel(name = "喷浆压力 ups200 压力值")
     private Double sprayPressure;
@@ -44,12 +47,12 @@ public class PileRealtimeIndex extends ConsPileHoleInfo {
     /** 开始时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd  HH:mm:ss")
-    private Date startTime;
+    private Date indexStartTime;
 
     /** 结束时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd  HH:mm:ss")
-    private Date endTime;
+    private Date indexEndTime;
 
     /** 桩点状态 */
     @Excel(name = "桩点状态")

bd-park/park-backend/park-domain/src/main/java/com/huashe/park/domain/entity/PileHoleIndexRealtime.java

@@ -65,9 +65,12 @@ public class PileHoleIndexRealtime extends BaseEntity {
     private Float verticalDeviation;
 
     /** 灌浆体积（m³）ups200送带量 */
-    @Excel(name = "灌浆体积", readConverterExp = "m=³")
+    @Excel(name = "回带量", readConverterExp = "m=³")
     private Float sprayVolume;
 
+    @Excel(name = "送带量", readConverterExp = "m=³")
+    private Float sendSprayVolume;
+
     /** 喷浆压力 ups200 压力值 */
     @Excel(name = "喷浆压力 ups200 压力值")
     private Float sprayPressure;