增加了意图命中时的motion字段

xueyi-modules/xueyi-nlt/src/main/java/com/xueyi/nlt/nlt/controller/DmIntentController.java

@@ -13,6 +13,7 @@ import com.xueyi.common.cache.utils.SourceUtil;
 import com.xueyi.common.core.constant.basic.SecurityConstants;
 import com.xueyi.common.core.constant.digitalman.MessageConstants;
 import com.xueyi.common.core.context.SecurityContextHolder;
+import com.xueyi.common.core.utils.core.ListUtil;
 import com.xueyi.common.core.web.result.AjaxResult;
 import com.xueyi.common.core.web.result.R;
 import com.xueyi.common.core.web.validate.V_A;
@@ -37,10 +38,12 @@ import com.xueyi.nlt.nlt.template.FreeChatTemplate;
 import com.xueyi.nlt.nlt.template.GenerativeKnowledgeTemplate;
 import com.xueyi.nlt.nlt.template.MeetingOrderTemplate;
 import com.xueyi.system.api.digitalmans.domain.dto.DmManDeviceDto;
+import com.xueyi.system.api.digitalmans.domain.dto.DmSkillDto;
 import com.xueyi.system.api.digitalmans.domain.vo.DmBatchQuestionsVo;
 import com.xueyi.system.api.digitalmans.feign.RemoteDigitalmanService;
 import com.xueyi.system.api.digitalmans.feign.RemoteManDeviceService;
 import com.xueyi.system.api.digitalmans.feign.RemoteQuestionanswersService;
+import com.xueyi.system.api.digitalmans.feign.RemoteSkillService;
 import com.xueyi.system.api.model.Source;
 import com.xueyi.system.api.organize.domain.dto.SysEnterpriseDto;
 import com.xueyi.system.api.organize.feign.RemoteEnterpriseService;
@@ -60,13 +63,10 @@ import java.io.IOException;
 import java.io.Serializable;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
-import java.util.Arrays;
+import java.util.*;
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.concurrent.TimeUnit;
@@ -118,6 +118,9 @@ public class DmIntentController extends BaseController<DmIntentQuery, DmIntentDt
     @Autowired
     private RemoteQuestionanswersService questionanswersService;
 
+    @Autowired
+    private RemoteSkillService remoteskillService;
+
     @Autowired
     RemoteEnterpriseService enterpriseService;
 
@@ -204,6 +207,18 @@ public class DmIntentController extends BaseController<DmIntentQuery, DmIntentDt
                 if (jo.containsKey("json") && StringUtils.isNotEmpty(jo.getString("json"))) {
                     String skillCode = jo.getJSONObject("json").getString("skillCode");
                     intent.setSkillCode(skillCode);
+                    R<List<DmSkillDto>> skilllistInner = remoteskillService.skilllistInner(intent.getDevId(),"1",manDeviceDtoR.getData().getTId(), source.getMaster(), SecurityConstants.INNER);
+                    if(skilllistInner.isOk()){
+                        List<DmSkillDto> skilllist=skilllistInner.getData();
+                        for (DmSkillDto dmSkillDto : skilllist) {
+                            if (dmSkillDto.getSkillCode().equals(skillCode)) {
+                                if(dmSkillDto.getStatus().equals("0")){
+                                    return AjaxResult.error(10001,"操作无权限");
+                                }
+                                voResult.setMotion(dmSkillDto.getMotionName());
+                            }
+                        }
+                    }
                     voResult.setJsonFormat(jo.getJSONObject("json"));
                     voResult.setType("1");
                 }

xueyi-modules/xueyi-nlt/src/main/java/com/xueyi/nlt/nlt/domain/vo/IntentTemplateVo.java

@@ -15,5 +15,6 @@ public class IntentTemplateVo {
     private Integer target;
     private String skillCode;
     private JSONObject jsonFormat;
+    private String motion;
     private String type ="0";
 }