1.增加新设备的特性解析

2.增加协和特殊情况支持两台设备

src/main/java/com/dashitech/callcenter/socket/HandlerThread.java

@@ -5,6 +5,7 @@ import com.dashitech.businessdata.dao.IDepartmentDAO;
 import com.dashitech.businessdata.dao.IDictionaryDAO;
 import com.dashitech.businessdata.dao.IHospitalConfigDAO;
 import com.dashitech.businessdata.entity.CallLogEntity;
+import com.dashitech.businessdata.entity.DictionaryEntity;
 import com.dashitech.businessdata.entity.HospitalConfig;
 import com.dashitech.callcenter.webSocket.service.PhoneWebSocket;
 import com.dashitech.utils.JsonUtil;
@@ -12,6 +13,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import net.sf.json.JSONObject;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.stereotype.Service;
 
 import java.io.DataInputStream;
@@ -105,7 +107,7 @@ public class HandlerThread  {
                         reset = "addrec";
                     }
                 }
-                if (data != null && data.length() >= 10) {
+                if (data != null && data.length() >= 10){
                     String dataStr = "";
                     if (reset.equals("addrec")){
                         dataStr = "{\"cmd\":\""+reset+"\",\"error\":\"0\", \"timestamp\":\""+(System.currentTimeMillis() / 1000)+"\"}";
@@ -113,8 +115,18 @@ public class HandlerThread  {
                         dataStr = "{\"cmd\":\""+reset+"\", \"timestamp\":\""+(System.currentTimeMillis() / 1000)+"\"}";
                     }
                     if (data.indexOf("loginreq") >= 0){
-                        his = JsonUtil.toJSONObject(data).getString("sernelNo");
-                        his = callLogDAO.selectSernelNo("sernelNo",his);
+                        //{"cmd":"loginreq","ipaddr":"192.168.25.37","serialNo":"21380501019804","recordNumber":4,"webport":80,"filestoretype":0}his
+                        if(JsonUtil.toJSONObject(data).containsKey("serialNo")){
+                            his = JsonUtil.toJSONObject(data).getString("serialNo");
+                        }else{
+                            his = JsonUtil.toJSONObject(data).getString("sernelNo");
+                        }
+                        // 设备 21040501017523 写死支持 院区1
+                        if(his.equals("21040501017523")){
+                            his = "1";
+                        }else{
+                            his = callLogDAO.selectSernelNo("sernelNo",his);
+                        }
                         dataStr = "{\"cmd\":\"loginres\", \"error\":\"0\", \"timestamp\":\"" + (System.currentTimeMillis() / 1000) + "\"}";
                     }
                     System.out.println("redate>>"+dataStr+"his"+his);

src/main/java/com/dashitech/callcenter/webSocket/service/PhoneWebSocket.java

@@ -8,6 +8,8 @@ import com.dashitech.callcenter.webSocket.core.WebSocketSender;
 import com.dashitech.utils.JsonUtil;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import net.sf.json.JSONObject;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.atmosphere.cache.UUIDBroadcasterCache;
 import org.atmosphere.client.TrackMessageSizeInterceptor;
 import org.atmosphere.config.service.WebSocketHandlerService;
@@ -18,6 +20,7 @@ import org.atmosphere.websocket.WebSocketProcessor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.annotation.WebServlet;
 import java.io.IOException;
 import java.util.*;
 
@@ -28,7 +31,7 @@ import java.util.*;
 /**
  * 给前端推送消息
  */
-//@WebServlet(name="phoneWebSocket",urlPatterns="/webSocket")
+@WebServlet(name="phoneWebSocket",urlPatterns="/webSocket")
 @Service
 @WebSocketHandlerService(path = "/webSocket/message/phone", interceptors = {
         TrackMessageSizeInterceptor.class,  //校验消息大小，验证数据完整性，需要前端参数配合
@@ -38,7 +41,7 @@ import java.util.*;
         atmosphereConfig = {"org.atmosphere.websocket.WebSocketProtocol=org.atmosphere.websocket.protocol.StreamingHttpProtocol"})
 public class PhoneWebSocket extends CacheHandlerAdapter {
     public final static WebSocketSender webSocketSender = new WebSocketSender();
-
+    private static Log log = LogFactory.getLog(PhoneWebSocket.class);
     private static IDictionaryDAO dictionaryDAO;
     @Autowired
     public void setDictionaryDAO(IDictionaryDAO dictionaryDAO) {
@@ -83,6 +86,11 @@ public class PhoneWebSocket extends CacheHandlerAdapter {
                 webSocketSender.setCache(this.getCACHE());
             }
         }
+    //    log.info("data:" + data);
+        if(data.equals("ping")){
+            webSocket.resource().getResponse().getWriter().write("pong");
+            return;
+        }
         JSONObject jsonObject = JsonUtil.toJSONObject(data);
         String identity = jsonObject.optString("userCount");
         String[] nameAndPhone = identity.split("\\|");

src/main/resources/application.properties

@@ -1,7 +1,7 @@
 mysql2.spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 #\u8F6C\u8FD0\u4E1A\u52A1\u5E93\u6570\u636E\u6E90
 mysql2.spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-mysql2.spring.datasource.url=jdbc:mysql://localhost:3306/hsms2_1129?autoReconnect=true&useUnicode=true&characterEncoding=utf8
+mysql2.spring.datasource.url=jdbc:mysql://localhost:3306/hsms2?autoReconnect=true&useUnicode=true&characterEncoding=utf8
 #mysql2.spring.datasource.url=jdbc:mysql://192.168.3.108:3306/hsms2_tjzy_0622?autoReconnect=true&useUnicode=true&characterEncoding=utf8
 mysql2.spring.datasource.username=root
 mysql2.spring.datasource.password=100100