Merge pull request 'yinruoxi:' (#51) from dev_nlt into dev

Reviewed-on: http://39.105.23.186:3000/develop/digimeta-MultiSaas/pulls/51

xueyi-api/xueyi-api-nlt/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1 +1,3 @@
 com.xueyi.nlt.api.nlt.feign.factory.RemoteIntentFallbackFactory
+com.xueyi.nlt.api.nlt.feign.factory.RemoteQAFallbackFactory
+com.xueyi.nlt.api.nlt.feign.factory.RemoteLandingLlmFallbackFactory

xueyi-api/xueyi-api-system/src/main/java/com/xueyi/system/api/digitalmans/feign/RemoteQuestionanswersService.java

@@ -17,7 +17,7 @@ public interface RemoteQuestionanswersService {
 
 
     @PostMapping("/questionanswers/inner/batch_insert")
-    public R<DmReceptionVo> batchInsertInner(@RequestParam("knowledgeId") Long knowledgeId,@RequestParam("manId") Long manId, @RequestParam("questions") JSONArray questions,
+    public R<DmReceptionVo> batchInsertInner(@RequestParam("knowledgeId") Long knowledgeId, @RequestParam("questions") JSONArray questions,
                                                   @RequestHeader(SecurityConstants.ENTERPRISE_ID) Long enterpriseId, @RequestHeader(SecurityConstants.SOURCE_NAME) String sourceName, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
 }

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

@@ -337,7 +337,7 @@ public class DmIntentController extends BaseController<DmIntentQuery, DmIntentDt
             log.warn("任务执行失败：{}",vo);
         }
         Source source = SourceUtil.getSourceCache(enterpriseDtoR.getData().getStrategyId());
-        questionanswersService.batchInsertInner(vo.getKnowledgeId(),vo.getManId(), JSONArray.from(joResult.get("questions")),vo.getTenantId(),source.getMaster(),SecurityConstants.INNER);
+        questionanswersService.batchInsertInner(vo.getKnowledgeId(),JSONArray.from(joResult.get("questions")),vo.getTenantId(),source.getMaster(),SecurityConstants.INNER);
 
         return R.ok(null,"处理成功");
     }

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/digitalmans/controller/DmQAndAController.java

@@ -49,8 +49,8 @@ public class DmQAndAController extends BaseController<DmQAndAQuery, DmQAndADto,
 
 
     @PostMapping("/inner/batch_insert")
-    public R<Integer> batchInsertInner(@RequestParam("knowledgeId") Long knowledgeId, @RequestParam("manId") Long manId, @RequestParam("questions") JSONArray questions) {
-        log.info("knowledgeId:{},manId:{},questions:{}", knowledgeId, manId, questions.toJSONString());
+    public R<Integer> batchInsertInner(@RequestParam("knowledgeId") Long knowledgeId, @RequestParam("questions") JSONArray questions) {
+        log.info("knowledgeId:{},manId:{},questions:{}", knowledgeId,  questions.toJSONString());
         List<DmQAndADto> queries = new ArrayList<>();
         // JsonArray转换为对象
         questions.forEach(item -> {
@@ -58,7 +58,6 @@ public class DmQAndAController extends BaseController<DmQAndAQuery, DmQAndADto,
             JSONObject jsonObject = (JSONObject) item;
             query.setName(jsonObject.getString("question"));
             query.setAnswer(jsonObject.getString("answer"));
-            query.setManId(manId);
             query.setKnowledgeId(knowledgeId);
             queries.add(query);
         });