|
@@ -2,6 +2,7 @@ package com.saga.thread.down;
|
|
|
|
|
|
import java.util.Date;
|
|
import java.util.Date;
|
|
import java.util.HashMap;
|
|
import java.util.HashMap;
|
|
|
|
+import java.util.List;
|
|
import java.util.Map;
|
|
import java.util.Map;
|
|
import java.util.Map.Entry;
|
|
import java.util.Map.Entry;
|
|
|
|
|
|
@@ -395,8 +396,10 @@ public class CollectThread extends Thread {
|
|
this.updateMeterCollectorControl(rList[0], meterList, p.address);
|
|
this.updateMeterCollectorControl(rList[0], meterList, p.address);
|
|
} else if (rList.length > 6 && "pointread".equalsIgnoreCase(rList[2])) {
|
|
} else if (rList.length > 6 && "pointread".equalsIgnoreCase(rList[2])) {
|
|
// 1101070037;1;pointread;;123;1001;11
|
|
// 1101070037;1;pointread;;123;1001;11
|
|
- //String key = rList[0] + "-" + rList[1] + "-" + rList[5] + "." + rList[6];
|
|
|
|
- //String id = rList[0] + "-" + rList[1] + "-" + rList[4];
|
|
|
|
|
|
+ // String key = rList[0] + "-" + rList[1] + "-" +
|
|
|
|
+ // rList[5] + "." + rList[6];
|
|
|
|
+ // String id = rList[0] + "-" + rList[1] + "-" +
|
|
|
|
+ // rList[4];
|
|
// Constant.id2time.put(key,
|
|
// Constant.id2time.put(key,
|
|
// System.currentTimeMillis());
|
|
// System.currentTimeMillis());
|
|
// Constant.id2point.put(id, key);
|
|
// Constant.id2point.put(id, key);
|
|
@@ -408,8 +411,10 @@ public class CollectThread extends Thread {
|
|
server.AppendToSend(p.address, new Packet(sb1.toString()));
|
|
server.AppendToSend(p.address, new Packet(sb1.toString()));
|
|
LogUtil.info(server.Name() + " AppendToSend: " + p.address + " " + sb.toString());
|
|
LogUtil.info(server.Name() + " AppendToSend: " + p.address + " " + sb.toString());
|
|
} else if (rList.length > 6 && "realtimepointdata".equalsIgnoreCase(rList[2])) {
|
|
} else if (rList.length > 6 && "realtimepointdata".equalsIgnoreCase(rList[2])) {
|
|
- //String key = rList[0] + "-" + rList[1] + "-" + rList[5] + "." + rList[6];
|
|
|
|
- //String id = rList[0] + "-" + rList[1] + "-" + rList[4];
|
|
|
|
|
|
+ // String key = rList[0] + "-" + rList[1] + "-" +
|
|
|
|
+ // rList[5] + "." + rList[6];
|
|
|
|
+ // String id = rList[0] + "-" + rList[1] + "-" +
|
|
|
|
+ // rList[4];
|
|
// Constant.id2time.put(key,
|
|
// Constant.id2time.put(key,
|
|
// System.currentTimeMillis());
|
|
// System.currentTimeMillis());
|
|
// Constant.id2point.put(id, key);
|
|
// Constant.id2point.put(id, key);
|
|
@@ -420,6 +425,34 @@ public class CollectThread extends Thread {
|
|
sb1 = this.getCacheData2(rList);
|
|
sb1 = this.getCacheData2(rList);
|
|
server.AppendToSend(p.address, new Packet(sb1.toString()));
|
|
server.AppendToSend(p.address, new Packet(sb1.toString()));
|
|
LogUtil.info(server.Name() + " AppendToSend: " + p.address + " " + sb.toString());
|
|
LogUtil.info(server.Name() + " AppendToSend: " + p.address + " " + sb.toString());
|
|
|
|
+ } else if ("getdbpointlist".equalsIgnoreCase(rList[2])) {
|
|
|
|
+ // 1101070037;1;getdbpointlist
|
|
|
|
+ // 1101070037;1;getdbpointlistack;1001;2;0;1
|
|
|
|
+ String building = rList[0];
|
|
|
|
+ for (Entry<String, List<Integer>> mfs : HBaseUtil.GetDBPointList(Constant.agent,
|
|
|
|
+ Constant.BuildingDB.get(building), "dy_pointlist", building).entrySet()) {
|
|
|
|
+ StringBuffer sb1 = new StringBuffer();
|
|
|
|
+ sb1.append(building).append(";").append(rList[1]).append(";").append("getdbpointlistack")
|
|
|
|
+ .append(";").append(mfs.getKey()).append(";").append(mfs.getValue().size());
|
|
|
|
+ for (Integer f : mfs.getValue()) {
|
|
|
|
+ sb1.append(";").append(f);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ server.AppendToSend(p.address, new Packet(sb1.toString()));
|
|
|
|
+ LogUtil.info(server.Name() + " AppendToSend: " + p.address + " " + sb.toString());
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ } else if ("updatedbpointlist".equalsIgnoreCase(rList[2])) {
|
|
|
|
+ // 1101070037;1;updatedbpointlist;1001;2;0;Acc;1;Inst
|
|
|
|
+ String building = rList[0];
|
|
|
|
+ String meter = rList[3];
|
|
|
|
+ int count = Integer.valueOf(rList[4]);
|
|
|
|
+ Map<Integer, String> funcidList = new HashMap<Integer, String>();
|
|
|
|
+ for (int i = 0; i < count; i++) {
|
|
|
|
+ funcidList.put(Integer.valueOf(rList[5 + 2 * i]), rList[6 + 2 * i]);
|
|
|
|
+ }
|
|
|
|
+ HBaseUtil.InsertDBPointList(Constant.agent, Constant.BuildingDB.get(building), building, meter,
|
|
|
|
+ funcidList);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
LogUtil.info("CollectThread Challenge Constant.CollectReportList release...");
|
|
LogUtil.info("CollectThread Challenge Constant.CollectReportList release...");
|