diff --git a/ai-service/src/main/java/com/bw/ai/emotionextract/service/impl/EmotionExtractServiceImpl.java b/ai-service/src/main/java/com/bw/ai/emotionextract/service/impl/EmotionExtractServiceImpl.java index 77c120b..a21b807 100644 --- a/ai-service/src/main/java/com/bw/ai/emotionextract/service/impl/EmotionExtractServiceImpl.java +++ b/ai-service/src/main/java/com/bw/ai/emotionextract/service/impl/EmotionExtractServiceImpl.java @@ -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)); } diff --git a/ai-service/src/main/java/com/bw/ai/entity/AppResultDoc.java b/ai-service/src/main/java/com/bw/ai/entity/AppResultDoc.java index 1d3c9ed..ec16404 100644 --- a/ai-service/src/main/java/com/bw/ai/entity/AppResultDoc.java +++ b/ai-service/src/main/java/com/bw/ai/entity/AppResultDoc.java @@ -35,4 +35,6 @@ public class AppResultDoc implements Serializable { /** 逻辑删除标识:0-未删除 1-已删除 */ private Integer del; + /***前端输入参数 ***/ + private Map input; } diff --git a/ai-service/src/main/java/com/bw/ai/textextract/service/impl/TextExtractServiceImpl.java b/ai-service/src/main/java/com/bw/ai/textextract/service/impl/TextExtractServiceImpl.java index 606c892..70d4ade 100644 --- a/ai-service/src/main/java/com/bw/ai/textextract/service/impl/TextExtractServiceImpl.java +++ b/ai-service/src/main/java/com/bw/ai/textextract/service/impl/TextExtractServiceImpl.java @@ -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)); } diff --git a/document-convert-service/src/main/java/com/bw/convert/entity/AppResultDoc.java b/document-convert-service/src/main/java/com/bw/convert/entity/AppResultDoc.java index e60641e..d5de47e 100644 --- a/document-convert-service/src/main/java/com/bw/convert/entity/AppResultDoc.java +++ b/document-convert-service/src/main/java/com/bw/convert/entity/AppResultDoc.java @@ -36,4 +36,6 @@ public class AppResultDoc implements Serializable { /** 逻辑删除标识:0-未删除 1-已删除 */ private Integer del; + /***前端输入参数 ***/ + private Map input; } diff --git a/document-convert-service/src/main/java/com/bw/convert/service/impl/ConvertTaskServiceImpl.java b/document-convert-service/src/main/java/com/bw/convert/service/impl/ConvertTaskServiceImpl.java index f73a3bb..4bf0540 100644 --- a/document-convert-service/src/main/java/com/bw/convert/service/impl/ConvertTaskServiceImpl.java +++ b/document-convert-service/src/main/java/com/bw/convert/service/impl/ConvertTaskServiceImpl.java @@ -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(); diff --git a/ocr-service/src/main/java/com/bw/ocr/entity/AppResultDoc.java b/ocr-service/src/main/java/com/bw/ocr/entity/AppResultDoc.java index 40712b1..4451831 100644 --- a/ocr-service/src/main/java/com/bw/ocr/entity/AppResultDoc.java +++ b/ocr-service/src/main/java/com/bw/ocr/entity/AppResultDoc.java @@ -36,4 +36,6 @@ public class AppResultDoc implements Serializable { /** 逻辑删除标识:0-未删除 1-已删除 */ private Integer del; + /***前端输入参数 ***/ + private Map input; } diff --git a/ocr-service/src/main/java/com/bw/ocr/service/impl/OcrTaskServiceImpl.java b/ocr-service/src/main/java/com/bw/ocr/service/impl/OcrTaskServiceImpl.java index e5612d6..1ff1da0 100644 --- a/ocr-service/src/main/java/com/bw/ocr/service/impl/OcrTaskServiceImpl.java +++ b/ocr-service/src/main/java/com/bw/ocr/service/impl/OcrTaskServiceImpl.java @@ -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)); } diff --git a/opai-api/src/main/java/com/bw/opai/app/entity/AppResultDoc.java b/opai-api/src/main/java/com/bw/opai/app/entity/AppResultDoc.java index cf8f8bf..c1ef76e 100644 --- a/opai-api/src/main/java/com/bw/opai/app/entity/AppResultDoc.java +++ b/opai-api/src/main/java/com/bw/opai/app/entity/AppResultDoc.java @@ -34,5 +34,8 @@ public class AppResultDoc implements Serializable { /** 逻辑删除标识:0-未删除 1-已删除 */ private Integer del; + + /***前端输入参数 ***/ + private Map input; } diff --git a/translate-service/src/main/java/com/bw/translate/entity/AppResultDoc.java b/translate-service/src/main/java/com/bw/translate/entity/AppResultDoc.java index bbcaeff..b68300a 100644 --- a/translate-service/src/main/java/com/bw/translate/entity/AppResultDoc.java +++ b/translate-service/src/main/java/com/bw/translate/entity/AppResultDoc.java @@ -36,4 +36,6 @@ public class AppResultDoc implements Serializable { /** 逻辑删除标识:0-未删除 1-已删除 */ private Integer del; + /***前端输入参数 ***/ + private Map input; } diff --git a/translate-service/src/main/java/com/bw/translate/service/impl/TranslateTaskServiceImpl.java b/translate-service/src/main/java/com/bw/translate/service/impl/TranslateTaskServiceImpl.java index 6ab784a..8e2536f 100644 --- a/translate-service/src/main/java/com/bw/translate/service/impl/TranslateTaskServiceImpl.java +++ b/translate-service/src/main/java/com/bw/translate/service/impl/TranslateTaskServiceImpl.java @@ -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)); }