|
@@ -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,
|