111

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

@@ -251,18 +251,16 @@ public class HandlerThread  {
                             if (jsonObject.containsKey("dtmfa") && jsonObject.get("dtmfa").toString() != null && !jsonObject.optString("dtmfa").toString().equals("")){
                                 rMap.put("phone", jsonObject.opt("dtmfa"));
                                 rMap.put("status", 201);
+                                rMap.put("callId",jsonObject.optString("uuid"));
 
-                                //TODO 先保存通话记录
-                                CallLogEntity callLogEntity = new CallLogEntity();
-                                callLogEntity.setdTMFA(jsonObject.optString("dtmfa"));
-                                callLogEntity.setdTMFB(jsonObject.optString("dtmfb"));
+//                                //TODO 先保存通话记录，打通了的走这里
+                                log.info("先保存通话记录2："+jsonObject.toString());
+                                CallLogEntity callLogEntity = getCallLog(jsonObject);
                                 if(StringUtils.isNotEmpty(jsonObject.optString("rstime"))) {
                                     callLogEntity.setResponseTime(DateUtil2.parseDateTime(jsonObject.optString("rstime")));
                                 }
 
                                 saveItsmCallRecord(callLogEntity,jsonObject.optString("uuid"));
-                                rMap.put("callId",jsonObject.optString("uuid"));
-
                             }else {
                                 rMap.put("phone","");
                                 rMap.put("status", 201);
@@ -280,8 +278,6 @@ public class HandlerThread  {
                         if (jsonObject.containsKey("channel")&&jsonObject.get("channel").toString()!=null){
                             PhoneWebSocket.sendMessage(phoneMap.get(his+jsonObject.get("channel").toString()),json);
                         }
-                        CallLogEntity callLog = new CallLogEntity();
-                        callLog.setCallState(0);
                     }
                 }
 
@@ -307,6 +303,15 @@ public class HandlerThread  {
                 }
                 callLog.setHosId(Integer.parseInt(his));
                 callLogDAO.save(callLog);
+
+                log.info("先保存通话记录1："+jsonObject.toString());
+                //TODO 先保存通话记录，打不通的走这里
+                if(StringUtils.isNotEmpty(jsonObject.optString("rstime"))) {
+                    callLog.setResponseTime(DateUtil2.parseDateTime(jsonObject.optString("rstime")));
+                }
+
+                saveItsmCallRecord(callLog,jsonObject.optString("uuid"));
+
             }
         }else if(jsonObject.get("phonestate").toString().equals("1")){
             phoneLog.put(his+jsonObject.get("channel").toString(),null);
@@ -356,6 +361,7 @@ public class HandlerThread  {
      * @param message
      */
     public void saveCallLog(String message,String his){
+        log.info(message);
         //TODO 修改通话记录数据；DTMFA DTMFB rstime
         if (JsonUtil.toJSONObject(message).containsKey("recordList")) {
             List list = JsonUtil.toJSONObject(message).optJSONArray("recordList");
@@ -399,7 +405,13 @@ public class HandlerThread  {
                     }else{//未知
                         callLog.setCallType(2);
                     }
+//                    callLog.setCallState(1);
+                }
+                //是否接电话，1接了，0未接
+                if (jsonObject.get("rstime") != null && StringUtils.isNotEmpty(jsonObject.get("rstime").toString())){
                     callLog.setCallState(1);
+                }else {
+                    callLog.setCallState(0);
                 }
                 callLog.setHosId(Integer.parseInt(his));
                 callLogDAO.save(callLog);
@@ -454,6 +466,16 @@ public class HandlerThread  {
                         recordEntity.setCallerIdNumber(callLog.getdTMFA());
                         recordEntity.setDestinationNumber(callLog.getdTMFB());
                         recordEntity.setCreatedTime(callLog.getResponseTime());
+                        recordEntity.setIsAnswered(callLog.getCallState());
+                        recordEntity.setCallTime("0");
+                        recordEntity.setOverTime(new Date());
+                        recordEntity.setBranch(callLog.getHosId() == null ? null : callLog.getHosId().longValue());
+                        if(callLog.getCallType() != null && "0".equals(callLog.getCallType().toString())) {
+                            recordEntity.setCallType("1");
+                        }else if(callLog.getCallType() != null && "1".equals(callLog.getCallType().toString())) {
+                            recordEntity.setCallType("2");
+                        }
+                        recordEntity.setGateWay(callLog.getPhyIDA());
                         callRecordDAO.save(recordEntity);
                         log.info("新增临时通话记录完成");
                     }else {
@@ -503,13 +525,16 @@ public class HandlerThread  {
                         }
                     }
                     //处理录音地址
-                    if(callLog.getPath() != null) {
+                    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];
                         }
                         recordEntity.setRecordingFileName(newPath);
+                    }else {
+                        log.info("callLog 保存没有路径path");
+                        return;
                     }
 
                     callRecordDAO.save(recordEntity);