CX 1 month ago
parent
commit
f2c4e72a20

+ 9 - 1
src/main/java/com/dashitech/callcenter/socket/HandlerThread.java

@@ -297,7 +297,14 @@ public class HandlerThread  {
297
                             }
297
                             }
298
                             ObjectMapper objectMapper = new ObjectMapper();
298
                             ObjectMapper objectMapper = new ObjectMapper();
299
                             String json = objectMapper.writeValueAsString(rMap);
299
                             String json = objectMapper.writeValueAsString(rMap);
300
-                            PhoneWebSocket.sendMessage(phoneMap.get(his+jsonObject.get("channel").toString()),json);
300
+
301
+                            String temp = phoneMap.get(his + jsonObject.get("channel").toString());
302
+
303
+                            log.info("******************");
304
+                            log.info("phone:"+temp +",json:"+json);
305
+                            log.info("******************");
306
+
307
+                            PhoneWebSocket.sendMessage(temp,json);
301
                         }
308
                         }
302
                     } else if (jsonObject.containsKey("phonestate") && jsonObject.get("phonestate").toString().equals("4") || jsonObject.get("phonestate").toString() == "4") {
309
                     } else if (jsonObject.containsKey("phonestate") && jsonObject.get("phonestate").toString().equals("4") || jsonObject.get("phonestate").toString() == "4") {
303
                         Map rMap = new HashMap();
310
                         Map rMap = new HashMap();
@@ -385,6 +392,7 @@ public class HandlerThread  {
385
 //        List<DictionaryEntity> dictionaryEntityList = dictionaryDAO.selectDictionaryByKey(key);
392
 //        List<DictionaryEntity> dictionaryEntityList = dictionaryDAO.selectDictionaryByKey(key);
386
         List<HospitalConfig> hospitalConfigList =  hospitalConfigDAO.getHospitalConfigList(key,his);
393
         List<HospitalConfig> hospitalConfigList =  hospitalConfigDAO.getHospitalConfigList(key,his);
387
         if (hospitalConfigList!=null&&hospitalConfigList.size()>0){
394
         if (hospitalConfigList!=null&&hospitalConfigList.size()>0){
395
+
388
             for (HospitalConfig hospitalConfig:hospitalConfigList){
396
             for (HospitalConfig hospitalConfig:hospitalConfigList){
389
                 phoneMap.put(his+hospitalConfig.getValue2(),hospitalConfig.getValue());
397
                 phoneMap.put(his+hospitalConfig.getValue2(),hospitalConfig.getValue());
390
             }
398
             }

+ 1 - 1
src/main/resources/application.properties

@@ -40,7 +40,7 @@ mysql2.spring.datasource.driver-class-name=com.mysql.jdbc.Driver
40
 #mysql2.spring.datasource.url=jdbc:mysql://192.144.201.19:3306/md2?autoReconnect=true&useUnicode=true&characterEncoding=utf8
40
 #mysql2.spring.datasource.url=jdbc:mysql://192.144.201.19:3306/md2?autoReconnect=true&useUnicode=true&characterEncoding=utf8
41
 #mysql2.spring.datasource.url=jdbc:mysql://192.168.3.111:3306/md2?autoReconnect=true&useUnicode=true&characterEncoding=utf8
41
 #mysql2.spring.datasource.url=jdbc:mysql://192.168.3.111:3306/md2?autoReconnect=true&useUnicode=true&characterEncoding=utf8
42
 #白求恩
42
 #白求恩
43
-mysql2.spring.datasource.url=jdbc:mysql://172.17.1.150:3306/mdv2?autoReconnect=true&useUnicode=true&characterEncoding=utf8
43
+mysql2.spring.datasource.url=jdbc:mysql://172.17.1.150:3306/hsms?autoReconnect=true&useUnicode=true&characterEncoding=utf8
44
 mysql2.spring.datasource.username=root
44
 mysql2.spring.datasource.username=root
45
 #白求恩
45
 #白求恩
46
 mysql2.spring.datasource.password=DStech@123
46
 mysql2.spring.datasource.password=DStech@123