瀏覽代碼

Merge branch 'master' into master_activemq

fenghanchao 2 年之前
父節點
當前提交
f46905d6db
共有 2 個文件被更改,包括 2 次插入2 次删除
  1. 1 1
      src/main/java/com/saga/entity/PointSet.java
  2. 1 1
      src/main/java/com/saga/thread/up/UpThread.java

+ 1 - 1
src/main/java/com/saga/entity/PointSet.java

@@ -16,5 +16,5 @@ public class PointSet {
 	public int funcID;
 	public String collectorMAC;
 	public String cmd;
-	public String dataSet;
+	public double dataSet;
 }

+ 1 - 1
src/main/java/com/saga/thread/up/UpThread.java

@@ -301,7 +301,7 @@ public class UpThread extends Thread {
 						ps.mac = MAC;
 						this.pointMac_UP.put(ps.buildingSignUP + "-" + ps.meterSign, rList[1]);
 						ps.funcID = Integer.valueOf(rList[6]);
-						ps.dataSet = (rList[7]);
+						ps.dataSet = Double.valueOf(rList[7]);
 						// String adress = packageRece.address;
 						// String cmd = ps.buildingSign + ";" + ps.ID + ";";
 						// +ps.meterSign + ";" + ps.funcID + ";"