动液面增加参数及相关接口

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

@@ -31,7 +31,8 @@ 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
+					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
 					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 ?  
@@ -62,8 +63,9 @@ public class LiquidService {
 			args.addAll(Arrays.asList(liquid.getHoopStartPos(),liquid.getHoopEndPos(),liquid.getAvgLengthPipe(),liquid.getHoopCount()));
 		}
 		else if(liquid.getComputeMode().equals(LiquidPO.MODE_SOUND_SPEED)) {
-			sql+=",sound_speed=?";
+			sql+=",sound_speed=?,sound_speed_factor=?";
 			args.add(liquid.getSoundSpeed());
+			args.add(liquid.getSoundSpeedFactor());
 		}
 		else if(liquid.getComputeMode().equals(LiquidPO.MODE_SOUND_MARK)) {
 			sql+=",sound_mark_pos=?,sound_mark_depth=?";

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

@@ -62,4 +62,8 @@ public class LiquidPO {
 	private String modifyBy;
 	
 	private Date modifyTime;
+	
+	private Double soundSpeedFactor;
+	
+	private Double batteryVoltage;
 }