采集程序，采集数据标定处理完善

src/main/java/com/hb/proj/gather/business/DataTransUtils.java

@@ -1,5 +1,6 @@
 package com.hb.proj.gather.business;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import com.hb.proj.gather.model.DiagramPO;
@@ -14,12 +15,13 @@ import com.hb.proj.gather.model.WellParamVO;
 public class DataTransUtils {
 	
 	public static void transSingle(SingleInsertPO  singleInsPO,WellParamVO  wp) {
-		transSingle(singleInsPO.getDataVal(),wp.getCalibrateA(),wp.getCalibrateB(),wp.getCalibrateC(),wp.getGatInsScale());
+		Float data=transSingle(singleInsPO.getDataVal(),wp.getCalibrateA(),wp.getCalibrateB(),wp.getCalibrateC(),wp.getGatInsScale());
+		singleInsPO.setDataVal(data);
 	}
 	
 	
 	
-	public static void transSingle(Float data,Double calA,Double calB,Double calC,Double unitScale) {
+	public static Float transSingle(Float data,Double calA,Double calB,Double calC,Double unitScale) {
 		if(calA==null) {
 			calA=0.0;
 		}
@@ -34,17 +36,18 @@ public class DataTransUtils {
 		
 		double d= ((calA*data*data+calB*data+calC)*unitScale);
 		
-		data=Float.parseFloat(String.format("%.3f", d));
+		return Float.parseFloat(String.format("%.3f", d));
 	}
 	
 	public static void transMulti(DiagramPO diaramData,WellParamVO  wp) {
 		
-		transMulti(diaramData.getOths(),wp.getCalibrateA(),wp.getCalibrateB(),wp.getCalibrateC(),wp.getGatInsScale());
-		
-		transMulti(diaramData.getDisps(),wp.getCalibrateA2(),wp.getCalibrateB2(),wp.getCalibrateC2(),wp.getGatInsScale2());
+		List<Float> datas=transMulti(diaramData.getOths(),wp.getCalibrateA(),wp.getCalibrateB(),wp.getCalibrateC(),wp.getGatInsScale());
+		diaramData.setOths(datas);
+		datas=transMulti(diaramData.getDisps(),wp.getCalibrateA2(),wp.getCalibrateB2(),wp.getCalibrateC2(),wp.getGatInsScale2());
+		diaramData.setDisps(datas);
 	}
 	
-	public static void transMulti(List<Float> datas,Double calA,Double calB,Double calC,Double unitScale) {
+	public static List<Float> transMulti(List<Float> datas,Double calA,Double calB,Double calC,Double unitScale) {
 		if(calA==null) {
 			calA=0.0;
 		}
@@ -56,10 +59,12 @@ public class DataTransUtils {
 		}
 		
 		unitScale=unitScale!=null?unitScale:1;
-		
+		List<Float> rtndatas=new ArrayList<>(datas.size());
 		for(Float data : datas) {
-			data=(float)((calA*data*data+calB*data+calC)*unitScale);
+			rtndatas.add((float)((calA*data*data+calB*data+calC)*unitScale));
 		}
+		
+		return rtndatas;
 	}
 	
 }