录音盒对接优化

src/main/java/com/dashitech/businessdata/dao/ICallRecordDAO.java

@@ -2,9 +2,19 @@ package com.dashitech.businessdata.dao;
 
 import com.dashitech.businessdata.entity.CallRecordEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.Date;
 
 /**
  */
 public interface ICallRecordDAO extends JpaRepository<CallRecordEntity, String> {
     CallRecordEntity save(CallRecordEntity callLogEntity);
+
+    @Query(value = " select a from CallRecordEntity a where a.callerIdNumber=:callerIdNumber and a.destinationNumber=:destinationNumber and a.createdTime=:createdTime ")
+    CallRecordEntity selectByParams(@Param("callerIdNumber") String callerIdNumber, @Param("destinationNumber") String destinationNumber, @Param("createdTime") Date createdTime);
+
+    @Query(value = " select a.id from CallRecordEntity a where a.callAccept=:uuid ")
+    Long selectIdByUuid(@Param("uuid") String uuid);
 }

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

@@ -11,6 +11,8 @@ import com.dashitech.utils.PropertiesUtil;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import net.sf.json.JSONObject;
 import org.apache.commons.lang.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -27,6 +29,8 @@ import java.util.*;
 @Service
 public class HandlerThread  {
 
+    private static Log log = LogFactory.getLog(HandlerThread.class);
+
     //  这里使用静态，让 service 属于类
     private static ICallLogDAO callLogDAO;
 
@@ -78,7 +82,6 @@ public class HandlerThread  {
     }
 
     public void run() {
-        // TODO Auto-generated method stub
         DataInputStream input = null;
         DataOutputStream output = null;
         try {
@@ -247,8 +250,19 @@ public class HandlerThread  {
                             //TODO 增加返回 uuid 并且保存通话记录数据
                             if (jsonObject.containsKey("dtmfa") && jsonObject.get("dtmfa").toString() != null && !jsonObject.optString("dtmfa").toString().equals("")){
                                 rMap.put("phone", jsonObject.opt("dtmfa"));
-                               // rMap.put("callid",);
                                 rMap.put("status", 201);
+
+                                //TODO 先保存通话记录
+                                CallLogEntity callLogEntity = new CallLogEntity();
+                                callLogEntity.setdTMFA(jsonObject.optString("dtmfa"));
+                                callLogEntity.setdTMFB(jsonObject.optString("dtmfb"));
+                                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);
@@ -390,7 +404,7 @@ public class HandlerThread  {
                 callLog.setHosId(Integer.parseInt(his));
                 callLogDAO.save(callLog);
                 //TODO 根据配置文件开关，是否保存到ITSM的通话记录数据
-                saveItsmCallRecord(callLog);
+                saveItsmCallRecord(callLog,null);
             }
         }
     }
@@ -425,49 +439,84 @@ public class HandlerThread  {
     /**
      * 根据配置文件开关，是否保存到ITSM的通话记录数据
      */
-    private void saveItsmCallRecord(CallLogEntity callLog) {
+    private void saveItsmCallRecord(CallLogEntity callLog,String uuid) {
         try {
             if("ITSM".equals(project)) {
-                CallRecordEntity recordEntity = new CallRecordEntity();
-                String uuid = UUID.randomUUID().toString();
-                recordEntity.setCallAccept(uuid);
-                recordEntity.setVersion(0);
-                recordEntity.setCallerIdNumber(callLog.getdTMFA());
-                recordEntity.setDestinationNumber(callLog.getdTMFB());
-                recordEntity.setCreatedTime(callLog.getResponseTime());
-                recordEntity.setCallTime(callLog.getLongTime());
-                recordEntity.setRecordingFileName(callLog.getPath());
-                recordEntity.setIsAnswered(callLog.getCallState());
-
-                //处理结束时间
-                if(callLog.getResponseTime() != null && callLog.getLongTime() != null) {
-                    Date overTime = DateUtil2.addSeconds(callLog.getResponseTime(), Integer.valueOf(callLog.getLongTime()));
-                    recordEntity.setOverTime(overTime);
-                }
-                //院区
-                if(callLog.getHosId() != null) {
-                    recordEntity.setBranch(callLog.getHosId().longValue());
-                }
-                //呼入呼出，其它
-                if(callLog.getCallType() != null) {
-                    if("1".equals(callLog.getCallType().toString())) {
-                        recordEntity.setCallType("2");
-                    }else if("2".equals(callLog.getCallType().toString())) {
-                        recordEntity.setCallType("1");
+                CallRecordEntity recordEntity = null;
+                log.info("开始保存通话记录");
+                //TODO 根据uuid区分是：新增通话记录，还是修改附件的通话记录
+                if(StringUtils.isNotEmpty(uuid)) {   //新增
+                    Long id = callRecordDAO.selectIdByUuid(uuid);
+                    if(id == null) {
+                        recordEntity = new CallRecordEntity();
+                        recordEntity.setVersion(0);
+                        recordEntity.setCallAccept(uuid);
+                        recordEntity.setCallerIdNumber(callLog.getdTMFA());
+                        recordEntity.setDestinationNumber(callLog.getdTMFB());
+                        recordEntity.setCreatedTime(callLog.getResponseTime());
+                        callRecordDAO.save(recordEntity);
+                        log.info("新增临时通话记录完成");
                     }else {
-                        recordEntity.setCallType("3");
+                        log.info("已有临时通话记录，忽略此条uuid："+uuid);
                     }
-                }
-                //处理录音地址
-                if(callLog.getPath() != null) {
-                    String newPath = callLog.getPath();
-                    String[] arr = callLog.getPath().split(recordRegex);
-                    if (arr.length > 1) {
-                        newPath = recordNginxPath + arr[1];
+                }else { //修改
+                    log.info("开始匹配临时通话记录");
+                    recordEntity = callRecordDAO.selectByParams(callLog.getdTMFA(), callLog.getdTMFB(), callLog.getResponseTime());
+
+                    //TODO 根据【主叫、被叫、起始时间】判断是否查询到对应数据，来绑定附件，如果未匹配到，直接新增
+                    String newUUID = null;
+                    if(recordEntity != null) {
+                        log.info("匹配到临时通话记录！开始修改");
+                        newUUID = recordEntity.getCallAccept();
+                    }else {
+                        log.info("未匹配到临时通话记录！开始新增");
+                        recordEntity = new CallRecordEntity();
+                        newUUID = UUID.randomUUID().toString();
                     }
-                    recordEntity.setRecordingFileName(newPath);
+
+                    recordEntity.setCallAccept(newUUID);
+                    recordEntity.setVersion(0);
+                    recordEntity.setCallerIdNumber(callLog.getdTMFA());
+                    recordEntity.setDestinationNumber(callLog.getdTMFB());
+                    recordEntity.setCreatedTime(callLog.getResponseTime());
+                    recordEntity.setCallTime(callLog.getLongTime());
+                    recordEntity.setRecordingFileName(callLog.getPath());
+                    recordEntity.setIsAnswered(callLog.getCallState());
+
+                    //处理结束时间
+                    if(callLog.getResponseTime() != null && callLog.getLongTime() != null) {
+                        Date overTime = DateUtil2.addSeconds(callLog.getResponseTime(), Integer.valueOf(callLog.getLongTime()));
+                        recordEntity.setOverTime(overTime);
+                    }
+                    //院区
+                    if(callLog.getHosId() != null) {
+                        recordEntity.setBranch(callLog.getHosId().longValue());
+                    }
+                    //呼入呼出，其它
+                    if(callLog.getCallType() != null) {
+                        if("1".equals(callLog.getCallType().toString())) {
+                            recordEntity.setCallType("2");
+                        }else if("2".equals(callLog.getCallType().toString())) {
+                            recordEntity.setCallType("1");
+                        }else {
+                            recordEntity.setCallType("3");
+                        }
+                    }
+                    //处理录音地址
+                    if(callLog.getPath() != null) {
+                        String newPath = callLog.getPath();
+                        String[] arr = callLog.getPath().split(recordRegex);
+                        if (arr.length > 1) {
+                            newPath = recordNginxPath + arr[1];
+                        }
+                        recordEntity.setRecordingFileName(newPath);
+                    }
+
+                    callRecordDAO.save(recordEntity);
+                    log.info("附件通话记录保存完成");
                 }
-                callRecordDAO.save(recordEntity);
+
+                log.info("ITSM保存通话记录完成："+recordEntity.getCallAccept());
                 System.out.println("ITSM保存通话记录完成："+recordEntity.getCallAccept());
             }
         } catch (Exception ex) {