增加对动液面手动计算时新参数的管理

src/main/java/com/hb/proj/data/service/LiquidService.java

@@ -32,7 +32,7 @@ public class LiquidService {
 	public PageModel<LiquidVO> query(String wellId,Date startTime,Date endTime,int pageNo,int pageSize){
 		String sql="""
 					select w.well_name,data_id,test_time,liquid_depth,compute_mode,sound_speed_dev,liquid_depth_dev,casing_press_dev,
-					battery_voltage,sound_speed_factor
+					battery_voltage,sound_speed_factor,sound_speed_calc
 					from tzl_gather_data_liquid d
 					left join tzl_well w on d.well_id=w.well_id
 					where  d.well_id=?  and test_time between ? and ?  
@@ -59,8 +59,8 @@ public class LiquidService {
 		args.addAll(Arrays.asList(liquid.getModifyBy(),liquid.getLiquidSufacePos(),liquid.getWellHeadPos(),liquid.getLiquidDepth(),liquid.getComputeMode()));
 		
 		if(liquid.getComputeMode().equals(LiquidPO.MODE_HOOP)) {
-			sql+=",hoop_start_pos=?,hoop_end_pos=?,avg_length_pipe=?,hoop_count=? ";
-			args.addAll(Arrays.asList(liquid.getHoopStartPos(),liquid.getHoopEndPos(),liquid.getAvgLengthPipe(),liquid.getHoopCount()));
+			sql+=",hoop_start_pos=?,hoop_end_pos=?,avg_length_pipe=?,hoop_count=?,sound_speed_calc=? ";
+			args.addAll(Arrays.asList(liquid.getHoopStartPos(),liquid.getHoopEndPos(),liquid.getAvgLengthPipe(),liquid.getHoopCount(),liquid.getSoundSpeedCalc()));
 		}
 		else if(liquid.getComputeMode().equals(LiquidPO.MODE_SOUND_SPEED)) {
 			sql+=",sound_speed=?,sound_speed_factor=?";
@@ -68,9 +68,10 @@ public class LiquidService {
 			args.add(liquid.getSoundSpeedFactor());
 		}
 		else if(liquid.getComputeMode().equals(LiquidPO.MODE_SOUND_MARK)) {
-			sql+=",sound_mark_pos=?,sound_mark_depth=?";
+			sql+=",sound_mark_pos=?,sound_mark_depth=?,sound_speed_calc=?";
 			args.add(liquid.getSoundMarkPos());
 			args.add(liquid.getSoundMarkDepth());
+			args.add(liquid.getSoundSpeedCalc());
 		}
 		
 		sql+=" where data_id=?";

src/main/java/com/hb/proj/model/LiquidPO.java

@@ -66,4 +66,6 @@ public class LiquidPO {
 	private Double soundSpeedFactor;
 	
 	private Double batteryVoltage;
+	
+	private Double soundSpeedCalc;
 }