|
|
@@ -93,6 +93,9 @@ public class TakaiAiServiceImpl implements ITakaiAiService {
|
|
|
@Autowired
|
|
|
public RedisTemplate redisTemplate;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private TakaiSliceInfoMapper takaiSliceInfoMapper;
|
|
|
+
|
|
|
public static final String START_SIGN = "【";
|
|
|
public static final String END_SIGN = "】";
|
|
|
public static final String SYMBOL = "【示意图序号";
|
|
|
@@ -835,34 +838,35 @@ public class TakaiAiServiceImpl implements ITakaiAiService {
|
|
|
|
|
|
@Override
|
|
|
public JSONObject getSliceList(TakaiSliceParams params) {
|
|
|
- String url = deepseekConfig.getBaseurl() + deepseekConfig.getSlicePage();
|
|
|
- JSONObject jsonObject = new JSONObject();
|
|
|
- jsonObject.put("document_id", params.getDocument_id());
|
|
|
- jsonObject.put("knowledge_id", params.getKnowledge_id());
|
|
|
- jsonObject.put("text", params.getText());
|
|
|
- jsonObject.put("pageNum", params.getPageNum());
|
|
|
- jsonObject.put("pageSize", params.getPageSize());
|
|
|
-
|
|
|
- RequestBody requestBody = FormBody.create(MediaType.parse("application/json; charset=utf-8"), jsonObject.toJSONString());
|
|
|
- Request request = buildPostRequest(url, requestBody);
|
|
|
|
|
|
- OkHttpClient client = buildOkHttpClient();
|
|
|
- Response response = null;
|
|
|
- try {
|
|
|
- response = client.newCall(request).execute();
|
|
|
- if (response.isSuccessful()) {
|
|
|
- String body = response.body().string();
|
|
|
- JSONObject obj = JSON.parseObject(body);
|
|
|
- Integer code = obj.getInteger("code");
|
|
|
- if (code == 200) {
|
|
|
- return obj;
|
|
|
- }
|
|
|
- } else {
|
|
|
- logger.info("获取切片列表调用python接口失败,返回状态码:{}", response.code());
|
|
|
- }
|
|
|
- } catch (IOException e) {
|
|
|
- logger.error("获取切片列表调用python接口失败", e.getMessage());
|
|
|
- }
|
|
|
+// String url = deepseekConfig.getBaseurl() + deepseekConfig.getSlicePage();
|
|
|
+// JSONObject jsonObject = new JSONObject();
|
|
|
+// jsonObject.put("document_id", params.getDocument_id());
|
|
|
+// jsonObject.put("knowledge_id", params.getKnowledge_id());
|
|
|
+// jsonObject.put("text", params.getText());
|
|
|
+// jsonObject.put("pageNum", params.getPageNum());
|
|
|
+// jsonObject.put("pageSize", params.getPageSize());
|
|
|
+//
|
|
|
+// RequestBody requestBody = FormBody.create(MediaType.parse("application/json; charset=utf-8"), jsonObject.toJSONString());
|
|
|
+// Request request = buildPostRequest(url, requestBody);
|
|
|
+//
|
|
|
+// OkHttpClient client = buildOkHttpClient();
|
|
|
+// Response response = null;
|
|
|
+// try {
|
|
|
+// response = client.newCall(request).execute();
|
|
|
+// if (response.isSuccessful()) {
|
|
|
+// String body = response.body().string();
|
|
|
+// JSONObject obj = JSON.parseObject(body);
|
|
|
+// Integer code = obj.getInteger("code");
|
|
|
+// if (code == 200) {
|
|
|
+// return obj;
|
|
|
+// }
|
|
|
+// } else {
|
|
|
+// logger.info("获取切片列表调用python接口失败,返回状态码:{}", response.code());
|
|
|
+// }
|
|
|
+// } catch (IOException e) {
|
|
|
+// logger.error("获取切片列表调用python接口失败", e.getMessage());
|
|
|
+// }
|
|
|
return null;
|
|
|
}
|
|
|
|
|
|
@@ -878,6 +882,7 @@ public class TakaiAiServiceImpl implements ITakaiAiService {
|
|
|
String body = response.body().string();
|
|
|
JSONObject obj = JSON.parseObject(body);
|
|
|
Integer code = obj.getInteger("code");
|
|
|
+ logger.info("删除切片调用python接口成功,返回结果:{}", body);
|
|
|
if (code == 200) {
|
|
|
return 1;
|
|
|
}
|
|
|
@@ -947,6 +952,48 @@ public class TakaiAiServiceImpl implements ITakaiAiService {
|
|
|
return mrVo;
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
+ public int addSlice(TakaiSliceUpdateParams params) {
|
|
|
+ String url = deepseekConfig.getBaseurl() + deepseekConfig.getAddSlice();
|
|
|
+ TakaiDocument info = takaiDocumentMapper.selectTargetDocument(TakaiDocument.builder().documentId(params.getDocumentId()).build());
|
|
|
+ if(info != null){
|
|
|
+ JSONObject json = new JSONObject();
|
|
|
+ json.put("knowledge_id", params.getKnowledgeId());
|
|
|
+ json.put("document_id", params.getDocumentId());
|
|
|
+ json.put("slice_text", params.getSliceText());
|
|
|
+ json.put("doc_name", info.getName());
|
|
|
+
|
|
|
+ RequestBody requestBody = FormBody.create(MediaType.parse("application/json; charset=utf-8"), json.toJSONString());
|
|
|
+
|
|
|
+ Request request = buildPostRequest(url, requestBody);
|
|
|
+ OkHttpClient client = buildOkHttpClient();
|
|
|
+ try {
|
|
|
+ Response response = client.newCall(request).execute();
|
|
|
+ if (response.isSuccessful()) {
|
|
|
+ String body = response.body().string();
|
|
|
+ JSONObject obj = JSON.parseObject(body);
|
|
|
+ Integer code = obj.getInteger("code");
|
|
|
+ if (code == 200) {
|
|
|
+ return 1;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }catch (Exception e) {
|
|
|
+ logger.error("新增切片调用python接口失败", e.getMessage());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return 0;
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public List<TakaiSliceInfo> selectByDocumentId(String documentId) {
|
|
|
+ return takaiSliceInfoMapper.selectByDocumentId(documentId);
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public TakaiSliceInfo selectBySliceId(String sliceId) {
|
|
|
+ return takaiSliceInfoMapper.selectBySliceId(sliceId);
|
|
|
+ }
|
|
|
+
|
|
|
private JSONObject analysisFile(List<UploadDocumentParams> result, TakaiDocumentSettings settings, String flag) {
|
|
|
String url = deepseekConfig.getBaseurl() + deepseekConfig.getUploadKnowledge();
|
|
|
JSONObject json = new JSONObject();
|