From bb60b5747d5f4b85655a541d4990ec7464497b1b Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 10 五月 2024 18:18:02 +0800
Subject: [PATCH] 代码提交

---
 smartor/src/main/java/com/smartor/service/impl/IvrTaskSingleServiceImpl.java |  407 ++++++++++++++++++++++++++++++---------------------------
 1 files changed, 213 insertions(+), 194 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/service/impl/IvrTaskSingleServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/IvrTaskSingleServiceImpl.java
index 1d5c720..5a9142d 100644
--- a/smartor/src/main/java/com/smartor/service/impl/IvrTaskSingleServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/IvrTaskSingleServiceImpl.java
@@ -4,6 +4,8 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.gson.Gson;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.exception.base.BaseException;
 import com.ruoyi.common.utils.DateUtils;
@@ -49,6 +51,9 @@
     private IvrLibaTemplateTargetoptionMapper ivrLibaScriptTargetoptionMapper;
 
     @Autowired
+    private IvrLibaTemplateScriptMapper ivrLibaTemplateScriptMapper;
+
+    @Autowired
     private IvrTaskVisitResultMapper ivrTaskVisitResultMapper;
 
     @Autowired
@@ -59,13 +64,6 @@
 
     @Autowired
     private RabbitTemplate rabbitTemplate;
