浏览代码

统计信息bug修复。

Jay Lee 6 年之前
父节点
当前提交
0048d52ccf

+ 4 - 4
collect/src/main/java/com/saga/thread/down/CollectThread.java

@@ -251,14 +251,14 @@ public class CollectThread extends Thread {
 						// }
 						// LogUtil.info("handlePacket Ack end...");
 					} else if ("senddownsetack".equalsIgnoreCase(rList[2])) {
-						this.updatePointSet(rList);
-						HBaseUtil.InsertPointCommunicationLog(Constant.agent, Constant.BuildingDB.get(rList[0]),
-								rList[0], this.ip, rList[1], rList[5], (rList[6]), "down", "senddownsetack", rList[4],
-								Constant.format(new Date()), "processing:finish:" + rList[7]);
 						String id = rList[0] + "-" + rList[1] + "-" + rList[4];
 						synchronized (Constant.id2status) {
 							Constant.id2status.put(id, "processing:finish:" + rList[7]);
 						}
+						this.updatePointSet(rList);
+						HBaseUtil.InsertPointCommunicationLog(Constant.agent, Constant.BuildingDB.get(rList[0]),
+								rList[0], this.ip, rList[1], rList[5], (rList[6]), "down", "senddownsetack", rList[4],
+								Constant.format(new Date()), "processing:finish:" + rList[7]);
 
 						// LogUtil.info("id: " + id);
 						// LogUtil.info("InsertPointCommunicationLog" + "

+ 7 - 7
collect/src/main/java/com/saga/thread/up/SendThread.java

@@ -102,14 +102,13 @@ public class SendThread extends Thread {
 							LogUtil.info(this.uploadServer.Name() + " AppendToSend: " + ps.address + " " + sb.toString());
 
 							String id = ps.buildingSignUP + "-" + ps.mac + "-" + ps.ID;
-							synchronized (Constant.id2status) {
-								Constant.id2status.put(id, "finish:finish:" + ps.status);
-							}
-
 							HBaseUtil.InsertPointCommunicationLog(Constant.agent,
 									Constant.BuildingDB.get(ps.buildingSignUP), ps.buildingSignUP, this.ip, ps.mac,
 									ps.meterSign, String.valueOf(ps.funcID), "down", "pointsetack", String.valueOf(ps.ID),
 									Constant.format(new Date()), "finish:finish:" + ps.status);
+							synchronized (Constant.id2status) {
+								Constant.id2status.put(id, "finish:finish:" + ps.status);
+							}
 
 							// CSVUtil.insert(Constant.setlog, new
 							// StringBuffer(Constant.format_Log(new Date())
@@ -134,15 +133,16 @@ public class SendThread extends Thread {
 							LogUtil.info(this.uploadServer.Name() + " AppendToSend: " + ps.address + " " + sb.toString());
 							String id = ps.buildingSignUP + "-" + ps.mac + "-" + ps.ID;
 
-							synchronized (Constant.id2status) {
-								Constant.id2status.put(id, "finish:finish:" + "fail:timeout");
-							}
 							// LogUtil.info("InsertPointCommunicationLog" + "
 							// begin");
 							HBaseUtil.InsertPointCommunicationLog(Constant.agent,
 									Constant.BuildingDB.get(ps.buildingSignUP), ps.buildingSignUP, this.ip, ps.mac,
 									ps.meterSign, String.valueOf(ps.funcID), "down", "pointsetack", String.valueOf(ps.ID),
 									Constant.format(new Date()), "finish:finish:" + "fail:timeout");
+
+							synchronized (Constant.id2status) {
+								Constant.id2status.put(id, "finish:finish:" + "fail:timeout");
+							}
 							// LogUtil.info("InsertPointCommunicationLog" + " end");
 
 							// CSVUtil.insert(Constant.setlog,