From 30576993bd40801296c64783417585394a7bfec9 Mon Sep 17 00:00:00 2001
From: 10710 <1071020418@qq.com>
Date: Mon, 4 Mar 2024 15:58:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=20=20=20=201=E3=80=81?=
 =?UTF-8?q?=E5=B0=86=E6=9C=8D=E5=8A=A1=E8=BF=9B=E8=A1=8C=E6=8B=86=E5=88=86?=
 =?UTF-8?q?=EF=BC=882=EF=BC=89=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nlt/nlt/service/IDmIntentService.java     |  2 --
 .../nlt/service/impl/DmIntentServiceImpl.java | 20 +++++++++----------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/xueyi-modules/xueyi-nlt/src/main/java/com/xueyi/nlt/nlt/service/IDmIntentService.java b/xueyi-modules/xueyi-nlt/src/main/java/com/xueyi/nlt/nlt/service/IDmIntentService.java
index add166d1..d4a34a4f 100644
--- a/xueyi-modules/xueyi-nlt/src/main/java/com/xueyi/nlt/nlt/service/IDmIntentService.java
+++ b/xueyi-modules/xueyi-nlt/src/main/java/com/xueyi/nlt/nlt/service/IDmIntentService.java
@@ -12,6 +12,4 @@ public interface IDmIntentService extends IBaseService<DmIntentQuery, DmIntentDt
     DmIntentResponse knowledgeAnswer(DmIntentVo intent);
 
     DmIntentResponse conversation(DmIntentVo intent);
-
-    DmIntentResponse sessionHandle(DmIntentVo intent);
 }
diff --git a/xueyi-modules/xueyi-nlt/src/main/java/com/xueyi/nlt/nlt/service/impl/DmIntentServiceImpl.java b/xueyi-modules/xueyi-nlt/src/main/java/com/xueyi/nlt/nlt/service/impl/DmIntentServiceImpl.java
index 6870f466..bd352cb3 100644
--- a/xueyi-modules/xueyi-nlt/src/main/java/com/xueyi/nlt/nlt/service/impl/DmIntentServiceImpl.java
+++ b/xueyi-modules/xueyi-nlt/src/main/java/com/xueyi/nlt/nlt/service/impl/DmIntentServiceImpl.java
@@ -84,13 +84,7 @@ public class DmIntentServiceImpl extends BaseServiceImpl<DmIntentQuery, DmIntent
 
     @Override
     public DmIntentResponse conversation(DmIntentVo intent) {
-        DmIntentResponse response = sessionHandle(intent);
-        //已有session的处理
-        if(response != null && StringUtils.isNotEmpty(response.getSkillCode())){
-            return response;
-        }
-
-        response = regularAnswer(intent);
+        DmIntentResponse response = regularAnswer(intent);
         if (response != null && (StringUtils.isNotEmpty(response.getSkillCode()) || StringUtils.isNotEmpty(response.getMsg()))) {
             return response;
         }
@@ -124,8 +118,14 @@ public class DmIntentServiceImpl extends BaseServiceImpl<DmIntentQuery, DmIntent
             enterpriseName = enterpriseDtoR.getData().getName();
         }
 
+        DmIntentResponse response = sessionHandle(intent);
+        //已有session的处理
+        if(response != null && StringUtils.isNotEmpty(response.getSkillCode())){
+            return response;
+        }
+
         // 正则技能匹配
-        DmIntentResponse response = regularManager.doRegularMatch(intent.getContent());
+        response = regularManager.doRegularMatch(intent.getContent());
         if (response != null && StringUtils.isNotEmpty(response.getSkillCode())){
             sendToDashboard(intent, enterpriseName);
 
@@ -184,7 +184,6 @@ public class DmIntentServiceImpl extends BaseServiceImpl<DmIntentQuery, DmIntent
         Long enterpriseId = manDeviceDtoR.getData().getTId();
         String enterpriseName = "";
         R<SysEnterpriseDto> enterpriseDtoR = remoteEnterpriseService.getInfo(Long.valueOf(enterpriseId));
-        Source source = SourceUtil.getSourceCache(enterpriseDtoR.getData().getStrategyId());
         if (enterpriseDtoR.isOk()) {
             enterpriseName = enterpriseDtoR.getData().getName();
         }
@@ -225,8 +224,7 @@ public class DmIntentServiceImpl extends BaseServiceImpl<DmIntentQuery, DmIntent
         return response;
     }
 
-    @Override
-    public DmIntentResponse sessionHandle(DmIntentVo intent) {
+    private DmIntentResponse sessionHandle(DmIntentVo intent) {
         R<DmManDeviceDto> manDeviceDtoR = manDeviceService.manDeviceInfoInner(intent.getDevId());
         Long enterpriseId = manDeviceDtoR.getData().getTId();