diff --git a/bjairCApi/src/main/java/com/iformall/controller/HaiKangController.java b/bjairCApi/src/main/java/com/iformall/controller/HaiKangController.java index 9a39065..916bbdb 100644 --- a/bjairCApi/src/main/java/com/iformall/controller/HaiKangController.java +++ b/bjairCApi/src/main/java/com/iformall/controller/HaiKangController.java @@ -103,6 +103,7 @@ public class HaiKangController { //打印json格式上传的事件报文 String baowen = fi.getString("UTF-8"); //通过表单name属性进行解析报文 + logger.debug(">>>>>>>>>>"+baowen); switch (fi.getFieldName()) { case "event_log"://门禁、身份证事件解析 logger.info("receive Acs event"); diff --git a/bjairCApi/src/main/java/com/iformall/controller/haikang/TcpServer.java b/bjairCApi/src/main/java/com/iformall/controller/haikang/TcpServer.java index c39e037..9a490a3 100644 --- a/bjairCApi/src/main/java/com/iformall/controller/haikang/TcpServer.java +++ b/bjairCApi/src/main/java/com/iformall/controller/haikang/TcpServer.java @@ -7,6 +7,7 @@ import java.io.PrintWriter; import java.net.ServerSocket; import java.net.Socket; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Map; import javax.annotation.PostConstruct; @@ -90,29 +91,30 @@ public class TcpServer { String func = mo.getString("func"); //心跳 if ("KeepOnline".equals(func)) { + Map keepMap = new LinkedHashMap(); String dest = mo.getString("dest"); String source = mo.getString("source"); - mo.put("dest", source); - mo.put("source", dest); - mo.put("func", "AckKeepOnline"); + keepMap.put("dest", source); + keepMap.put("source", dest); + keepMap.put("func", "AckKeepOnline"); JSONArray datas = new JSONArray(); Map dm = new HashMap(); dm.put("node", "OK"); datas.add(dm); - mo.put("data", datas); - String xintiaoresult = JSON.toJSONString(mo); + keepMap.put("data", datas); + String xintiaoresult = JSON.toJSONString(keepMap); log.debug("haikang keepOnline result:"+xintiaoresult); out.println(xintiaoresult); //给灯箱发送 for (int i = 0 ; i < types.length ; i++) { - JSONObject dxobj = new JSONObject(); + Map dxobj = new LinkedHashMap(); dxobj.put("dest", source); dxobj.put("source", dest); dxobj.put("func", "ControlData"); JSONArray datas1 = new JSONArray(); Map dm1 = new HashMap(); - dm1.put("node", generateNode(types[i])); + dm1.put("node", generateNode(types[i],source)); datas1.add(dm1); dxobj.put("data", datas1); String dengxiangcontent = JSON.toJSONString(dxobj); @@ -123,7 +125,7 @@ public class TcpServer { } //编号2代表需要等待时长,编号3代表当前排队人数,编号4代表当前场内出租车,编号5代表在途出租车 - private String generateNode(int type) { + private String generateNode(int type,String sn) { StringBuffer sb = new StringBuffer("0-5-").append(type).append("-"); int value = 0; switch (type) { @@ -142,7 +144,7 @@ public class TcpServer { default: break; } - sb.append(value).append("-0-1-0"); + sb.append(value).append("-0-1-"+sn); return sb.toString(); }