From 69bd351c1ed2a996c77a10911ad700d42e3ab31b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Thu, 28 Mar 2024 15:22:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=B9=E6=8E=A5=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/BusProcessModelHisServiceImpl.java   | 171 ++++++++++--------
 1 file changed, 96 insertions(+), 75 deletions(-)

diff --git a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/impl/BusProcessModelHisServiceImpl.java b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/impl/BusProcessModelHisServiceImpl.java
index bb545ca..4de8243 100644
--- a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/impl/BusProcessModelHisServiceImpl.java
+++ b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/impl/BusProcessModelHisServiceImpl.java
@@ -463,83 +463,42 @@ public class BusProcessModelHisServiceImpl extends ServiceImpl<BusProcessModelHi
         String drafts = json.getString("drafts");
 
         String model = "model_qb";
-
-        BusProcessModelHis bpmHis = this.baseMapper.selectById(fileId);
-        if (ObjectUtils.isNotEmpty(bpmHis)) {
-            resultSb.append(onlyOfficeEditorUrl);
-            resultSb.append("fileId=").append(fileId).append("&");
-            resultSb.append("pid=").append(bpmHis.getPId()).append("&");
-            resultSb.append("taskIds=").append(bpmHis.getTaskId()).append("&");
-//            resultSb.append("editType=").append("null").append("&");
-            resultSb.append("oldFileName=").append(bpmHis.getFileName()).append("&");
-            resultSb.append("fileType=").append("docx").append("&");
-            resultSb.append("attId=").append(fileId).append("&");
-            resultSb.append("fileUrl=").append(bpmHis.getDownLoadUrl()).append("&");
-//            resultSb.append("key=").append("key").append("&");
-            resultSb.append("filePath=").append(bpmHis.getEditFilePath()).append("&");
-            resultSb.append("fileName=").append(bpmHis.getFileName()).append("&");
-//            resultSb.append("userId=").append("null").append("&");
-            resultSb.append("userName=").append(userName).append("&");
-//            resultSb.append("isEdit=").append("123").append("&");
-            resultSb.append("standCode=").append(serialNumber).append("&");
-            resultSb.append("standName=").append(standName).append("&");
-            resultSb.append("draftingDepartment=").append(estDepart).append("&");
-            resultSb.append("draftsman=").append(drafts).append("&");
-//            resultSb.append("assessor=").append("").append("&");
-//            resultSb.append("focalUnit=").append("").append("&");
-            resultSb.append("replaceStand=").append(replaceStand);
-
-//            throw new JeroBootException("fileId已经存在，不能重复，请检查！");
-        } else {
-            BusProcessModelHis modelHis = new BusProcessModelHis();
-            modelHis.setId(fileId);
-            try {
-                String preUuid2 = UUID.randomUUID().toString();
-                String changUuid = preUuid2.substring(0, 8);
-                String taskId = "task_" + changUuid;
-                String topId = "top_" + changUuid;
-
-                String builderModel = "model" + "/";
-
-                File dir = new File(filePath + builderModel);
-                if (!dir.exists()) {
-                    dir.mkdirs();
-                }
-                String fileName = model + ".docx";
-                modelHis.setFileName(fileName);
-                StringBuilder builder = new StringBuilder();
-                builder.append("model").append("/");
-                builder.append(taskId).append("/");
-
-                File file = new File(filePath + builder.toString());
-                if (!file.exists()) {
-                    file.mkdirs();
-                }
-
-                String targetPath = builder.toString() + taskId + "_" + topId + "_node.docx";
-
-                File sourceFile = new File(sourceFilePath);
-                File targetFile = new File(filePath + targetPath);
-                FileUtils.copyFile(sourceFile, targetFile);
-
-                modelHis.setTaskId(taskId);
-                modelHis.setPId(topId);
-                modelHis.setEditFilePath(targetPath);
-                modelHis.setDownLoadUrl(downloadUrl + targetPath);
-                this.baseMapper.insert(modelHis);
-
+        // 查询历史信息：1 是   2 否
+        String queryType = json.getString("queryType");
+        if (StringUtils.equals(CommonConstant.ONLIOFFICE_QUERY_TYPE_1,queryType)) {
+            OnlineFileLog onlineFileLog = onlineFileLogDao.selectById(fileId);
+            if(ObjectUtils.isNotEmpty(onlineFileLog)){
+                resultSb.append(onlyOfficeEditorUrl);
+                resultSb.append("fileId=").append(onlineFileLog.getHisId()).append("&");
+                resultSb.append("oldFileName=").append(onlineFileLog.getFileName()).append("&");
+                resultSb.append("fileType=").append("docx").append("&");
+                resultSb.append("attId=").append(onlineFileLog.getAttFileId()).append("&");
+                resultSb.append("filePath=").append(onlineFileLog.getFilePath()).append("&");
+                resultSb.append("fileName=").append(onlineFileLog.getFileName()).append("&");
+                resultSb.append("userName=").append(userName).append("&");
+                resultSb.append("standCode=").append(serialNumber).append("&");
+                resultSb.append("standName=").append(standName).append("&");
+                resultSb.append("draftingDepartment=").append(estDepart).append("&");
+                resultSb.append("draftsman=").append(drafts).append("&");
+                resultSb.append("replaceStand=").append(replaceStand);
+            }else{
+                log.error("onlineFileLog为空，fileId="+fileId);
+            }
+        } else if (StringUtils.equals(CommonConstant.ONLIOFFICE_QUERY_TYPE_2,queryType)) {
+            BusProcessModelHis bpmHis = this.baseMapper.selectById(fileId);
+            if (ObjectUtils.isNotEmpty(bpmHis)) {
                 resultSb.append(onlyOfficeEditorUrl);
                 resultSb.append("fileId=").append(fileId).append("&");
-                resultSb.append("pid=").append(modelHis.getPId()).append("&");
-                resultSb.append("taskIds=").append(modelHis.getTaskId()).append("&");
+                resultSb.append("pid=").append(bpmHis.getPId()).append("&");
+                resultSb.append("taskIds=").append(bpmHis.getTaskId()).append("&");
 //            resultSb.append("editType=").append("null").append("&");
-                resultSb.append("oldFileName=").append(modelHis.getFileName()).append("&");
+                resultSb.append("oldFileName=").append(bpmHis.getFileName()).append("&");
                 resultSb.append("fileType=").append("docx").append("&");
                 resultSb.append("attId=").append(fileId).append("&");
-                resultSb.append("fileUrl=").append(modelHis.getDownLoadUrl()).append("&");
+                resultSb.append("fileUrl=").append(bpmHis.getDownLoadUrl()).append("&");
 //            resultSb.append("key=").append("key").append("&");
-                resultSb.append("filePath=").append(modelHis.getEditFilePath()).append("&");
-                resultSb.append("fileName=").append(modelHis.getFileName()).append("&");
+                resultSb.append("filePath=").append(bpmHis.getEditFilePath()).append("&");
+                resultSb.append("fileName=").append(bpmHis.getFileName()).append("&");
 //            resultSb.append("userId=").append("null").append("&");
                 resultSb.append("userName=").append(userName).append("&");
 //            resultSb.append("isEdit=").append("123").append("&");
@@ -550,13 +509,75 @@ public class BusProcessModelHisServiceImpl extends ServiceImpl<BusProcessModelHi
 //            resultSb.append("assessor=").append("").append("&");
 //            resultSb.append("focalUnit=").append("").append("&");
                 resultSb.append("replaceStand=").append(replaceStand);
-            } catch (Exception e) {
-                logger.error(e.getMessage());
-                throw new JeroBootException("操作失败，请联系管理员！");
+
+//            throw new JeroBootException("fileId已经存在，不能重复，请检查！");
+            } else {
+                BusProcessModelHis modelHis = new BusProcessModelHis();
+                modelHis.setId(fileId);
+                try {
+                    String preUuid2 = UUID.randomUUID().toString();
+                    String changUuid = preUuid2.substring(0, 8);
+                    String taskId = "task_" + changUuid;
+                    String topId = "top_" + changUuid;
+
+                    String builderModel = "model" + "/";
+
+                    File dir = new File(filePath + builderModel);
+                    if (!dir.exists()) {
+                        dir.mkdirs();
+                    }
+                    String fileName = model + ".docx";
+                    modelHis.setFileName(fileName);
+                    StringBuilder builder = new StringBuilder();
+                    builder.append("model").append("/");
+                    builder.append(taskId).append("/");
+
+                    File file = new File(filePath + builder.toString());
+                    if (!file.exists()) {
+                        file.mkdirs();
+                    }
+
+                    String targetPath = builder.toString() + taskId + "_" + topId + "_node.docx";
+
+                    File sourceFile = new File(sourceFilePath);
+                    File targetFile = new File(filePath + targetPath);
+                    FileUtils.copyFile(sourceFile, targetFile);
+
+                    modelHis.setTaskId(taskId);
+                    modelHis.setPId(topId);
+                    modelHis.setEditFilePath(targetPath);
+                    modelHis.setDownLoadUrl(downloadUrl + targetPath);
+                    this.baseMapper.insert(modelHis);
+
+                    resultSb.append(onlyOfficeEditorUrl);
+                    resultSb.append("fileId=").append(fileId).append("&");
+                    resultSb.append("pid=").append(modelHis.getPId()).append("&");
+                    resultSb.append("taskIds=").append(modelHis.getTaskId()).append("&");
+//            resultSb.append("editType=").append("null").append("&");
+                    resultSb.append("oldFileName=").append(modelHis.getFileName()).append("&");
+                    resultSb.append("fileType=").append("docx").append("&");
+                    resultSb.append("attId=").append(fileId).append("&");
+                    resultSb.append("fileUrl=").append(modelHis.getDownLoadUrl()).append("&");
+//            resultSb.append("key=").append("key").append("&");
+                    resultSb.append("filePath=").append(modelHis.getEditFilePath()).append("&");
+                    resultSb.append("fileName=").append(modelHis.getFileName()).append("&");
+//            resultSb.append("userId=").append("null").append("&");
+                    resultSb.append("userName=").append(userName).append("&");
+//            resultSb.append("isEdit=").append("123").append("&");
+                    resultSb.append("standCode=").append(serialNumber).append("&");
+                    resultSb.append("standName=").append(standName).append("&");
+                    resultSb.append("draftingDepartment=").append(estDepart).append("&");
+                    resultSb.append("draftsman=").append(drafts).append("&");
+//            resultSb.append("assessor=").append("").append("&");
+//            resultSb.append("focalUnit=").append("").append("&");
+                    resultSb.append("replaceStand=").append(replaceStand);
+                } catch (Exception e) {
+                    logger.error(e.getMessage());
+                    throw new JeroBootException("操作失败，请联系管理员！");
+                }
             }
         }
 
-
         return resultSb.toString();
     }