* 协议变更

bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/service/impl/MachineProcessResultServiceImpl.java

@@ -112,6 +112,9 @@ public class MachineProcessResultServiceImpl implements IMachineProcessResultSer
             // 评价结果转换
             ConsResult consResult = ConsResult.getByCode(consUnitResult.getResultEvaluation());
             resultCADCsv.setEvaluation(consResult.getValue());
+            resultCADCsv.setPullValue(consUnitResult.getSprayVolume());
+            resultCADCsv.setActualDepth(consUnitResult.getPileLength());
+            resultCADCsv.setEndingPress(consUnitResult.getPressure());
             resultCADCsvs.add(resultCADCsv);
         }
         return resultCADCsvs;

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

@@ -447,7 +447,8 @@
         select cmpr.*,
                cphir.forward_tilt_angle,
                cphir.tilt_angle,
-               cphir.hole_num
+               cphir.hole_num,
+               cphir.spray_pressure pressure
         from cons_machine_process_result cmpr
                  inner join cons_pile_hole_index_realtime cphir on
             cmpr.pile_id = cphir.hole_byte_key

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

@@ -9,6 +9,8 @@ public class ConsUnitResult extends MachineProcessResult {
 
     private String holeNum;
 
+    private Double pressure;
+
     public Double getForwardTiltAngle() {
         return forwardTiltAngle;
     }
@@ -32,4 +34,12 @@ public class ConsUnitResult extends MachineProcessResult {
     public void setHoleNum(String holeNum) {
         this.holeNum = holeNum;
     }
+
+    public Double getPressure() {
+        return pressure;
+    }
+
+    public void setPressure(Double pressure) {
+        this.pressure = pressure;
+    }
 }