-
-
-    @Autowired
-    private PatMedOuthospMapper patMedOuthospMapper;
-
-    @Autowired
-    private PatMedInhospMapper patMedInhospMapper;
 
 
     /**
@@ -138,7 +136,7 @@
                 patTaskRelevance.setPhone(ivrTaskcall1.getPhone());
                 patTaskRelevance.setAddr(ivrTaskcall1.getAddr());
                 patTaskRelevance.setDeptName(ivrTaskcall1.getDeptname());
-                patTaskRelevance.setBedNo(ivrTaskcall1.getBadNo());
+                patTaskRelevance.setBedNo(ivrTaskcall1.getBedNo());
                 patTaskRelevance.setDiagname(ivrTaskcall1.getDiagname());
                 patTaskRelevances.add(patTaskRelevance);
             }
@@ -209,7 +207,7 @@
         if (ivrTaskcallVO.getIsoperation() != null && ivrTaskcallVO.getIsoperation() == 1) {
             //寰�浠诲姟琛ㄤ腑锛屾柊澧炰换鍔�
             IvrTask ivrTask = DtoConversionUtils.sourceToTarget(ivrTaskcallVO, IvrTask.class);
-            Integer taskId = ivrTaskService.insertIvrTask(ivrTask);
+            ivrTaskService.insertIvrTask(ivrTask);
 
             ivrTaskcallVO.setTaskid(ivrTask.getTaskid().longValue());
             //鏂板
@@ -223,7 +221,7 @@
                     ivrTaskcall.setPhone(patTaskRelevance.getPhone());
                     ivrTaskcall.setAddr(patTaskRelevance.getAddr());
                     ivrTaskcall.setCreateTime(DateUtils.getNowDate());
-                    ivrTaskcall.setTextParam(new Gson().toJson(ivrTaskcallVO.getTextParam()));
+                    ivrTaskcall.setTextParam(new Gson().toJson(patTaskRelevance.getTextParam()));
                     if (CollectionUtils.isNotEmpty(ivrTaskcallVO.getSendTimeslot())) {
                         ivrTaskcall.setSendTimeSlot(ivrTaskcallVO.getSendTimeslot().toString());
                     }
@@ -273,7 +271,7 @@
     @Override
     public int heTaskSend(IvrTaskSingleVO ivrTaskcallVO) {
         //鍒ゆ柇浠诲姟鏄惁鏄珛鍗冲彂閫�
-        if (ivrTaskcallVO.getSendType().equals("2") && ivrTaskcallVO.getSendstate() == 1) {
+        if (ivrTaskcallVO.getSendType().equals("2")) {
             IvrTaskcallMQ ivrTaskcallMQ = new IvrTaskcallMQ();
             ivrTaskcallMQ.setTaskid(ivrTaskcallVO.getTaskid());
             ivrTaskcallMQ.setSendType("1");
@@ -287,7 +285,7 @@
                 message.getMessageProperties().setHeader("x-delay", 0);
                 return message;
             });
-        } else if (ivrTaskcallVO.getSendType().equals("1") && ivrTaskcallVO.getSendstate() == 1) {
+        } else if (ivrTaskcallVO.getSendType().equals("1")) {
             //鏃堕棿娈靛彂閫�
             if (CollectionUtils.isNotEmpty(ivrTaskcallVO.getSendTimeslot())) {
                 for (TaskSendTimeVO taskSendTimeVO : ivrTaskcallVO.getSendTimeslot()) {
@@ -322,6 +320,11 @@
                         return message;
                     });
                 }
+                //灏嗕换鍔$姸鎬佷慨鏀规垚鎵ц涓�
+                IvrTask ivrTask = new IvrTask();
+                ivrTask.setTaskid(ivrTaskcallVO.getTaskid());
+                ivrTask.setSendState("2");
+                ivrTaskService.updateIvrTask(ivrTask);
             }
         }
 
@@ -330,120 +333,168 @@
 
     @Override
     public void phoneCallBack(PhoneCallBackVO phoneCallBackVO) {
-        phoneCallBackVO.setTextResult(phoneCallBackVO.getTextResult().substring(0, phoneCallBackVO.getTextResult().length() - 1));
+        synchronized (new IvrTaskSingleServiceImpl()) {
+            phoneCallBackVO.setTextResult(phoneCallBackVO.getTextResult().substring(0, phoneCallBackVO.getTextResult().length() - 1));
+            SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("YYYY-MM-dd HH:mm:ss");
 
-        //鑾峰彇鏁版嵁
-        Boolean aBoolean = redisCache.hasKey(phoneCallBackVO.getUuid());
-        if (!aBoolean) {
-            throw new BaseException("璇uid涓嶅瓨鍦�");
-        }
-        Integer hangupValue = redisCache.getCacheObject(phoneCallBackVO.getUuid() + "hangup");
-        PhoneUtils phoneUtils = new PhoneUtils();
-        if (hangupValue != null && hangupValue == 1) {
-            log.info("鐢佃瘽瑕佹寕鏂簡");
-            //hangupValue == 1  闅忚缁撴潫锛岀洿鎺ュ彲浠ユ寕鐢佃瘽
-            phoneUtils.hangup("", "", "", "", "", "", "", phoneCallBackVO.getUuid());
-            return;
-        }
-
-        Map<String, Object> map = redisCache.getCacheObject(phoneCallBackVO.getUuid());
-        IvrTaskSingle ivrTaskcall = (IvrTaskSingle) map.get("ivrTaskcall");
-        List<IvrLibaTemplateScriptVO> ivrLibaTemplateScriptVOs = (List<IvrLibaTemplateScriptVO>) map.get("ivrLibaTemplateScriptVO");
-        //灏唘uid鏇存柊鍒版暟鎹簱涓�
-        ivrTaskcall.setSenduuid(phoneCallBackVO.getUuid());
-        ivrTaskSingleMapper.updateIvrTaskcall(ivrTaskcall);
-
-        //鑾峰彇妯℃澘淇℃伅
-        IvrLibaTemplateVO ivrLibaTemplateVO = redisCache.getCacheObject(phoneCallBackVO.getUuid() + "ivrLibaTemplateVO");
-
-        //璇煶璇嗗埆缁撴灉涓婃姤鎺ュ彛: 3
-        Integer noVoice = redisCache.getCacheObject(phoneCallBackVO.getUuid() + "noVoice");
-        QuestionMessage returnQues = redisCache.getCacheObject(phoneCallBackVO.getUuid() + "returnQues");
-        //灏嗕紶鍥炵殑缁撴灉鏀惧埌鍥炲瀵硅薄涓�
-        returnQues.setContent(phoneCallBackVO.getTextResult());
-
-        IvrLibaTemplateScriptVO nowQuestion = returnQues.getNowQuestion();
-
-        if (StringUtils.isEmpty(returnQues.getContent())) {
-            //鏃犲洖璇�
-            //鍒ゆ柇noVoice鏄惁宸茬粡鍒颁簡鏈�澶у��
-            if (noVoice == ivrLibaTemplateVO.getNoVoiceNum().intValue()) {
-                //宸茬粡闂簡瀵瑰簲鐨勯亶鏁帮紝灏卞垽鏂槸鍚﹁繕鏈変笅涓�棰�
-                if (nowQuestion.getTargetid() == ivrLibaTemplateScriptVOs.size()) {
-                    //娌℃湁涓嬩竴棰樹簡锛屽氨鎸傛柇鐢佃瘽锛屾挱鏀剧粨鏉熻
-                    redisCache.setCacheObject(phoneCallBackVO.getUuid() + "hangup", 1, 120, TimeUnit.MINUTES);
-                    phoneUtils.ttsPlayback(ivrLibaTemplateVO.getRevisitAfter(), phoneCallBackVO.getUuid());
-                    return;
-                } else {
-                    //鏈変笅涓�棰�
-                    redisCache.setCacheObject(phoneCallBackVO.getUuid() + "noVoice", 0, 120, TimeUnit.MINUTES);
-                    IvrLibaTemplateScriptVO nextQuestion = getNextQuestion(ivrLibaTemplateScriptVOs, nowQuestion);
-                    // 闂锛�  鍘昏皟鐢ㄢ�渢ts鍚堟垚鍜屾挱鏀锯�濇帴鍙�
-                    phoneUtils.ttsPlayback(nowQuestion.getQuestionText(), phoneCallBackVO.getUuid());
-                }
-            } else {
-                redisCache.setCacheObject(phoneCallBackVO.getUuid() + "noVoice", noVoice + 1, 120, TimeUnit.MINUTES);
-                //璋冪敤ivrLibaTemplateScriptVO涓殑slienceText(闈欓粯璇濇湳)
-                String slienceText = nowQuestion.getSlienceText();
-                //闈欓粯璇濇湳  + 闂锛�  鍘昏皟鐢ㄢ�渢ts鍚堟垚鍜屾挱鏀锯�濇帴鍙�
-                phoneUtils.ttsPlayback(slienceText + nowQuestion.getQuestionText(), phoneCallBackVO.getUuid());
+            //鑾峰彇鏁版嵁
+            Boolean aBoolean = redisCache.hasKey(phoneCallBackVO.getUuid());
+            if (!aBoolean) {
+                throw new BaseException("璇uid涓嶅瓨鍦�");
+            }
+            Integer hangupValue = redisCache.getCacheObject(phoneCallBackVO.getUuid() + "hangup");
+            PhoneUtils phoneUtils = new PhoneUtils();
+            if (hangupValue != null && hangupValue == 1) {
+                String date = simpleDateFormat1.format(new Date());
+                log.info("鐢佃瘽瑕佹寕鏂簡: {}", date);
+                //hangupValue == 1  闅忚缁撴潫锛岀洿鎺ュ彲浠ユ寕鐢佃瘽
+                phoneUtils.hangup("", "", "", "", "", "", "", phoneCallBackVO.getUuid());
                 return;
             }
 
-        } else {
-            //isppd鐢ㄦ潵璁板綍鏄惁鍖归厤鍒�
-            Boolean isppd = false;
-            //鏈夊洖璇濓紝瀵瑰洖绛旂殑闂,杩涜姝e垯鍖归厤锛堣繖閲屽彧閽堝閫夋嫨棰橈紝鍏跺畠棰樺瀷涓嶈锛�
-            for (int j = 0; j < nowQuestion.getIvrLibaScriptTargetoptionList().size(); j++) {
-                //鍖呭惈
-                Matcher matcher = null;
-                if (StringUtils.isNotEmpty(nowQuestion.getIvrLibaScriptTargetoptionList().get(j).getTargetregex())) {
-                    Pattern pattern = Pattern.compile(nowQuestion.getIvrLibaScriptTargetoptionList().get(j).getTargetregex());
-                    matcher = pattern.matcher(phoneCallBackVO.getTextResult());
+            Map<String, Object> map = redisCache.getCacheObject(phoneCallBackVO.getUuid());
+            IvrTaskSingle ivrTaskcall = (IvrTaskSingle) map.get("ivrTaskSingle");
+            List<IvrLibaTemplateScriptVO> ivrLibaTemplateScriptVOs = (List<IvrLibaTemplateScriptVO>) map.get("ivrLibaTemplateScriptVO");
+            //灏唘uid鏇存柊鍒版暟鎹簱涓�
+            ivrTaskcall.setSenduuid(phoneCallBackVO.getUuid());
+            ivrTaskSingleMapper.updateIvrTaskcall(ivrTaskcall);
+
+            //鑾峰彇妯℃澘淇℃伅
+            IvrLibaTemplateVO ivrLibaTemplateVO = redisCache.getCacheObject(phoneCallBackVO.getUuid() + "ivrLibaTemplateVO");
+
+            //璇煶璇嗗埆缁撴灉涓婃姤鎺ュ彛: 3
+            Integer noVoice = redisCache.getCacheObject(phoneCallBackVO.getUuid() + "noVoice");
+            QuestionMessage returnQues = redisCache.getCacheObject(phoneCallBackVO.getUuid() + "returnQues");
+            //灏嗕紶鍥炵殑缁撴灉鏀惧埌鍥炲瀵硅薄涓�
+            returnQues.setContent(phoneCallBackVO.getTextResult());
+
+            IvrLibaTemplateScriptVO nowQuestion = returnQues.getNowQuestion();
+
+            if (StringUtils.isEmpty(returnQues.getContent())) {
+                //鏃犲洖璇�
+                //鍒ゆ柇noVoice鏄惁宸茬粡鍒颁簡鏈�澶у��
+                if (noVoice == ivrLibaTemplateVO.getNoVoiceNum().intValue()) {
+                    //宸茬粡闂簡瀵瑰簲鐨勯亶鏁帮紝灏卞垽鏂槸鍚﹁繕鏈変笅涓�棰�
+                    if (nowQuestion.getTargetid() == ivrLibaTemplateScriptVOs.size()) {
+                        //娌℃湁涓嬩竴棰樹簡锛屽氨鎸傛柇鐢佃瘽锛屾挱鏀剧粨鏉熻
+                        redisCache.setCacheObject(phoneCallBackVO.getUuid() + "hangup", 1, 120, TimeUnit.MINUTES);
+                        phoneUtils.ttsPlayback(ivrLibaTemplateVO.getRevisitAfter(), phoneCallBackVO.getUuid());
+                        return;
+                    } else {
+                        //鏈変笅涓�棰�
+                        redisCache.setCacheObject(phoneCallBackVO.getUuid() + "noVoice", 0, 120, TimeUnit.MINUTES);
+                        IvrLibaTemplateScriptVO nextQuestion = getNextQuestion(ivrLibaTemplateScriptVOs, nowQuestion);
+                        // 闂锛�  鍘昏皟鐢ㄢ�渢ts鍚堟垚鍜屾挱鏀锯�濇帴鍙�
+                        String date = simpleDateFormat1.format(new Date());
+                        log.info("鍘昏皟鐢╰ts鍚堟垚鍜屾挱鏀炬帴鍙�: {},uuid涓猴細{}", date, phoneCallBackVO.getUuid());
+                        phoneUtils.ttsPlayback(nowQuestion.getQuestionText(), phoneCallBackVO.getUuid());
+                    }
+                } else {
+                    redisCache.setCacheObject(phoneCallBackVO.getUuid() + "noVoice", noVoice + 1, 120, TimeUnit.MINUTES);
+                    //璋冪敤ivrLibaTemplateScriptVO涓殑slienceText(闈欓粯璇濇湳)
+                    String slienceText = nowQuestion.getSlienceText();
+                    //闈欓粯璇濇湳  + 闂锛�  鍘昏皟鐢ㄢ�渢ts鍚堟垚鍜屾挱鏀锯�濇帴鍙�
+                    String date = simpleDateFormat1.format(new Date());
+                    log.info("闈欓粯璇濇湳  + 闂,鍘昏皟鐢╰ts鍚堟垚鍜屾挱鏀炬帴鍙�: {},uuid涓猴細{}", date, phoneCallBackVO.getUuid());
+                    phoneUtils.ttsPlayback(slienceText + nowQuestion.getQuestionText(), phoneCallBackVO.getUuid());
+                    return;
                 }
-                //涓嶅寘鍚�
-                Matcher matcher2 = null;
-                if (StringUtils.isNotEmpty(nowQuestion.getIvrLibaScriptTargetoptionList().get(j).getTargetregex2())) {
-                    Pattern pattern2 = Pattern.compile(nowQuestion.getIvrLibaScriptTargetoptionList().get(j).getTargetregex2());
-                    matcher2 = pattern2.matcher(phoneCallBackVO.getTextResult());
+
+            } else {
+                //isppd鐢ㄦ潵璁板綍鏄惁鍖归厤鍒�
+                Boolean isppd = false;
+                //鏈夊洖璇濓紝瀵瑰洖绛旂殑闂,杩涜姝e垯鍖归厤锛堣繖閲屽彧閽堝閫夋嫨棰橈紝鍏跺畠棰樺瀷涓嶈锛�
+                for (int j = 0; j < nowQuestion.getIvrLibaScriptTargetoptionList().size(); j++) {
+                    //鍖呭惈
+                    Matcher matcher = null;
+                    if (StringUtils.isNotEmpty(nowQuestion.getIvrLibaScriptTargetoptionList().get(j).getTargetregex())) {
+                        Pattern pattern = Pattern.compile(nowQuestion.getIvrLibaScriptTargetoptionList().get(j).getTargetregex());
+                        matcher = pattern.matcher(phoneCallBackVO.getTextResult());
+                    }
+                    //涓嶅寘鍚�
+                    Matcher matcher2 = null;
+                    if (StringUtils.isNotEmpty(nowQuestion.getIvrLibaScriptTargetoptionList().get(j).getTargetregex2())) {
+                        Pattern pattern2 = Pattern.compile(nowQuestion.getIvrLibaScriptTargetoptionList().get(j).getTargetregex2());
+                        matcher2 = pattern2.matcher(phoneCallBackVO.getTextResult());
+                    }
+                    log.error("PCB--getQuestionText闂涓猴細{},UUID锛歿}", nowQuestion.getQuestionText(), phoneCallBackVO.getUuid());
+                    if (StringUtils.isNotEmpty(nowQuestion.getIvrLibaScriptTargetoptionList().get(j).getTargetregex2()) && matcher2.matches() && StringUtils.isNotEmpty(nowQuestion.getIvrLibaScriptTargetoptionList().get(j).getTargetregex()) && matcher.matches() || StringUtils.isEmpty(nowQuestion.getIvrLibaScriptTargetoptionList().get(j).getTargetregex()) && StringUtils.isNotEmpty(nowQuestion.getIvrLibaScriptTargetoptionList().get(j).getTargetregex2()) && matcher2.matches() || StringUtils.isEmpty(nowQuestion.getIvrLibaScriptTargetoptionList().get(j).getTargetregex2()) && StringUtils.isNotEmpty(nowQuestion.getIvrLibaScriptTargetoptionList().get(j).getTargetregex()) && matcher.matches()) {
+                        //璇存槑鍖归厤姝g‘浜�
+                        //杩欓噷搴旇鍏堝垽鏂被鍨嬶紝鍘诲啀淇敼锛岃缃甀sUserOperation鏄崟閫夐鐨勬敼娉�
+                        nowQuestion.getIvrLibaScriptTargetoptionList().get(j).setIsUserOperation(true);
+                        ivrLibaScriptTargetoptionMapper.updateIvrLibaTemplateTargetoption(nowQuestion.getIvrLibaScriptTargetoptionList().get(j));
+
+                        //灏嗛潤榛樼疆涓�0
+                        redisCache.setCacheObject(phoneCallBackVO.getUuid() + "noVoice", 0, 120, TimeUnit.MINUTES);
+                        redisCache.setCacheObject(phoneCallBackVO.getUuid() + "mateNum", 0, 120, TimeUnit.MINUTES);
+
+                        //灏嗘偅鑰呯殑鍥炵鍐欒繘琛ㄩ噷
+                        IvrTaskVisitResult ivrTaskVisitResult = DtoConversionUtils.sourceToTarget(ivrTaskcall, IvrTaskVisitResult.class);
+                        ivrTaskVisitResult.setId(null);
+                        ivrTaskVisitResult.setQuestion(nowQuestion.getQuestionText());
+                        ivrTaskVisitResult.setPatientAnswer(phoneCallBackVO.getTextResult());
+                        ivrTaskVisitResult.setCreateTime(new Date());
+                        ivrTaskVisitResult.setOptionResult(nowQuestion.getIvrLibaScriptTargetoptionList().get(j).getTargetvalue());
+                        ivrTaskVisitResultMapper.insertIvrTaskVisitResult(ivrTaskVisitResult);
+
+                        //灏嗗尮閰嶅埌鐨勬爣璇嗘敼鎴恡rue
+                        isppd = true;
+
+                        //鑾峰彇涓嬩竴棰�
+                        Integer nextQuestion = nowQuestion.getIvrLibaScriptTargetoptionList().get(j).getNextQuestion();
+                        for (IvrLibaTemplateScriptVO script : ivrLibaTemplateScriptVOs) {
+                            if (script.getTargetid() == nextQuestion) {
+                                QuestionMessage questionMessage = new QuestionMessage();
+                                questionMessage.setNowQuestion(script);
+                                questionMessage.setQuestionList(ivrLibaTemplateScriptVOs);
+                                redisCache.setCacheObject(phoneCallBackVO.getUuid() + "returnQues", questionMessage, 120, TimeUnit.MINUTES);
+                                phoneUtils.ttsPlayback(script.getQuestionText(), phoneCallBackVO.getUuid());
+                                return;
+                            } else if (nextQuestion > ivrLibaTemplateScriptVOs.size()) {
+                                //娌℃湁涓嬩竴棰樹簡锛屽氨缁撴潫浜�
+                                String date = simpleDateFormat1.format(new Date());
+                                log.error("娌℃湁涓嬩竴棰樹簡锛屽氨缁撴潫浜�: {},uuid涓猴細{}", date, phoneCallBackVO.getUuid());
+                                redisCache.setCacheObject(phoneCallBackVO.getUuid() + "hangup", 1, 120, TimeUnit.MINUTES);
+                                phoneUtils.ttsPlayback(ivrLibaTemplateVO.getRevisitAfter(), phoneCallBackVO.getUuid());
+                                try {
+                                    Thread.sleep(3000);
+                                } catch (InterruptedException e) {
+                                    e.printStackTrace();
+                                }
+                                phoneUtils.hangup("", "", ivrLibaTemplateVO.getRevisitAfter(), "", "", "", "", phoneCallBackVO.getUuid());
+                                return;
+                            }
+                        }
+                        return;
+                    } else {
+                        //娌℃湁鍖归厤涓婂綋鍓峯ption
+                        //Targetregex2 涓篺alse锛岃〃绀哄湪Targetregex2涓瓨鍦�  璇彞涓殑鍏抽敭瀛楋紝杩欎釜option灏变笉鐢ㄥ啀缁х画鍖归厤浜嗭紝鐩存帴鍖归厤涓嬩竴涓猳ption
+                        continue;
+                    }
                 }
-                log.info("phoneCallBack--Targetregex鐨勫�间负锛歿}, phoneCallBack--Targetregex2鐨勫�间负锛歿}", nowQuestion.getIvrLibaScriptTargetoptionList().get(j).getTargetregex(), nowQuestion.getIvrLibaScriptTargetoptionList().get(j).getTargetregex2());
-                if (StringUtils.isNotEmpty(nowQuestion.getIvrLibaScriptTargetoptionList().get(j).getTargetregex2()) && matcher2.matches() && StringUtils.isNotEmpty(nowQuestion.getIvrLibaScriptTargetoptionList().get(j).getTargetregex()) && matcher.matches()
-                        || StringUtils.isEmpty(nowQuestion.getIvrLibaScriptTargetoptionList().get(j).getTargetregex()) && StringUtils.isNotEmpty(nowQuestion.getIvrLibaScriptTargetoptionList().get(j).getTargetregex2()) && matcher2.matches()
-                        || StringUtils.isEmpty(nowQuestion.getIvrLibaScriptTargetoptionList().get(j).getTargetregex2()) && StringUtils.isNotEmpty(nowQuestion.getIvrLibaScriptTargetoptionList().get(j).getTargetregex()) && matcher.matches()) {
-                    //璇存槑鍖归厤姝g‘浜�
-                    //杩欓噷搴旇鍏堝垽鏂被鍨嬶紝鍘诲啀淇敼锛岃缃甀sUserOperation鏄崟閫夐鐨勬敼娉�
-                    nowQuestion.getIvrLibaScriptTargetoptionList().get(j).setIsUserOperation(true);
-                    ivrLibaScriptTargetoptionMapper.updateIvrLibaTemplateTargetoption(nowQuestion.getIvrLibaScriptTargetoptionList().get(j));
 
-                    //灏嗛潤榛樼疆涓�0
-                    redisCache.setCacheObject(phoneCallBackVO.getUuid() + "noVoice", 0, 120, TimeUnit.MINUTES);
-                    redisCache.setCacheObject(phoneCallBackVO.getUuid() + "mateNum", 0, 120, TimeUnit.MINUTES);
-
-                    //灏嗘偅鑰呯殑鍥炵鍐欒繘琛ㄩ噷
-                    IvrTaskVisitResult ivrTaskVisitResult = DtoConversionUtils.sourceToTarget(ivrTaskcall, IvrTaskVisitResult.class);
-                    ivrTaskVisitResult.setId(null);
-                    ivrTaskVisitResult.setQuestion(nowQuestion.getQuestionText());
-                    ivrTaskVisitResult.setPatientAnswer(phoneCallBackVO.getTextResult());
-                    ivrTaskVisitResult.setCreateTime(new Date());
-                    ivrTaskVisitResult.setOptionResult(nowQuestion.getIvrLibaScriptTargetoptionList().get(j).getTargetvalue());
-                    ivrTaskVisitResultMapper.insertIvrTaskVisitResult(ivrTaskVisitResult);
-
-                    //灏嗗尮閰嶅埌鐨勬爣璇嗘敼鎴恡rue
-                    isppd = true;
-
-                    //鑾峰彇涓嬩竴棰�
-                    Integer nextQuestion = nowQuestion.getIvrLibaScriptTargetoptionList().get(j).getNextQuestion();
-                    for (IvrLibaTemplateScriptVO script : ivrLibaTemplateScriptVOs) {
-                        if (script.getTargetid() == nextQuestion) {
+                if (isppd != true) {
+                    //娌℃湁鍖归厤鍒�
+                    Integer mateNum = redisCache.getCacheObject(phoneCallBackVO.getUuid() + "mateNum");
+                    if (mateNum == null) mateNum = 0;
+                    //鏃犲尮閰嶆鏁板幓鍒ゆ柇鏄惁鍒版渶澶ц闂鏁帮紝骞朵笖鎵�鏈夌殑閫夐」閮藉尮閰嶅畬浜�
+                    if (mateNum == ivrLibaTemplateVO.getMateNum().intValue()) {
+                        //濡傛灉涓嬩竴棰樹负绌�.鍒欐柊鐨勬暟鎹繑鍥�,骞跺姞涓婃劅璋㈣
+                        if (nowQuestion.getTargetid() < ivrLibaTemplateScriptVOs.size()) {
                             QuestionMessage questionMessage = new QuestionMessage();
-                            questionMessage.setNowQuestion(script);
+                            IvrLibaTemplateScriptVO nextQuestion = getNextQuestion(ivrLibaTemplateScriptVOs, nowQuestion);
                             questionMessage.setQuestionList(ivrLibaTemplateScriptVOs);
+                            questionMessage.setNowQuestion(nextQuestion);
                             redisCache.setCacheObject(phoneCallBackVO.getUuid() + "returnQues", questionMessage, 120, TimeUnit.MINUTES);
-                            phoneUtils.ttsPlayback(script.getQuestionText(), phoneCallBackVO.getUuid());
+                            redisCache.setCacheObject(phoneCallBackVO.getUuid() + "mateNum", 0, 120, TimeUnit.MINUTES);
+                            String date = simpleDateFormat1.format(new Date());
+                            log.info("濡傛灉涓嬩竴棰樹负绌�.鍒欐柊鐨勬暟鎹繑鍥�,骞跺姞涓婃劅璋㈣: {},uuid涓猴細{}", date, phoneCallBackVO.getUuid());
+                            phoneUtils.ttsPlayback(nextQuestion.getQuestionText(), phoneCallBackVO.getUuid());
                             return;
-                        } else if (nextQuestion > ivrLibaTemplateScriptVOs.size()) {
-                            //娌℃湁涓嬩竴棰樹簡锛屽氨缁撴潫浜�
+                        } else {
+                            //灏卞彲浠ユ寕鏂數璇濅簡
+                            String date = simpleDateFormat1.format(new Date());
+                            log.info("灏卞彲浠ユ寕鏂數璇濅簡------: {},uuid涓猴細{}", date, phoneCallBackVO.getUuid());
                             redisCache.setCacheObject(phoneCallBackVO.getUuid() + "hangup", 1, 120, TimeUnit.MINUTES);
                             phoneUtils.ttsPlayback(ivrLibaTemplateVO.getRevisitAfter(), phoneCallBackVO.getUuid());
                             try {
@@ -454,94 +505,62 @@
                             phoneUtils.hangup("", "", ivrLibaTemplateVO.getRevisitAfter(), "", "", "", "", phoneCallBackVO.getUuid());
                             return;
                         }
+                    } else if (mateNum < ivrLibaTemplateVO.getMateNum().intValue()) {
+                        //娌℃湁闂埌瑙勫畾娆℃暟
+                        mateNum = mateNum + 1;
+                        redisCache.setCacheObject(phoneCallBackVO.getUuid() + "mateNum", mateNum, 120, TimeUnit.MINUTES);
                     }
-                    return;
-                } else {
-                    //娌℃湁鍖归厤涓婂綋鍓峯ption
-                    //Targetregex2 涓篺alse锛岃〃绀哄湪Targetregex2涓瓨鍦�  璇彞涓殑鍏抽敭瀛楋紝杩欎釜option灏变笉鐢ㄥ啀缁х画鍖归厤浜嗭紝鐩存帴鍖归厤涓嬩竴涓猳ption
-                    continue;
                 }
-            }
-
-            if (isppd != true) {
-                //娌℃湁鍖归厤鍒�
-                Integer mateNum = redisCache.getCacheObject(phoneCallBackVO.getUuid() + "mateNum");
-                if (mateNum == null) mateNum = 0;
-                //鏃犲尮閰嶆鏁板幓鍒ゆ柇鏄惁鍒版渶澶ц闂鏁帮紝骞朵笖鎵�鏈夌殑閫夐」閮藉尮閰嶅畬浜�
-                if (mateNum == ivrLibaTemplateVO.getMateNum().intValue()) {
-                    //濡傛灉涓嬩竴棰樹负绌�.鍒欐柊鐨勬暟鎹繑鍥�,骞跺姞涓婃劅璋㈣
-                    if (nowQuestion.getTargetid() < ivrLibaTemplateScriptVOs.size()) {
-                        QuestionMessage questionMessage = new QuestionMessage();
-                        IvrLibaTemplateScriptVO nextQuestion = getNextQuestion(ivrLibaTemplateScriptVOs, nowQuestion);
-                        questionMessage.setQuestionList(ivrLibaTemplateScriptVOs);
-                        questionMessage.setNowQuestion(nextQuestion);
-                        redisCache.setCacheObject(phoneCallBackVO.getUuid() + "returnQues", questionMessage, 120, TimeUnit.MINUTES);
-                        redisCache.setCacheObject(phoneCallBackVO.getUuid() + "mateNum", 0, 120, TimeUnit.MINUTES);
-                        phoneUtils.ttsPlayback(nextQuestion.getQuestionText(), phoneCallBackVO.getUuid());
-                        return;
-                    } else {
-                        //灏卞彲浠ユ寕鏂數璇濅簡
-                        redisCache.setCacheObject(phoneCallBackVO.getUuid() + "hangup", 1, 120, TimeUnit.MINUTES);
-                        phoneUtils.ttsPlayback(ivrLibaTemplateVO.getRevisitAfter(), phoneCallBackVO.getUuid());
-                        try {
-                            Thread.sleep(3000);
-                        } catch (InterruptedException e) {
-                            e.printStackTrace();
+                //閫夐」鍖归厤瀹屾垚鍚庯紝闇�瑕佸啀鍘婚�氳繃搴撳啀杩涜鍖归厤涓�娆�
+                String extemplateID = ivrLibaTemplateVO.getSubmoduleID();
+                String[] split = extemplateID.split(",");
+                List<String> list = Arrays.asList(split);
+                List<Long> list1 = new ArrayList<>();
+                if (StringUtils.isNotEmpty(extemplateID)) {
+                    for (String str : list) {
+                        list1.add(Long.valueOf(str));
+                    }
+                    List<IvrLibaExtemplatescript> ivrLibaExtemplatescripts = ivrLibaExtemplatescriptMapper.queryIvrLibaExtemplatescriptList(list1);
+                    for (IvrLibaExtemplatescript ivrLibaExtemplatescript : ivrLibaExtemplatescripts) {
+                        Matcher matcher = null;
+                        if (StringUtils.isNotEmpty(ivrLibaExtemplatescript.getSelfRegex())) {
+                            Pattern pattern = Pattern.compile(ivrLibaExtemplatescript.getSelfRegex());
+                            matcher = pattern.matcher(returnQues.getContent());
                         }
-                        phoneUtils.hangup("", "", ivrLibaTemplateVO.getRevisitAfter(), "", "", "", "", phoneCallBackVO.getUuid());
-                        return;
-                    }
-                } else if (mateNum < ivrLibaTemplateVO.getMateNum().intValue()) {
-                    //娌℃湁闂埌瑙勫畾娆℃暟
-                    mateNum = mateNum + 1;
-                    redisCache.setCacheObject(phoneCallBackVO.getUuid() + "mateNum", mateNum, 120, TimeUnit.MINUTES);
-                }
-            }
-            //閫夐」鍖归厤瀹屾垚鍚庯紝闇�瑕佸啀鍘婚�氳繃搴撳啀杩涜鍖归厤涓�娆�
-            String extemplateID = ivrLibaTemplateVO.getSubmoduleID();
-            String[] split = extemplateID.split(",");
-            List<String> list = Arrays.asList(split);
-            List<Long> list1 = new ArrayList<>();
-            if (StringUtils.isNotEmpty(extemplateID)) {
-                for (String str : list) {
-                    list1.add(Long.valueOf(str));
-                }
-                List<IvrLibaExtemplatescript> ivrLibaExtemplatescripts = ivrLibaExtemplatescriptMapper.queryIvrLibaExtemplatescriptList(list1);
-                for (IvrLibaExtemplatescript ivrLibaExtemplatescript : ivrLibaExtemplatescripts) {
-                    Matcher matcher = null;
-                    if (StringUtils.isNotEmpty(ivrLibaExtemplatescript.getSelfRegex())) {
-                        Pattern pattern = Pattern.compile(ivrLibaExtemplatescript.getSelfRegex());
-                        matcher = pattern.matcher(returnQues.getContent());
-                    }
 
-                    Matcher matcher2 = null;
-                    if (StringUtils.isNotEmpty(ivrLibaExtemplatescript.getSelfRegex2())) {
-                        Pattern pattern2 = Pattern.compile(ivrLibaExtemplatescript.getSelfRegex2());
-                        matcher2 = pattern2.matcher(returnQues.getContent());
-                    }
-                    log.info("++++++++++++++++++++++++++閫氱敤搴撴槸鍚︿负绌猴細selfRegex : {} , selfRegex2 : {}", ivrLibaExtemplatescript.getSelfRegex(), ivrLibaExtemplatescript.getSelfRegex2());
-                    if (StringUtils.isNotEmpty(ivrLibaExtemplatescript.getSelfRegex()) && matcher.matches() && StringUtils.isNotEmpty(ivrLibaExtemplatescript.getSelfRegex2()) && matcher2.matches() || StringUtils.isEmpty(ivrLibaExtemplatescript.getSelfRegex()) && StringUtils.isNotEmpty(ivrLibaExtemplatescript.getSelfRegex2()) && matcher2.matches() || StringUtils.isEmpty(ivrLibaExtemplatescript.getSelfRegex2()) && StringUtils.isNotEmpty(ivrLibaExtemplatescript.getSelfRegex()) && matcher.matches()) {
-                        QuestionMessage questionMessage = redisCache.getCacheObject(phoneCallBackVO.getUuid() + "returnQues");
-                        IvrLibaTemplateScriptVO ivrLibaTemplateScriptVO = returnQues.getNowQuestion();
-                        ivrLibaTemplateScriptVO.setSubmoduleText(ivrLibaExtemplatescript.getSwitchText());
-                        ivrLibaTemplateScriptVO.setSubmoduleVoice(ivrLibaExtemplatescript.getSwitchWav());
-                        redisCache.setCacheObject(phoneCallBackVO.getUuid() + "returnQues", questionMessage, 120, TimeUnit.MINUTES);
-                        if (ivrLibaExtemplatescript.getIsEnd() == 1) {
-                            //灏嗛棶棰樼疆绌�
-                            IvrLibaTemplateScriptVO nowQuestion1 = questionMessage.getNowQuestion();
-                            nowQuestion1.setQuestionText(null);
-                            nowQuestion1.setQuestionVoice(null);
-                            questionMessage.setNowQuestion(nowQuestion1);
+                        Matcher matcher2 = null;
+                        if (StringUtils.isNotEmpty(ivrLibaExtemplatescript.getSelfRegex2())) {
+                            Pattern pattern2 = Pattern.compile(ivrLibaExtemplatescript.getSelfRegex2());
+                            matcher2 = pattern2.matcher(returnQues.getContent());
+                        }
+                        log.info("++++++++++++++++++++++++++閫氱敤搴撴槸鍚︿负绌猴細selfRegex : {} , selfRegex2 : {}", ivrLibaExtemplatescript.getSelfRegex(), ivrLibaExtemplatescript.getSelfRegex2());
+                        if (StringUtils.isNotEmpty(ivrLibaExtemplatescript.getSelfRegex()) && matcher.matches() && StringUtils.isNotEmpty(ivrLibaExtemplatescript.getSelfRegex2()) && matcher2.matches() || StringUtils.isEmpty(ivrLibaExtemplatescript.getSelfRegex()) && StringUtils.isNotEmpty(ivrLibaExtemplatescript.getSelfRegex2()) && matcher2.matches() || StringUtils.isEmpty(ivrLibaExtemplatescript.getSelfRegex2()) && StringUtils.isNotEmpty(ivrLibaExtemplatescript.getSelfRegex()) && matcher.matches()) {
+                            QuestionMessage questionMessage = redisCache.getCacheObject(phoneCallBackVO.getUuid() + "returnQues");
+                            IvrLibaTemplateScriptVO ivrLibaTemplateScriptVO = returnQues.getNowQuestion();
+                            ivrLibaTemplateScriptVO.setSubmoduleText(ivrLibaExtemplatescript.getSwitchText());
+                            ivrLibaTemplateScriptVO.setSubmoduleVoice(ivrLibaExtemplatescript.getSwitchWav());
                             redisCache.setCacheObject(phoneCallBackVO.getUuid() + "returnQues", questionMessage, 120, TimeUnit.MINUTES);
+                            if (ivrLibaExtemplatescript.getIsEnd() == 1) {
+                                //灏嗛棶棰樼疆绌�
+                                IvrLibaTemplateScriptVO nowQuestion1 = questionMessage.getNowQuestion();
+                                nowQuestion1.setQuestionText(null);
+                                nowQuestion1.setQuestionVoice(null);
+                                questionMessage.setNowQuestion(nowQuestion1);
+                                redisCache.setCacheObject(phoneCallBackVO.getUuid() + "returnQues", questionMessage, 120, TimeUnit.MINUTES);
 
-                            redisCache.setCacheObject(phoneCallBackVO.getUuid() + "isOver", 1, 120, TimeUnit.MINUTES);
+                                redisCache.setCacheObject(phoneCallBackVO.getUuid() + "isOver", 1, 120, TimeUnit.MINUTES);
+                            }
+                            //璋冪敤鈥�15銆乼ts鍚堟垚鍜屾挱鏀撅紝 tts_playback鈥濆皢缁撴灉浼犲洖
+                            String date = simpleDateFormat1.format(new Date());
+                            log.info("璋冪敤鈥�15銆乼ts鍚堟垚鍜屾挱鏀�------: {},uuid涓猴細{}", date, phoneCallBackVO.getUuid());
+                            phoneUtils.ttsPlayback(nowQuestion.getQuestionText() + ivrLibaTemplateScriptVO.getSubmoduleText(), phoneCallBackVO.getUuid());
                         }
-                        //璋冪敤鈥�15銆乼ts鍚堟垚鍜屾挱鏀撅紝 tts_playback鈥濆皢缁撴灉浼犲洖
-                        phoneUtils.ttsPlayback(nowQuestion.getQuestionText() + ivrLibaTemplateScriptVO.getSubmoduleText(), phoneCallBackVO.getUuid());
+                        break;
                     }
-                    break;
+                    String date = simpleDateFormat1.format(new Date());
+                    log.info("鏈�鍚庣殑淇℃伅鍥炲-: {},uuid涓猴細{}", date, phoneCallBackVO.getUuid());
+                    phoneUtils.ttsPlayback(nowQuestion.getQuestionText(), phoneCallBackVO.getUuid());
                 }
-                phoneUtils.ttsPlayback(nowQuestion.getQuestionText(), phoneCallBackVO.getUuid());
             }
         }
     }

--
Gitblit v1.9.3