|
@@ -196,7 +196,8 @@ public class AIQuestionServiceImpl extends ServiceImpl<AIQuestionMapper, AIQuest
|
|
|
public HttpRespMsg ask(QuestionBO questionBO, HttpServletRequest request) {
|
|
|
HttpRespMsg httpRespMsg = new HttpRespMsg();
|
|
|
User user = userMapper.selectById(request.getHeader("token"));
|
|
|
-
|
|
|
+// String[] typeList = {"系统表", "自定义报表", "本地上传", "自由交流"};
|
|
|
+// String typeName = typeList[questionBO.getQuestionDataSource() - 1];
|
|
|
String queryRes = "";
|
|
|
if(1 == questionBO.getQuestionDataSource()){
|
|
|
/**
|
|
@@ -250,7 +251,11 @@ public class AIQuestionServiceImpl extends ServiceImpl<AIQuestionMapper, AIQuest
|
|
|
if(responseEntity.getStatusCode().is2xxSuccessful()){
|
|
|
JSONObject jsonObject = JSONObject.parseObject(responseEntity.getBody());
|
|
|
System.out.println("jsonObject=== "+jsonObject);
|
|
|
- queryRes = jsonObject.getString("data");
|
|
|
+ if (jsonObject.getString("code").equals("ok")) {
|
|
|
+ queryRes = jsonObject.getString("data");
|
|
|
+ } else {
|
|
|
+ queryRes = jsonObject.getString("msg");
|
|
|
+ }
|
|
|
}else{
|
|
|
queryRes = "AI分析有误,稍后再试";
|
|
|
}
|
|
@@ -403,6 +408,8 @@ public class AIQuestionServiceImpl extends ServiceImpl<AIQuestionMapper, AIQuest
|
|
|
cusAsk.setSeq(startSeq+1);
|
|
|
cusAsk.setQuestionId(questionId);
|
|
|
cusAsk.setType(1);
|
|
|
+ //拼接问话内容:[typeName]- [questionBO.getDataName()]+ [content]
|
|
|
+// String content = "[" + typeName + (questionBO.getDataName() == null?"":("-"+questionBO.getDataName()) + "]") + "<br>"+ questionBO.getContent();
|
|
|
cusAsk.setContent(questionBO.getContent());
|
|
|
cusAsk.setQuestionDataSource(questionBO.getQuestionDataSource());
|
|
|
cusAsk.setSourceContent(questionBO.getSourceContent());
|
|
@@ -410,18 +417,20 @@ public class AIQuestionServiceImpl extends ServiceImpl<AIQuestionMapper, AIQuest
|
|
|
cusAsk.setEndDate(questionBO.getEndDate());
|
|
|
aiQuestionDetailMapper.insert(cusAsk);
|
|
|
|
|
|
- AIQuestionDetail aiAnswer = new AIQuestionDetail();
|
|
|
- aiAnswer.setCreatorId(user.getId());
|
|
|
- aiAnswer.setCompanyId(user.getCompanyId());
|
|
|
- aiAnswer.setSeq(startSeq+2);
|
|
|
- aiAnswer.setQuestionId(questionId);
|
|
|
- aiAnswer.setType(0);
|
|
|
- aiAnswer.setContent(queryRes);
|
|
|
- aiAnswer.setQuestionDataSource(questionBO.getQuestionDataSource());
|
|
|
- aiAnswer.setSourceContent(questionBO.getSourceContent());
|
|
|
- aiAnswer.setStartDate(questionBO.getStartDate());
|
|
|
- aiAnswer.setEndDate(questionBO.getEndDate());
|
|
|
- aiQuestionDetailMapper.insert(aiAnswer);
|
|
|
+ if (queryRes != null) {
|
|
|
+ AIQuestionDetail aiAnswer = new AIQuestionDetail();
|
|
|
+ aiAnswer.setCreatorId(user.getId());
|
|
|
+ aiAnswer.setCompanyId(user.getCompanyId());
|
|
|
+ aiAnswer.setSeq(startSeq+2);
|
|
|
+ aiAnswer.setQuestionId(questionId);
|
|
|
+ aiAnswer.setType(0);
|
|
|
+ aiAnswer.setContent(queryRes);
|
|
|
+ aiAnswer.setQuestionDataSource(questionBO.getQuestionDataSource());
|
|
|
+ aiAnswer.setSourceContent(questionBO.getSourceContent());
|
|
|
+ aiAnswer.setStartDate(questionBO.getStartDate());
|
|
|
+ aiAnswer.setEndDate(questionBO.getEndDate());
|
|
|
+ aiQuestionDetailMapper.insert(aiAnswer);
|
|
|
+ }
|
|
|
|
|
|
resMap.put("questionId",questionId);
|
|
|
}
|