maojian
/
opai-service-center
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

返回结果新增input输入字段

master
maojian 2 months ago
parent
883a04b40d
commit
654db9a409
10 changed files with 30 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      ai-service/src/main/java/com/bw/ai/emotionextract/service/impl/EmotionExtractServiceImpl.java
  2. 2
      ai-service/src/main/java/com/bw/ai/entity/AppResultDoc.java
  3. 2
      ai-service/src/main/java/com/bw/ai/textextract/service/impl/TextExtractServiceImpl.java
  4. 2
      document-convert-service/src/main/java/com/bw/convert/entity/AppResultDoc.java
  5. 10
      document-convert-service/src/main/java/com/bw/convert/service/impl/ConvertTaskServiceImpl.java
  6. 2
      ocr-service/src/main/java/com/bw/ocr/entity/AppResultDoc.java
  7. 17
      ocr-service/src/main/java/com/bw/ocr/service/impl/OcrTaskServiceImpl.java
  8. 3
      opai-api/src/main/java/com/bw/opai/app/entity/AppResultDoc.java
  9. 2
      translate-service/src/main/java/com/bw/translate/entity/AppResultDoc.java
  10. 2
      translate-service/src/main/java/com/bw/translate/service/impl/TranslateTaskServiceImpl.java

2
ai-service/src/main/java/com/bw/ai/emotionextract/service/impl/EmotionExtractServiceImpl.java
View File

