bug修复

src/main/java/com/dashitech/businessdata/entity/CallLogEntity.java

@@ -162,4 +162,9 @@ public class CallLogEntity implements Serializable {
     public void setVersion(Integer version) {
         this.version = version;
     }
+
+    @Override
+    public String toString() {
+        return "CallLogEntity{" + "id=" + id + ", version=" + version + ", callDept='" + callDept + '\'' + ", phyIDA='" + phyIDA + '\'' + ", dTMFA='" + dTMFA + '\'' + ", dTMFB='" + dTMFB + '\'' + ", responseTime=" + responseTime + ", longTime='" + longTime + '\'' + ", path='" + path + '\'' + ", callType=" + callType + ", callState=" + callState + ", hosId=" + hosId + '}';
+    }
 }

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

@@ -449,7 +449,13 @@ public class HandlerThread  {
                     return "暂无";
                 }
                 //给来电科室赋值
-                String deptName = departmentDAO.getDeptNameByPhone(phone);
+                String deptName = "";
+                if("HSMS".equals(projectMain)) {
+                    deptName = hsmsCallLogDAO.getDeptNameByPhone(phone);
+                } else {    //其它,以运维项目为主
+                    deptName = departmentDAO.getDeptNameByPhone(phone);
+                }
+
                 if (deptName!=null&&!deptName.equals("")){
                     return deptName;
                 }else {
@@ -572,7 +578,8 @@ public class HandlerThread  {
     }
 
     private void saveHsmsCallLog(CallLogEntity callLog,String uuid) {
-        log.info("开始保存HSMS通话记录2");
+        log.info("开始保存HSMS通话记录");
+        log.info(callLog);
         HsmsCallLogEntity hsmsCallLog = null;
 
         try {
@@ -580,10 +587,11 @@ public class HandlerThread  {
                 String hosId = hsmsCallLogDAO.selectSernelNo("sernelNo",serialNo);
 
                 if(StringUtils.isNotEmpty(uuid)) {
-                    Long id = callRecordDAO.selectIdByUuid(uuid);
+                    Long id = hsmsCallLogDAO.selectIdByUuid(uuid);
                     if(id == null) {
                         hsmsCallLog = new HsmsCallLogEntity();
                         copyCallLog(callLog,hsmsCallLog);
+                        hsmsCallLog.setVersion(0);
                         hsmsCallLog.setCallAccept(uuid);
                         hsmsCallLog.setHosId(StringUtils.isEmpty(hosId)? null : Integer.valueOf(hosId));
                         hsmsCallLogDAO.save(hsmsCallLog);
@@ -595,25 +603,28 @@ public class HandlerThread  {
                     log.info("开始匹配HSMS临时通话记录");
                     hsmsCallLog = hsmsCallLogDAO.selectByParams(callLog.getdTMFA(), callLog.getdTMFB(), callLog.getResponseTime());
                     if(hsmsCallLog == null) {   //新增
+                        log.info("HSMS未匹配到，开始新增");
                         hsmsCallLog = new HsmsCallLogEntity();
-                        copyCallLog(callLog,hsmsCallLog);
-                        hsmsCallLog.setVersion(0);
+                        callLog.setVersion(0);
                         hsmsCallLog.setCallAccept(UUID.randomUUID().toString());
-                        hsmsCallLog.setHosId(StringUtils.isEmpty(hosId)? null : Integer.valueOf(hosId));
                     }
+
+                    copyCallLog(callLog,hsmsCallLog);
+                    hsmsCallLog.setHosId(StringUtils.isEmpty(hosId)? null : Integer.valueOf(hosId));
+
                     if(callLog.getPath() != null && StringUtils.isNotEmpty(callLog.getPath())) {
-                        String newPath = callLog.getPath();
-                        String[] arr = callLog.getPath().split(recordRegex);
-                        if (arr.length > 1) {
-                            newPath = recordNginxPath + arr[1];
-                        }
-                        hsmsCallLog.setPath(newPath);
+//                        String newPath = callLog.getPath();
+//                        String[] arr = callLog.getPath().split(recordRegex);
+//                        if (arr.length > 1) {
+//                            newPath = recordNginxPath + arr[1];
+//                        }
+//                        hsmsCallLog.setPath(newPath);
                     }else {
                         log.info("HSMS callLog 保存没有路径path");
                         return;
                     }
                     hsmsCallLogDAO.save(hsmsCallLog);
-                    log.info("保存HSMS通话记录2完成！");
+                    log.info("保存HSMS通话记录完成！");
                 }
 
                 log.info("保存HSMS通话记录完成："+hsmsCallLog.getCallAccept());
@@ -625,10 +636,8 @@ public class HandlerThread  {
     }
 
     private HsmsCallLogEntity copyCallLog(CallLogEntity callLog,HsmsCallLogEntity hsmsCallLog) {
-        hsmsCallLog.setId(callLog.getId());
         hsmsCallLog.setVersion(callLog.getVersion());
         hsmsCallLog.setHosId(callLog.getHosId());
-        hsmsCallLog.setCallAccept(callLog.getCallDept());
         hsmsCallLog.setCallDept(callLog.getCallDept());
         hsmsCallLog.setPhyIDA(callLog.getPhyIDA());
         hsmsCallLog.setdTMFA(callLog.getdTMFA());

src/main/java/com/dashitech/hsms/dao/IHsmsCallLogDAO.java

@@ -18,4 +18,9 @@ public interface IHsmsCallLogDAO extends JpaRepository<HsmsCallLogEntity, String
     @Query(value = "select hos_id from itsm_system_hospital_config where _key = ?1 and _value =?2 limit 1 ",nativeQuery = true)
     String selectSernelNo(String key,String value);
 
+    @Query(value = " select a.id from HsmsCallLogEntity a where a.callAccept=:uuid ")
+    Long selectIdByUuid(@Param("uuid") String uuid);
+
+    @Query(value = "SELECT dept FROM itsm_uc_dept g WHERE g.many_phone like CONCAT('%',:phone,'%') AND g.delete_flag = 0 limit 1", nativeQuery = true)
+    String getDeptNameByPhone(@Param("phone")String phone);
 }

src/main/resources/application.properties

@@ -4,11 +4,12 @@
 # //TODO 转运配置
 mysql1.spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 mysql1.spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-#mysql1.spring.datasource.url=jdbc:mysql://localhost:3306/hsms2_0622?autoReconnect=true&useUnicode=true&characterEncoding=utf8
+# 南京
+mysql1.spring.datasource.url=jdbc:mysql://192.144.201.19:3306/hsms2_0622?autoReconnect=true&useUnicode=true&characterEncoding=utf8
 #mysql1.spring.datasource.url=jdbc:mysql://192.168.3.108:3306/hsms2_0622?autoReconnect=true&useUnicode=true&characterEncoding=utf8
-mysql1.spring.datasource.url=jdbc:mysql://192.168.3.111:3306/md2?autoReconnect=true&useUnicode=true&characterEncoding=utf8
 mysql1.spring.datasource.username=root
 #mysql1.spring.datasource.password=DStech@123
+# 南京
 mysql1.spring.datasource.password=100100
 
 # 下面为连接池的补充设置，应用到上面所有数据源中
@@ -32,10 +33,12 @@ mysql1.spring.datasource.testOnReturn=true
 # //TODO ITSM配置
 mysql2.spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 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://192.168.3.111:3306/md2?autoReconnect=true&useUnicode=true&characterEncoding=utf8
+# 南京
+mysql2.spring.datasource.url=jdbc:mysql://192.144.201.19:3306/md2?autoReconnect=true&useUnicode=true&characterEncoding=utf8
+#mysql2.spring.datasource.url=jdbc:mysql://192.168.3.111:3306/md2?autoReconnect=true&useUnicode=true&characterEncoding=utf8
 mysql2.spring.datasource.username=root
 #mysql2.spring.datasource.password=DStech@123
+# 南京
 mysql2.spring.datasource.password=100100
 
 mysql2.spring.datasource.initialSize=3
@@ -50,11 +53,13 @@ mysql2.spring.datasource.testOnBorrow=true
 mysql2.spring.datasource.testOnReturn=true
 
 #project=HSMS
-project=ITSM
-#project=ALL
-#配置呼叫中心以哪个项目为主，单个与project一致即可
-project.main=ITSM
-db.hjzx.record.nginx=/hjzxRecord
+#project=ITSM
+project=ALL
+#配置呼叫中心以哪个项目为主，ITSM或者HSMS。单项目与project一致即可
+project.main=HSMS
+#db.hjzx.record.nginx=/hjzxRecord
+# 南京
+db.hjzx.record.nginx=/record/192.144.41.171
 db.hjzx.record.path.regex=voice