|
|
|
@@ -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(); |
|
|
|
|
|
|
|
|