@ -111,6 +111,7 @@ public class EmotionExtractServiceImpl implements EmotionExtractService {
entity.setResult(result);
entity.setStatus(1);
entity.setDel(0);
entity.setInput(task);
//回传给api服务保存
DownLoadUtil.doPost(saveUrl, JSONObject.toJSONString(entity));
}else {
@ -129,6 +130,7 @@ public class EmotionExtractServiceImpl implements EmotionExtractService {
entity.setResult(result);
entity.setStatus(2);
entity.setDel(0);
entity.setInput(task);
//回传给api服务保存
DownLoadUtil.doPost(saveUrl, JSONObject.toJSONString(entity));
}

2
ai-service/src/main/java/com/bw/ai/entity/AppResultDoc.java
View File

@ -35,4 +35,6 @@ public class AppResultDoc implements Serializable {
/** 逻辑删除标识：0-未删除 1-已删除 */
private Integer del;
/***前端输入参数 ***/
private Map<String, Object> input;
}

2
ai-service/src/main/java/com/bw/ai/textextract/service/impl/TextExtractServiceImpl.java
View File

@ -91,6 +91,7 @@ public class TextExtractServiceImpl implements TextExtractService {
entity.setResult(parseGptRes);
entity.setStatus(1);
entity.setDel(0);
entity.setInput(task);
//回传给api服务保存
DownLoadUtil.doPost(saveUrl, JSONObject.toJSONString(entity));
}else {
@ -109,6 +110,7 @@ public class TextExtractServiceImpl implements TextExtractService {
entity.setResult(result);
entity.setStatus(2);
entity.setDel(0);
entity.setInput(task);
//回传给api服务保存
DownLoadUtil.doPost(saveUrl, JSONObject.toJSONString(entity));
}

2
document-convert-service/src/main/java/com/bw/convert/entity/AppResultDoc.java
View File

@ -36,4 +36,6 @@ public class AppResultDoc implements Serializable {
/** 逻辑删除标识：0-未删除 1-已删除 */
private Integer del;
/***前端输入参数 ***/
private Map<String, Object> input;
}

10
document-convert-service/src/main/java/com/bw/convert/service/impl/ConvertTaskServiceImpl.java
View File

@ -119,6 +119,7 @@ public class ConvertTaskServiceImpl implements ConvertTaskService {
entity.setResult(result);
entity.setStatus(2);
entity.setDel(0);
entity.setInput(task);
//回传给api服务保存
DownLoadUtil.doPost(saveUrl, JSONObject.toJSONString(entity));
}
@ -204,6 +205,7 @@ public class ConvertTaskServiceImpl implements ConvertTaskService {
String url = gofastAccessPrefix + path;
//成功 发送结果
AppResultDoc entity = new AppResultDoc();
entity.setInput(task);
entity.setTaskId((String)task.get(Constants.TASKID));
entity.setAppId((Integer)task.get(Constants.ID));
long now = System.currentTimeMillis();
@ -221,6 +223,7 @@ public class ConvertTaskServiceImpl implements ConvertTaskService {
// 压缩失败，按失败处理
AppResultDoc entity = new AppResultDoc();
entity.setInput(task);
entity.setTaskId((String) task.get(Constants.TASKID));
entity.setAppId((Integer) task.get(Constants.ID));
long now = System.currentTimeMillis();
@ -233,13 +236,14 @@ public class ConvertTaskServiceImpl implements ConvertTaskService {
entity.setDel(0);
DownLoadUtil.doPost(saveUrl, JSONObject.toJSONString(entity));
}
}
}
}else {
//识别异常
log.error("html文档转换异常：{}",resStr);
//发送失败结果
AppResultDoc entity = new AppResultDoc();
entity.setInput(task);
entity.setTaskId((String)task.get(Constants.TASKID));
entity.setAppId((Integer)task.get(Constants.ID));
long now = System.currentTimeMillis();
@ -282,6 +286,7 @@ public class ConvertTaskServiceImpl implements ConvertTaskService {
entity.setResult(result);
entity.setStatus(1);
entity.setDel(0);
entity.setInput(task);
//回传给api服务保存
DownLoadUtil.doPost(saveUrl, JSONObject.toJSONString(entity));
}else {
@ -289,6 +294,7 @@ public class ConvertTaskServiceImpl implements ConvertTaskService {
log.error("文档转换异常：{}",resStr);
//发送失败结果
AppResultDoc entity = new AppResultDoc();
entity.setInput(task);
entity.setTaskId((String)task.get(Constants.TASKID));
entity.setAppId((Integer)task.get(Constants.ID));
long now = System.currentTimeMillis();
@ -308,6 +314,7 @@ public class ConvertTaskServiceImpl implements ConvertTaskService {
log.error("文档转换异常：{}",resStr);
//发送失败结果
AppResultDoc entity = new AppResultDoc();
entity.setInput(task);
entity.setTaskId((String)task.get(Constants.TASKID));
entity.setAppId((Integer)task.get(Constants.ID));
long now = System.currentTimeMillis();
@ -327,6 +334,7 @@ public class ConvertTaskServiceImpl implements ConvertTaskService {
log.error("创建文档解析任务异常。e:",e);
//发送失败结果
AppResultDoc entity = new AppResultDoc();
entity.setInput(task);
entity.setTaskId((String)task.get(Constants.TASKID));
entity.setAppId((Integer)task.get(Constants.ID));
long now = System.currentTimeMillis();

2
ocr-service/src/main/java/com/bw/ocr/entity/AppResultDoc.java
View File

@ -36,4 +36,6 @@ public class AppResultDoc implements Serializable {
/** 逻辑删除标识：0-未删除 1-已删除 */
private Integer del;
/***前端输入参数 ***/
private Map<String, Object> input;
}

17
ocr-service/src/main/java/com/bw/ocr/service/impl/OcrTaskServiceImpl.java
View File

@ -12,20 +12,8 @@ import java.util.List;
import java.util.Map;
import java.util.UUID;
import org.apache.http.HttpResponse;
import org.apache.http.auth.AuthScope;
import org.apache.http.auth.UsernamePasswordCredentials;
import org.apache.http.client.CredentialsProvider;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.entity.ContentType;
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.BasicCredentialsProvider;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.util.EntityUtils;
import org.apache.poi.xwpf.extractor.XWPFWordExtractor;
import org.apache.poi.xwpf.usermodel.XWPFDocument;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.cloud.context.config.annotation.RefreshScope;
import org.springframework.stereotype.Service;
@ -37,7 +25,6 @@ import com.bw.ocr.entity.Constants;
import com.bw.ocr.service.OcrTaskService;
import com.bw.ocr.utils.DownLoadUtil;
import com.bw.ocr.utils.FileUtil;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
@ -110,6 +97,7 @@ public class OcrTaskServiceImpl implements OcrTaskService {
entity.setResult(result);
entity.setStatus(2);
entity.setDel(0);
entity.setInput(task);
//回传给api服务保存
DownLoadUtil.doPost(saveUrl, JSONObject.toJSONString(entity));
}
@ -168,6 +156,7 @@ public class OcrTaskServiceImpl implements OcrTaskService {
entity.setResult(result);
entity.setStatus(1);
entity.setDel(0);
entity.setInput(task);
//回传给api服务保存
DownLoadUtil.doPost(saveUrl, JSONObject.toJSONString(entity));
}else {
@ -184,6 +173,7 @@ public class OcrTaskServiceImpl implements OcrTaskService {
entity.setResult(result);
entity.setStatus(2);
entity.setDel(0);
entity.setInput(task);
//回传给api服务保存
DownLoadUtil.doPost(saveUrl, JSONObject.toJSONString(entity));
}
@ -203,6 +193,7 @@ public class OcrTaskServiceImpl implements OcrTaskService {
entity.setResult(result);
entity.setStatus(2);
entity.setDel(0);
entity.setInput(task);
//回传给api服务保存
DownLoadUtil.doPost(saveUrl, JSONObject.toJSONString(entity));
}

3
opai-api/src/main/java/com/bw/opai/app/entity/AppResultDoc.java
View File

@ -34,5 +34,8 @@ public class AppResultDoc implements Serializable {
/** 逻辑删除标识：0-未删除 1-已删除 */
private Integer del;
/***前端输入参数 ***/
private Map<String, Object> input;
}

2
translate-service/src/main/java/com/bw/translate/entity/AppResultDoc.java
View File

@ -36,4 +36,6 @@ public class AppResultDoc implements Serializable {
/** 逻辑删除标识：0-未删除 1-已删除 */
private Integer del;
/***前端输入参数 ***/
private Map<String, Object> input;
}

2
translate-service/src/main/java/com/bw/translate/service/impl/TranslateTaskServiceImpl.java
View File

@ -92,6 +92,7 @@ public class TranslateTaskServiceImpl implements TranslateTaskService {
entity.setResult(result);
entity.setStatus(1);
entity.setDel(0);
entity.setInput(task);
//回传给api服务保存
DownLoadUtil.doPost(saveUrl, JSONObject.toJSONString(entity));
}else {
@ -111,6 +112,7 @@ public class TranslateTaskServiceImpl implements TranslateTaskService {
entity.setResult(result);
entity.setStatus(2);
entity.setDel(0);
entity.setInput(task);
//回传给api服务保存
DownLoadUtil.doPost(saveUrl, JSONObject.toJSONString(entity));
}

Write Preview
Loading…
Cancel
Save