From 9269eba73fb80c9ff5c96bc05d895f46d1350f99 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Mon, 30 May 2022 16:38:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95-=E5=A4=8D=E5=88=B6-=E4=BF=AE=E6=94=B9=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ParamsManifestEOController.java           |  2 +-
 .../ocr/controller/OcrRecordEOController.java | 46 +++++++++++++++----
 .../jero/modules/ocr/entity/OcrRecordEO.java  |  4 ++
 .../split/entity/SarFileSplitInfoEO.java      |  3 ++
 .../impl/SarFileSplitInfoServiceImpl.java     |  8 ++++
 5 files changed, 54 insertions(+), 9 deletions(-)

diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java
index c0b52a993..ee728309c 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java
@@ -223,7 +223,7 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
 	  */
 	 @AutoLog(value = "参数清单-查询所有项目的所有参数清单")
 	 @ApiOperation(value="参数清单-查询所有项目的所有参数清单", notes="参数清单-查询所有项目的所有参数清单")
-	 @GetMapping(value = "/getAllManifest")
+	 @PostMapping(value = "/getAllManifest")
 //	 @RequiresPermissions("params:manifest:copy")
 	 public Result<?> getAllManifest(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 									 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/controller/OcrRecordEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/controller/OcrRecordEOController.java
index 81430dfea..2f78c3d92 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/controller/OcrRecordEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/controller/OcrRecordEOController.java
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.modules.document.service.IBussDocumentLibraryEOService;
 import com.jero.modules.ocr.entity.OcrRecordEO;
@@ -82,18 +83,42 @@ public class OcrRecordEOController extends JeroController<OcrRecordEO, IOcrRecor
 	 @PostMapping(value = "/syncToDocument")
 	 @RequiresPermissions("ocr:ocrRecord:syncToDocument")
 	 public Result<?> syncToDocument(@RequestBody OcrRecordEO ocrRecordEO) {
+		String cut = ocrRecordEO.getCut();
 		 if(StringUtils.isBlank(ocrRecordEO.getConnectId())){
-			 return Result.error("同步失败");
+		 	if (CutEnum.CN.getValue().equals(cut)) {
+				return Result.error("同步失败！");
+			} else {
+				return Result.error("sync failure!");
+			}
 		 }
+
+		 // 文档库删了识别的pdf文件时
+		 LambdaQueryWrapper<OSSFile> pdfFileLambdaQueryWrapper = new LambdaQueryWrapper<>();
+		 pdfFileLambdaQueryWrapper.eq(OSSFile::getConnectId, ocrRecordEO.getConnectId());
+		 List<OSSFile> pdfFiles = ossFileService.list(pdfFileLambdaQueryWrapper);
+		 if (CollectionUtil.isEmpty(pdfFiles)) {
+			 if (CutEnum.CN.getValue().equals(cut)) {
+				 return Result.error("文档库已不存在转换前的pdf文件，同步失败！");
+			 } else {
+				 return Result.error("Document Library no longer existed before the conversion of PDF files, synchronization fails!");
+			 }
+
+		 }
+
 		 //查询doc文件的id
-		 LambdaQueryWrapper<OSSFile> ossFileLambdaQueryWrapper = new LambdaQueryWrapper<>();
-		 ossFileLambdaQueryWrapper.eq(OSSFile::getUrl, ocrRecordEO.getDocName());
-		 List<OSSFile> ossFiles = ossFileService.list(ossFileLambdaQueryWrapper);
-		 if (CollectionUtil.isEmpty(ossFiles)) {
-			 return Result.error("没有可同步的文件");
+		 LambdaQueryWrapper<OSSFile> docLambdaQueryWrapper = new LambdaQueryWrapper<>();
+		 docLambdaQueryWrapper.eq(OSSFile::getUrl, ocrRecordEO.getDocName());
+		 List<OSSFile> docFiles = ossFileService.list(docLambdaQueryWrapper);
+		 if (CollectionUtil.isEmpty(docFiles)) {
+			 if (CutEnum.CN.getValue().equals(cut)) {
+				 return Result.error("转换后的word文件不存在，同步失败！");
+			 } else {
+				 return Result.error("Converted Word file does not exist, the synchronization fails!");
+			 }
+
 		 }
 		 OSSFile ossFile = new OSSFile();
-		 String docFileId = ossFiles.get(0).getId();
+		 String docFileId = docFiles.get(0).getId();
 		 ossFile.setId(docFileId);
 		 ossFile.setConnectId(ocrRecordEO.getConnectId());
 		 ossFileService.updateById(ossFile);
@@ -104,7 +129,12 @@ public class OcrRecordEOController extends JeroController<OcrRecordEO, IOcrRecor
 		 updateOcrRecordEO.setSyncState(FileSyncStateEnum.SYNC_YES.getValue());
 		 ocrRecordService.editById(updateOcrRecordEO);
 
-		 return Result.OK("同步成功", ossFile);
+		 if (CutEnum.CN.getValue().equals(cut)) {
+			 return Result.OK("同步成功！", ossFile);
+		 } else {
+			 return Result.OK("sync success!", ossFile);
+		 }
+
 	 }
 
 	 /**
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/entity/OcrRecordEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/entity/OcrRecordEO.java
index 64be420bc..724a94442 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/entity/OcrRecordEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/entity/OcrRecordEO.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jero.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -123,6 +124,7 @@ public class OcrRecordEO implements Serializable {
 
     /**同步状态*/
     @Excel(name = "同步状态", width = 15)
+//    @Dict(dicCode = "sync_state")
     @ApiModelProperty(value = "同步状态")
     private String syncState;
 
@@ -140,4 +142,6 @@ public class OcrRecordEO implements Serializable {
     private String jsonRealFile;
     @TableField(exist = false)
     private String fileSource; //文件来源：0-上传 1-导入
+    @TableField(exist = false)
+    private String cut;
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitInfoEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitInfoEO.java
index f7b319ef2..6a323593d 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitInfoEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitInfoEO.java
@@ -108,4 +108,7 @@ public class SarFileSplitInfoEO implements Serializable {
 
     @TableField(exist = false)
     private String cut;
+    @TableField(exist = false)
+    private String documentId;
+
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java
index b34083705..dbc463e58 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java
@@ -11,6 +11,7 @@ import com.jero.common.exception.JeroBootException;
 import com.jero.generater.modules.online.cgform.entity.OnlCgformField;
 import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl;
 import com.jero.modules.document.enums.FieldTypeEnum;
+import com.jero.modules.document.service.IBussDocumentLibraryEOService;
 import com.jero.modules.ocr.util.LineHumpUtil;
 import com.jero.modules.oss.entity.OSSFile;
 import com.jero.modules.oss.service.IOSSFileService;
@@ -57,6 +58,8 @@ public class SarFileSplitInfoServiceImpl extends ServiceImpl<SarFileSplitInfoMap
 	private FileSpiltService fileSpiltService;
 	@Autowired
 	private ISarFileSplitMenuEOService sarFileSplitMenuEOService;
+	@Autowired
+	private IBussDocumentLibraryEOService bussDocumentLibraryEOService;
 
 
 	/**
@@ -258,6 +261,11 @@ public class SarFileSplitInfoServiceImpl extends ServiceImpl<SarFileSplitInfoMap
 //				splitInfoEO.setFileType(enMap.get(splitInfoEO.getFileType()));
 				splitInfoEO.setSplitResult(enMap.get(splitInfoEO.getSplitResult()));
 			}
+			// 处理文档库id字段  根据编号和标题查询
+			List<Map<String, Object>> bussDocumentLibraryEOList = bussDocumentLibraryEOService.getListBySerialNumber(splitInfoEO.getSerialNumber());
+			if (CollectionUtil.isNotEmpty(bussDocumentLibraryEOList)) {
+				splitInfoEO.setDocumentId(bussDocumentLibraryEOList.get(0).get("id").toString());
+			}
 			if(StringUtils.isNotEmpty(splitInfoEO.getFileId())) {
 				splitInfoEO.setFlag("1");
 			}else{