From c8d5cd6fdc7c6774e090ad168a1d110da15d9dc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Mon, 25 Mar 2024 14:15:50 +0800
Subject: [PATCH 01/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/views/onlyoffice/index.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/jero-web/src/views/onlyoffice/index.vue b/jero-web/src/views/onlyoffice/index.vue
index 43dd31c..1b99dc1 100644
--- a/jero-web/src/views/onlyoffice/index.vue
+++ b/jero-web/src/views/onlyoffice/index.vue
@@ -24,10 +24,10 @@ export default {
             if (val.id) {
               const oldFileName = '比亚迪企业标准'
               const nowTime = new Date().getTime()
-              const serialNumber = 'x/xx xxxx-xxxx'
+              const standCode = 'G/BYD xxxx-xxxx'
               const standName = '比亚迪企业标准'
-              const estDepart = '起草部门'
-              const drafts = '起草人'
+              const draftingDepartment = '起草部门'
+              const draftsman = '起草人'
               const assessor = '评审人员'
               const focalUnit = '归口单位'
               const watermark = '比亚迪'
@@ -38,9 +38,9 @@ export default {
                 '&taskIds=' + val.taskId + '&oldFileName=' + oldFileName + '&assessor=' + assessor +
                 '&fileType=docx' + '&attId=' + val.id + '&fileUrl=' + val.downLoadUrl +
                 '&key=' + val.id + nowTime + '&filePath=' + val.editFilePath + '&fileName=' + val.fileName +
-                '&userId=' + val.userId + '&userName=admin' + '&serialNumber=' + serialNumber +
-                '&standName=' + standName + '&replaceStand=' + replaceStand + '&drafts=' + drafts +
-                '&estDepart=' + estDepart + '&focalUnit=' + focalUnit + '&watermark=' + watermark)
+                '&userId=' + val.userId + '&userName=admin' + '&standCode=' + standCode +
+                '&standName=' + standName + '&replaceStand=' + replaceStand + '&draftsman=' + draftsman +
+                '&draftingDepartment=' + draftingDepartment + '&focalUnit=' + focalUnit + '&watermark=' + watermark)
             }
           })
         } else {

From d9dd9dd0f4a6191c0c188c93a97697cb864a16e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Mon, 25 Mar 2024 16:06:30 +0800
Subject: [PATCH 02/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/views/onlyoffice/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jero-web/src/views/onlyoffice/index.vue b/jero-web/src/views/onlyoffice/index.vue
index 1b99dc1..af38187 100644
--- a/jero-web/src/views/onlyoffice/index.vue
+++ b/jero-web/src/views/onlyoffice/index.vue
@@ -37,7 +37,7 @@ export default {
               window.open(window.CONFIG.onlyOfficeRoute + '/editor?fileId=' + val.id + '&pid=' + val.pid +
                 '&taskIds=' + val.taskId + '&oldFileName=' + oldFileName + '&assessor=' + assessor +
                 '&fileType=docx' + '&attId=' + val.id + '&fileUrl=' + val.downLoadUrl +
-                '&key=' + val.id + nowTime + '&filePath=' + val.editFilePath + '&fileName=' + val.fileName +
+                '&key=' + nowTime + '&filePath=' + val.editFilePath + '&fileName=' + val.fileName +
                 '&userId=' + val.userId + '&userName=admin' + '&standCode=' + standCode +
                 '&standName=' + standName + '&replaceStand=' + replaceStand + '&draftsman=' + draftsman +
                 '&draftingDepartment=' + draftingDepartment + '&focalUnit=' + focalUnit + '&watermark=' + watermark)

From f430311eedd5ab5b25d86490ae9396ec96029d26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Tue, 26 Mar 2024 11:09:31 +0800
Subject: [PATCH 03/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A9=BA=E6=8C=87?=
 =?UTF-8?q?=E9=92=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/OnlyOfficeController.java      |  3 +-
 .../impl/BusProcessModelHisServiceImpl.java   | 48 +++++++++++--------
 2 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/onlyoffice/controller/OnlyOfficeController.java b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/onlyoffice/controller/OnlyOfficeController.java
index 1d69f8d..b63abff 100644
--- a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/onlyoffice/controller/OnlyOfficeController.java
+++ b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/onlyoffice/controller/OnlyOfficeController.java
@@ -564,6 +564,7 @@ public class OnlyOfficeController {
                 // 发送POST请求并获取响应
                 ResponseEntity<String> responseEntity2 = restTemplate2.postForEntity(bydUploadFileUrl, requestEntity2, String.class);
                 String body2 = responseEntity2.getBody();
+                logger.info("基线版本文件上传接口结果:" + body2);
                 JSONObject jsonObject2 = JSONObject.parseObject(body2);
                 String data = jsonObject2.getString("data");
                 createTimeLatestOnlineFileLog.setBydJxFileId(data);
@@ -571,7 +572,7 @@ public class OnlyOfficeController {
                 createTimeLatestOnlineFileLog2.setBydJxFileId(data);
 
                 this.onlineFileLogDao.insert(createTimeLatestOnlineFileLog2);
-                logger.info("基线版本文件上传接口结果:" + body2);
+//                logger.info("基线版本文件上传接口结果:" + body2);
 
             }catch (Exception ex){
                 ex.printStackTrace();
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 a4b1d54..14af4ac 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
@@ -564,34 +564,40 @@ public class BusProcessModelHisServiceImpl extends ServiceImpl<BusProcessModelHi
     public String onlyOfficePreview(JSONObject json) {
         StringBuilder resultSb = new StringBuilder();
         String fileId = json.getString("fileId");
-        String watermark = json.getString("watermark");
+//        String watermark = json.getString("watermark");
 
         // 查询历史信息：1 是   2 否
         String queryType = json.getString("queryType");
         if (StringUtils.equals(CommonConstant.ONLIOFFICE_QUERY_TYPE_1,queryType)) {
             OnlineFileLog onlineFileLog = onlineFileLogDao.selectById(fileId);
-
-            StringBuffer downloadFileUrl = new StringBuffer();
-            downloadFileUrl.append(downloadUrl).append(onlineFileLog.getFilePath() == null ? "" : onlineFileLog.getFilePath());
-            resultSb.append(previewHistoryUrl);
-            resultSb.append("oldFileName=").append(onlineFileLog.getFileName()).append("&");
-            resultSb.append("fileType=").append("docx").append("&");
-            resultSb.append("attId=").append(onlineFileLog.getAttFileId()).append("&");
-            resultSb.append("fileUrl=").append(downloadFileUrl.toString()).append("&");
-            resultSb.append("key=").append(DateUtils.getCurrentTimestamp()).append("&");
-            resultSb.append("filePath=").append(onlineFileLog.getFilePath()).append("&");
-            resultSb.append("fileName=").append(onlineFileLog.getFileName());
+            if(ObjectUtils.isNotEmpty(onlineFileLog)){
+                StringBuffer downloadFileUrl = new StringBuffer();
+                downloadFileUrl.append(downloadUrl).append(onlineFileLog.getFilePath() == null ? "" : onlineFileLog.getFilePath());
+                resultSb.append(previewHistoryUrl);
+                resultSb.append("oldFileName=").append(onlineFileLog.getFileName()).append("&");
+                resultSb.append("fileType=").append("docx").append("&");
+                resultSb.append("attId=").append(onlineFileLog.getAttFileId()).append("&");
+                resultSb.append("fileUrl=").append(downloadFileUrl.toString()).append("&");
+                resultSb.append("key=").append(DateUtils.getCurrentTimestamp()).append("&");
+                resultSb.append("filePath=").append(onlineFileLog.getFilePath()).append("&");
+                resultSb.append("fileName=").append(onlineFileLog.getFileName());
+            }else{
+                log.error("onlineFileLog为空，fileId="+fileId);
+            }
         } else if (StringUtils.equals(CommonConstant.ONLIOFFICE_QUERY_TYPE_2,queryType)) {
             BusProcessModelHis busProcessModelHis = this.processEditFile(fileId);
-
-            resultSb.append(onlyOfficePreviewUrl);
-            resultSb.append("oldFileName=").append(busProcessModelHis.getFileName()).append("&");
-            resultSb.append("fileType=").append("docx").append("&");
-            resultSb.append("attId=").append(busProcessModelHis.getId()).append("&");
-            resultSb.append("fileUrl=").append(busProcessModelHis.getDownLoadUrl()).append("&");
-            resultSb.append("key=").append(DateUtils.getCurrentTimestamp()).append("&");
-            resultSb.append("filePath=").append(busProcessModelHis.getEditFilePath()).append("&");
-            resultSb.append("fileName=").append(busProcessModelHis.getFileName());
+            if(ObjectUtils.isNotEmpty(busProcessModelHis)){
+                resultSb.append(onlyOfficePreviewUrl);
+                resultSb.append("oldFileName=").append(busProcessModelHis.getFileName()).append("&");
+                resultSb.append("fileType=").append("docx").append("&");
+                resultSb.append("attId=").append(busProcessModelHis.getId()).append("&");
+                resultSb.append("fileUrl=").append(busProcessModelHis.getDownLoadUrl()).append("&");
+                resultSb.append("key=").append(DateUtils.getCurrentTimestamp()).append("&");
+                resultSb.append("filePath=").append(busProcessModelHis.getEditFilePath()).append("&");
+                resultSb.append("fileName=").append(busProcessModelHis.getFileName());
+            }else{
+                log.error("busProcessModelHis为空，fileId="+fileId);
+            }
         }
         return resultSb.toString();
     }

From 2c565c60fabc3a9273cde9c3cf70ecd52ddf663d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Tue, 26 Mar 2024 16:51:52 +0800
Subject: [PATCH 04/11] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=B3=E9=97=AD?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=9B=9E=E8=B0=83=E6=8E=A5=E5=8F=A3=EF=BC=8C?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0token?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/OnlyOfficeController.java      | 39 ++++++++++++++++++-
 .../src/main/resources/application-dev.yml    |  1 +
 .../src/main/resources/application-prod.yml   |  1 +
 .../src/main/resources/application-test.yml   |  1 +
 4 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/onlyoffice/controller/OnlyOfficeController.java b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/onlyoffice/controller/OnlyOfficeController.java
index b63abff..f4dba96 100644
--- a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/onlyoffice/controller/OnlyOfficeController.java
+++ b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/onlyoffice/controller/OnlyOfficeController.java
@@ -108,6 +108,10 @@ public class OnlyOfficeController {
     @Value("${byd.uploadFileUrl}")
     private String bydUploadFileUrl;
 
+    @Value("${byd.unlockUrl}")
+    private String unlockUrl;
+
+
     @ApiOperation(value = "分页查询")
     @GetMapping("/pageList")
     public Result<IPage<BusProcessModelHis>> pageList(HttpServletRequest req, BusProcessModelHis processModelHis,
@@ -521,6 +525,8 @@ public class OnlyOfficeController {
     public Result<String> updateOnlineFileLogJxInfo(@RequestBody JSONObject json){
         String jxFileName = json.getString("jxFileName");
         String fileId = json.getString("fileId");
+        String appId = json.getString("appId");
+        String token = json.getString("Authorization");
         String dataType = "1";
 
         Date now = new Date();
@@ -547,7 +553,8 @@ public class OnlyOfficeController {
 
                 HttpHeaders headers2 = new HttpHeaders();
                 headers2.setContentType(MediaType.MULTIPART_FORM_DATA);
-
+                headers2.add("appId",appId);
+                headers2.add("Authorization",token);
                 // 创建MultiValueMap对象，用于存储请求参数
                 MultiValueMap<String, Object> params2 = new LinkedMultiValueMap<>();
 
@@ -577,6 +584,7 @@ public class OnlyOfficeController {
             }catch (Exception ex){
                 ex.printStackTrace();
                 logger.error("基线版本文件上传失败:" + ex.getMessage());
+                return Result.error("更新基线信息失败！");
             }
             logger.info("基线版本文件上传接口结束==========================================");
 
@@ -587,6 +595,8 @@ public class OnlyOfficeController {
                 RestTemplate restTemplate = new RestTemplate();
                 HttpHeaders headers = new HttpHeaders();
                 headers.setContentType(MediaType.APPLICATION_JSON);
+                headers.add("appId",appId);
+                headers.add("Authorization",token);
 
                 // 创建MultiValueMap对象，用于存储请求参数
                 MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
@@ -603,6 +613,7 @@ public class OnlyOfficeController {
             }catch (Exception ex){
                 ex.printStackTrace();
                 logger.error("推送保存基线版本文件信息失败:" + ex.getMessage());
+                return Result.error("更新基线信息失败！");
             }
             logger.info("推送保存基线版本文件信息结束==========================================");
 
@@ -653,6 +664,32 @@ public class OnlyOfficeController {
         return result;
     }
 
+    @ApiOperation(value = "关闭页面回调接口")
+    @GetMapping("/onlyOfficeCloseTab")
+    public Result<String> onlyOfficeCloseTab(String fileId, String appId, String Authorization, HttpServletResponse response, HttpServletRequest request) {
+        try {
+//            String appId = request.getParameter("appId");
+//            String token = request.getParameter("Authorization");
+            String token = Authorization;
+            RestTemplate restTemplate = new RestTemplate();
+            HttpHeaders headers = new HttpHeaders();
+            headers.setContentType(MediaType.APPLICATION_JSON);
+            headers.add("appId",appId);
+            headers.add("Authorization",token);
+            // 创建MultiValueMap对象，用于存储请求参数
+            MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
+            params.add("fileId", fileId);
+            // 使用HttpEntity对象包装请求体和请求头
+            HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(params, headers);
+            // 发送POST请求并获取响应
+            ResponseEntity<String> responseEntity = restTemplate.postForEntity(unlockUrl, requestEntity, String.class);
+            String body = responseEntity.getBody();
+            logger.info("关闭页面回调接口:" + body);
+        }catch (Exception ex){
+            ex.printStackTrace();
+        }
+        return Result.OK();
+    }
 
     @ApiOperation(value = "|File|在线编辑下载docx文件")
     @GetMapping("/onlyOfficeDownloadDocxFile")
diff --git a/byd-structuredplugins-serve/laws-single-startup/src/main/resources/application-dev.yml b/byd-structuredplugins-serve/laws-single-startup/src/main/resources/application-dev.yml
index 314fc1f..e0b4416 100644
--- a/byd-structuredplugins-serve/laws-single-startup/src/main/resources/application-dev.yml
+++ b/byd-structuredplugins-serve/laws-single-startup/src/main/resources/application-dev.yml
@@ -236,4 +236,5 @@ byd:
   saveBaseLineDocIdUrl: http://127.0.0.1:9998/saveBaseLineDocIdUrl
   splitResultUrl: http://127.0.0.1:9998/splitResultUrl
   downLoadFileUrl: http://127.0.0.1:9998/downLoadFileUrl
+  unlockUrl: http://127.0.0.1:9998/api/qbp/document/unlock
 
diff --git a/byd-structuredplugins-serve/laws-single-startup/src/main/resources/application-prod.yml b/byd-structuredplugins-serve/laws-single-startup/src/main/resources/application-prod.yml
index e60367b..11366fe 100644
--- a/byd-structuredplugins-serve/laws-single-startup/src/main/resources/application-prod.yml
+++ b/byd-structuredplugins-serve/laws-single-startup/src/main/resources/application-prod.yml
@@ -220,3 +220,4 @@ byd:
   saveBaseLineDocIdUrl: http://127.0.0.1:9998/api/qbp/organization/saveBaseLineDocId
   splitResultUrl: http://127.0.0.1:9998/api/qbp/library/structured
   downLoadFileUrl: http://127.0.0.1:9998/ipd-files/file/downLoad
+  unlockUrl: http://127.0.0.1:9998/api/qbp/document/unlock
diff --git a/byd-structuredplugins-serve/laws-single-startup/src/main/resources/application-test.yml b/byd-structuredplugins-serve/laws-single-startup/src/main/resources/application-test.yml
index 14244c7..8373fe7 100644
--- a/byd-structuredplugins-serve/laws-single-startup/src/main/resources/application-test.yml
+++ b/byd-structuredplugins-serve/laws-single-startup/src/main/resources/application-test.yml
@@ -232,3 +232,4 @@ byd:
   saveBaseLineDocIdUrl: http://127.0.0.1:9998/saveBaseLineDocIdUrl
   splitResultUrl: http://127.0.0.1:9998/splitResultUrl
   downLoadFileUrl: http://127.0.0.1:9998/downLoadFileUrl
+  unlockUrl: http://127.0.0.1:9998/api/qbp/document/unlock

From fb70fd01b59635c7dfbf770f8df882b4acedd6fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Tue, 26 Mar 2024 17:09:06 +0800
Subject: [PATCH 05/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/views/onlyoffice/index.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/jero-web/src/views/onlyoffice/index.vue b/jero-web/src/views/onlyoffice/index.vue
index af38187..e41f9c2 100644
--- a/jero-web/src/views/onlyoffice/index.vue
+++ b/jero-web/src/views/onlyoffice/index.vue
@@ -10,6 +10,8 @@
 
 <script>
 import { postAction, getAction } from '../../api/manage'
+import { ACCESS_TOKEN, OAUTH2_LOGIN_PAGE_PATH } from '@/store/mutation-types'
+import Vue from 'vue'
 
 export default {
   name: 'index',
@@ -32,6 +34,8 @@ export default {
               const focalUnit = '归口单位'
               const watermark = '比亚迪'
               const replaceStand = ''
+              const Authorization = 'token'
+              const appId = 'appId'
               // http://39.98.140.126:8999
               // http://127.0.0.1:8080
               window.open(window.CONFIG.onlyOfficeRoute + '/editor?fileId=' + val.id + '&pid=' + val.pid +
@@ -40,7 +44,8 @@ export default {
                 '&key=' + nowTime + '&filePath=' + val.editFilePath + '&fileName=' + val.fileName +
                 '&userId=' + val.userId + '&userName=admin' + '&standCode=' + standCode +
                 '&standName=' + standName + '&replaceStand=' + replaceStand + '&draftsman=' + draftsman +
-                '&draftingDepartment=' + draftingDepartment + '&focalUnit=' + focalUnit + '&watermark=' + watermark)
+                '&draftingDepartment=' + draftingDepartment + '&focalUnit=' + focalUnit + '&watermark=' + watermark +
+                '&Authorization=' + Authorization + '&appId=' + appId)
             }
           })
         } else {

From cbf99ee7efa4d48ae90034481786964501fb73d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Tue, 26 Mar 2024 17:29:50 +0800
Subject: [PATCH 06/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/store/modules/user.js | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/jero-web/src/store/modules/user.js b/jero-web/src/store/modules/user.js
index 28eb613..c409e68 100644
--- a/jero-web/src/store/modules/user.js
+++ b/jero-web/src/store/modules/user.js
@@ -144,21 +144,21 @@ const user = {
             path: '/documentTool/documentComparison',
             redirect: null,
             route: '1'
-          },
-          {
-            component: 'onlyoffice/index',
-            meta: {
-              componentName: 'onlyoffice',
-              icon: 'icon-24gf-folderOpen',
-              internalOrExternal: false,
-              keepAlive: false,
-              title: 'onlyoffice'
-            },
-            name: 'onlyoffice',
-            path: '/onlyoffice',
-            redirect: null,
-            route: '1'
           }
+          // {
+          //   component: 'onlyoffice/index',
+          //   meta: {
+          //     componentName: 'onlyoffice',
+          //     icon: 'icon-24gf-folderOpen',
+          //     internalOrExternal: false,
+          //     keepAlive: false,
+          //     title: 'onlyoffice'
+          //   },
+          //   name: 'onlyoffice',
+          //   path: '/onlyoffice',
+          //   redirect: null,
+          //   route: '1'
+          // }
         ]
         commit('SET_PERMISSIONLIST', menuData)
         resolve(menuData)

From d7d0f675f432375313690a137958e066120f88cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Wed, 27 Mar 2024 09:14:21 +0800
Subject: [PATCH 07/11] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A2=84=E8=A7=88?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3userName?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../onlyoffice/service/impl/BusProcessModelHisServiceImpl.java | 3 +++
 1 file changed, 3 insertions(+)

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 14af4ac..bb545ca 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
@@ -565,6 +565,7 @@ public class BusProcessModelHisServiceImpl extends ServiceImpl<BusProcessModelHi
         StringBuilder resultSb = new StringBuilder();
         String fileId = json.getString("fileId");
 //        String watermark = json.getString("watermark");
+        String userName = json.getString("userName");
 
         // 查询历史信息：1 是   2 否
         String queryType = json.getString("queryType");
@@ -576,6 +577,7 @@ public class BusProcessModelHisServiceImpl extends ServiceImpl<BusProcessModelHi
                 resultSb.append(previewHistoryUrl);
                 resultSb.append("oldFileName=").append(onlineFileLog.getFileName()).append("&");
                 resultSb.append("fileType=").append("docx").append("&");
+                resultSb.append("userName=").append(userName).append("&");
                 resultSb.append("attId=").append(onlineFileLog.getAttFileId()).append("&");
                 resultSb.append("fileUrl=").append(downloadFileUrl.toString()).append("&");
                 resultSb.append("key=").append(DateUtils.getCurrentTimestamp()).append("&");
@@ -590,6 +592,7 @@ public class BusProcessModelHisServiceImpl extends ServiceImpl<BusProcessModelHi
                 resultSb.append(onlyOfficePreviewUrl);
                 resultSb.append("oldFileName=").append(busProcessModelHis.getFileName()).append("&");
                 resultSb.append("fileType=").append("docx").append("&");
+                resultSb.append("userName=").append(userName).append("&");
                 resultSb.append("attId=").append(busProcessModelHis.getId()).append("&");
                 resultSb.append("fileUrl=").append(busProcessModelHis.getDownLoadUrl()).append("&");
                 resultSb.append("key=").append(DateUtils.getCurrentTimestamp()).append("&");

From 87a684f762b88c8e4443f260ee1356698738c82f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Wed, 27 Mar 2024 10:53:26 +0800
Subject: [PATCH 08/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=B9=E6=8E=A5?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../docking/controller/DockingController.java        |  3 ++-
 .../controller/DocumentSplitController.java          |  2 +-
 .../documenttool/service/IDocumentSplitService.java  |  2 +-
 .../service/impl/DocumentSplitServiceImpl.java       |  6 ++----
 .../onlyoffice/controller/OnlyOfficeController.java  | 12 +++++++-----
 5 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/docking/controller/DockingController.java b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/docking/controller/DockingController.java
index c3f3b67..f9e11f1 100644
--- a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/docking/controller/DockingController.java
+++ b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/docking/controller/DockingController.java
@@ -67,6 +67,7 @@ public class DockingController {
         String title = json.getString("title");
         String docId = json.getString("docId");
         String filePath = json.getString("filePath");
+        String token = json.getString("token");
 
         SarFileSplitInfoEO sarFileSplitInfoEO = new SarFileSplitInfoEO();
         sarFileSplitInfoEO.setFileName(fileName);
@@ -75,7 +76,7 @@ public class DockingController {
         sarFileSplitInfoEO.setTitle(title);
         sarFileSplitInfoEO.setId(docId);
         sarFileSplitInfoEO.setFilePath(filePath);
-        documentSplitService.add(sarFileSplitInfoEO, CommonConstant.SPLIT_SOURCE_2);
+        documentSplitService.add(token,sarFileSplitInfoEO, CommonConstant.SPLIT_SOURCE_2);
 
         Map<String,String> resultMap = new HashMap<>();
         resultMap.put("infoId",docId);
diff --git a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/controller/DocumentSplitController.java b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/controller/DocumentSplitController.java
index 02e4426..3409945 100644
--- a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/controller/DocumentSplitController.java
+++ b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/controller/DocumentSplitController.java
@@ -140,7 +140,7 @@ public class DocumentSplitController {
     @PostMapping(value = "/split")
     @ApiOperationSupport(order = 6)
     public Result<T> split(@Validated @RequestBody SarFileSplitInfoEO sarFileSplitInfoEO) {
-        documentSplitService.add(sarFileSplitInfoEO, CommonConstant.SPLIT_SOURCE_1);
+        documentSplitService.add("",sarFileSplitInfoEO, CommonConstant.SPLIT_SOURCE_1);
         return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
     }
 
diff --git a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/service/IDocumentSplitService.java b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/service/IDocumentSplitService.java
index 4578637..2329e4f 100644
--- a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/service/IDocumentSplitService.java
+++ b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/service/IDocumentSplitService.java
@@ -66,7 +66,7 @@ public interface IDocumentSplitService {
      * 文档拆分-拆分
      * @param sarFileSplitInfoEO
      */
-    void add(SarFileSplitInfoEO sarFileSplitInfoEO,String splitSource);
+    void add(String token,SarFileSplitInfoEO sarFileSplitInfoEO,String splitSource);
 
     /**
      * 拆分文档保存
diff --git a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/service/impl/DocumentSplitServiceImpl.java b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/service/impl/DocumentSplitServiceImpl.java
index dc59cb1..2d16910 100644
--- a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/service/impl/DocumentSplitServiceImpl.java
+++ b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/service/impl/DocumentSplitServiceImpl.java
@@ -312,9 +312,7 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
     }
 
     @Override
-    public void add(SarFileSplitInfoEO sarFileSplitInfoEO,String splitSource) {
-//        // 企标权限校验
-//        enterpriseCheck(sarFileSplitInfoEO);
+    public void add(String token,SarFileSplitInfoEO sarFileSplitInfoEO,String splitSource) {
         // 唯一校验
         uniqueCheck(sarFileSplitInfoEO);
         // 保存文本拆分数据
@@ -338,6 +336,7 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
                         RestTemplate restTemplate = new RestTemplate();
                         HttpHeaders headers = new HttpHeaders();
                         headers.setContentType(MediaType.APPLICATION_JSON);
+                        headers.add("Authorization",token);
 
                         // 创建MultiValueMap对象，用于存储请求参数
                         MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
@@ -368,7 +367,6 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
             }
         });
         thread.start();
-
     }
 
     @Override
diff --git a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/onlyoffice/controller/OnlyOfficeController.java b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/onlyoffice/controller/OnlyOfficeController.java
index f4dba96..7037b21 100644
--- a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/onlyoffice/controller/OnlyOfficeController.java
+++ b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/onlyoffice/controller/OnlyOfficeController.java
@@ -526,7 +526,7 @@ public class OnlyOfficeController {
         String jxFileName = json.getString("jxFileName");
         String fileId = json.getString("fileId");
         String appId = json.getString("appId");
-        String token = json.getString("Authorization");
+        String token = json.getString("token");
         String dataType = "1";
 
         Date now = new Date();
@@ -610,6 +610,11 @@ public class OnlyOfficeController {
                 ResponseEntity<String> responseEntity = restTemplate.postForEntity(bydSaveBaseLineDocIdUrl, requestEntity, String.class);
                 String body = responseEntity.getBody();
                 logger.info("推送保存基线版本文件信息结果:" + body);
+                JSONObject jres  = JSONObject.parseObject(body);
+                String code = jres.getString("code");
+                if(!"000000".equals(code)){
+                    return Result.error(jres.getString("mesg"));
+                }
             }catch (Exception ex){
                 ex.printStackTrace();
                 logger.error("推送保存基线版本文件信息失败:" + ex.getMessage());
@@ -666,11 +671,8 @@ public class OnlyOfficeController {
 
     @ApiOperation(value = "关闭页面回调接口")
     @GetMapping("/onlyOfficeCloseTab")
-    public Result<String> onlyOfficeCloseTab(String fileId, String appId, String Authorization, HttpServletResponse response, HttpServletRequest request) {
+    public Result<String> onlyOfficeCloseTab(String fileId, String appId, String token, HttpServletResponse response, HttpServletRequest request) {
         try {
-//            String appId = request.getParameter("appId");
-//            String token = request.getParameter("Authorization");
-            String token = Authorization;
             RestTemplate restTemplate = new RestTemplate();
             HttpHeaders headers = new HttpHeaders();
             headers.setContentType(MediaType.APPLICATION_JSON);

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

---
 .../impl/DocumentSplitServiceImpl.java        | 40 ++++++++++---------
 .../controller/OnlyOfficeController.java      | 21 +++++-----
 .../split/service/impl/FileSpiltService.java  |  6 +--
 3 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/service/impl/DocumentSplitServiceImpl.java b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/service/impl/DocumentSplitServiceImpl.java
index 2d16910..615aafe 100644
--- a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/service/impl/DocumentSplitServiceImpl.java
+++ b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/service/impl/DocumentSplitServiceImpl.java
@@ -321,16 +321,22 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
             @Override
             public void run() {
                 //拆分
-                int count = fileSpiltService.fileCHN(sarFileSplitInfoEO, SplitFileTypeTypeEnum.GBT,splitSource);
-
+                int count = -1;
+                try{
+                    count = fileSpiltService.fileCHN(sarFileSplitInfoEO, SplitFileTypeTypeEnum.GBT,splitSource);
+                }catch (Exception e){
+                    log.error("拆分标准失败:" + e.getMessage());
+                }
+                // 拆分结果(0-拆分失败、1-拆分成功)
+                int successful = 1;
+                sarFileSplitInfoEO.setSplitResult("成功");
+                if(count == -1){
+                    successful = 0;
+                    sarFileSplitInfoEO.setSplitResult("失败");
+                }
                 // 如果是外部系统调用
                 if (StringUtils.equals(splitSource, CommonConstant.SPLIT_SOURCE_2)) {
                     log.info("拆分结果回调开始=========================================================");
-                    // 拆分结果(0-拆分失败、1-拆分成功)
-                    int successful = 1;
-                    if(count == -1){
-                        successful = 0;
-                    }
                     try {
                         // 推送拆分结果
                         RestTemplate restTemplate = new RestTemplate();
@@ -339,14 +345,14 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
                         headers.add("Authorization",token);
 
                         // 创建MultiValueMap对象，用于存储请求参数
-                        MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
-                        params.add("standardCode", sarFileSplitInfoEO.getSerialNumber());
-                        params.add("docId", sarFileSplitInfoEO.getId());
-                        params.add("brief", "");
-                        params.add("successful", successful);
+                        Map<String, Object> params = new HashMap<>();
+                        params.put("standardCode", sarFileSplitInfoEO.getSerialNumber());
+                        params.put("docId", sarFileSplitInfoEO.getId());
+                        params.put("brief", "");
+                        params.put("successful", successful);
 
                         // 使用HttpEntity对象包装请求体和请求头
-                        HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(params, headers);
+                        HttpEntity<Map<String, Object>> requestEntity = new HttpEntity<>(params, headers);
 
                         // 发送POST请求并获取响应
                         ResponseEntity<String> responseEntity = restTemplate.postForEntity(bydSplitResultUrl, requestEntity, String.class);
@@ -358,12 +364,8 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
                         log.error("拆分结果回调结果失败:" + ex.getMessage());
                     }
                     log.info("拆分结果回调结束=========================================================");
-
-                }
-
-                if(count == -1){
-                    throw new JeroBootException("文档格式错误，请检查文档内容！");
                 }
+                sarFileSplitInfoService.updateById(sarFileSplitInfoEO);
             }
         });
         thread.start();
@@ -1295,7 +1297,7 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
             String infoId = UUID.randomUUID().toString().replace("-", "");
             sarFileSplitInfoEO.setId(infoId);
         }
-        sarFileSplitInfoEO.setSplitResult("成功");
+        sarFileSplitInfoEO.setSplitResult("拆分中");
         sarFileSplitInfoEO.setSplitStatus(SplitEnum.SPLIT_STATUS2.getValue());
         sarFileSplitInfoEO.setAuthor(userId);
         sarFileSplitInfoEO.setCreateTime(now);
diff --git a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/onlyoffice/controller/OnlyOfficeController.java b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/onlyoffice/controller/OnlyOfficeController.java
index 7037b21..b82df16 100644
--- a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/onlyoffice/controller/OnlyOfficeController.java
+++ b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/onlyoffice/controller/OnlyOfficeController.java
@@ -535,6 +535,7 @@ public class OnlyOfficeController {
         // 查询总次数
         int queryCount = 0;
         OnlineFileLog createTimeLatestOnlineFileLog = this.getCreateTimeLatestOnlineFileLog(fileId,now,queryCount);
+        final String oldOnlineFileId = createTimeLatestOnlineFileLog.getId();
 
         OnlineFileLog createTimeLatestOnlineFileLog2 = createTimeLatestOnlineFileLog;
         if (null != createTimeLatestOnlineFileLog) {
@@ -584,7 +585,7 @@ public class OnlyOfficeController {
             }catch (Exception ex){
                 ex.printStackTrace();
                 logger.error("基线版本文件上传失败:" + ex.getMessage());
-                return Result.error("更新基线信息失败！");
+//                return Result.error("更新基线信息失败！");
             }
             logger.info("基线版本文件上传接口结束==========================================");
 
@@ -599,12 +600,12 @@ public class OnlyOfficeController {
                 headers.add("Authorization",token);
 
                 // 创建MultiValueMap对象，用于存储请求参数
-                MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
-                params.add("fileId", createTimeLatestOnlineFileLog2.getHisId()); // 每一次草稿的id(第一次发起文档编辑时的id)
-                params.add("docId", createTimeLatestOnlineFileLog2.getId());     // 基线文档主键id
+                Map<String, Object> params = new HashMap<>();
+                params.put("fileId", createTimeLatestOnlineFileLog2.getHisId()); // 每一次草稿的id(第一次发起文档编辑时的id)
+                params.put("docId", createTimeLatestOnlineFileLog2.getId());     // 基线文档主键id
 
                 // 使用HttpEntity对象包装请求体和请求头
-                HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(params, headers);
+                HttpEntity<Map<String, Object>> requestEntity = new HttpEntity<>(params, headers);
 
                 // 发送POST请求并获取响应
                 ResponseEntity<String> responseEntity = restTemplate.postForEntity(bydSaveBaseLineDocIdUrl, requestEntity, String.class);
@@ -618,12 +619,12 @@ public class OnlyOfficeController {
             }catch (Exception ex){
                 ex.printStackTrace();
                 logger.error("推送保存基线版本文件信息失败:" + ex.getMessage());
-                return Result.error("更新基线信息失败！");
+//                return Result.error("更新基线信息失败！");
             }
             logger.info("推送保存基线版本文件信息结束==========================================");
 
 //            this.onlineFileLogDao.updateById(createTimeLatestOnlineFileLog);
-            this.onlineFileLogDao.deleteById(createTimeLatestOnlineFileLog.getId());
+            this.onlineFileLogDao.deleteById(oldOnlineFileId);
         } else {
             return Result.error("更新基线信息失败！");
         }
@@ -679,10 +680,10 @@ public class OnlyOfficeController {
             headers.add("appId",appId);
             headers.add("Authorization",token);
             // 创建MultiValueMap对象，用于存储请求参数
-            MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
-            params.add("fileId", fileId);
+            Map<String, Object> params = new HashMap<>();
+            params.put("fileId", fileId);
             // 使用HttpEntity对象包装请求体和请求头
-            HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(params, headers);
+            HttpEntity<Map<String, Object>> requestEntity = new HttpEntity<>(params, headers);
             // 发送POST请求并获取响应
             ResponseEntity<String> responseEntity = restTemplate.postForEntity(unlockUrl, requestEntity, String.class);
             String body = responseEntity.getBody();
diff --git a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java
index c5945ff..62391d2 100644
--- a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java
+++ b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java
@@ -225,12 +225,12 @@ public class FileSpiltService {
                 headers.setContentType(MediaType.APPLICATION_JSON);
 
                 // 创建MultiValueMap对象，用于存储请求参数
-                MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
+                Map<String, String> params = new HashMap<>();
                 String fileId = sarFileSplitInfoEO.getId();
-                params.add("fileId", fileId);
+                params.put("fileId", fileId);
 
                 // 使用HttpEntity对象包装请求体和请求头
-                HttpEntity<MultiValueMap<String, String>> requestEntity = new HttpEntity<>(params, headers);
+                HttpEntity<Map<String, String>> requestEntity = new HttpEntity<>(params, headers);
 
                 // 发送POST请求并获取响应
                 ResponseEntity<byte[]> responseEntity = restTemplate.postForEntity(bydDownLoadFileUrl, requestEntity, byte[].class);

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 10/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=B9=E6=8E=A5?=
 =?UTF-8?q?=E6=8E=A5=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();
     }
 

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

---
 .../jero/modules/docking/controller/DockingController.java    | 3 ++-
 .../documenttool/controller/DocumentSplitController.java      | 2 +-
 .../modules/documenttool/service/IDocumentSplitService.java   | 2 +-
 .../documenttool/service/impl/DocumentSplitServiceImpl.java   | 4 ++--
 .../modules/onlyoffice/controller/OnlyOfficeController.java   | 1 +
 .../com/jero/modules/split/service/impl/FileSpiltService.java | 4 +++-
 .../split/service/impl/SarFileSplitInfoServiceImpl.java       | 2 +-
 7 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/docking/controller/DockingController.java b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/docking/controller/DockingController.java
index f9e11f1..bc67309 100644
--- a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/docking/controller/DockingController.java
+++ b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/docking/controller/DockingController.java
@@ -68,6 +68,7 @@ public class DockingController {
         String docId = json.getString("docId");
         String filePath = json.getString("filePath");
         String token = json.getString("token");
+        String appId = json.getString("appId");
 
         SarFileSplitInfoEO sarFileSplitInfoEO = new SarFileSplitInfoEO();
         sarFileSplitInfoEO.setFileName(fileName);
@@ -76,7 +77,7 @@ public class DockingController {
         sarFileSplitInfoEO.setTitle(title);
         sarFileSplitInfoEO.setId(docId);
         sarFileSplitInfoEO.setFilePath(filePath);
-        documentSplitService.add(token,sarFileSplitInfoEO, CommonConstant.SPLIT_SOURCE_2);
+        documentSplitService.add(token,appId,sarFileSplitInfoEO, CommonConstant.SPLIT_SOURCE_2);
 
         Map<String,String> resultMap = new HashMap<>();
         resultMap.put("infoId",docId);
diff --git a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/controller/DocumentSplitController.java b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/controller/DocumentSplitController.java
index 3409945..aeb1c16 100644
--- a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/controller/DocumentSplitController.java
+++ b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/controller/DocumentSplitController.java
@@ -140,7 +140,7 @@ public class DocumentSplitController {
     @PostMapping(value = "/split")
     @ApiOperationSupport(order = 6)
     public Result<T> split(@Validated @RequestBody SarFileSplitInfoEO sarFileSplitInfoEO) {
-        documentSplitService.add("",sarFileSplitInfoEO, CommonConstant.SPLIT_SOURCE_1);
+        documentSplitService.add("","",sarFileSplitInfoEO, CommonConstant.SPLIT_SOURCE_1);
         return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
     }
 
diff --git a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/service/IDocumentSplitService.java b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/service/IDocumentSplitService.java
index 2329e4f..4ff9178 100644
--- a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/service/IDocumentSplitService.java
+++ b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/service/IDocumentSplitService.java
@@ -66,7 +66,7 @@ public interface IDocumentSplitService {
      * 文档拆分-拆分
      * @param sarFileSplitInfoEO
      */
-    void add(String token,SarFileSplitInfoEO sarFileSplitInfoEO,String splitSource);
+    void add(String token,String appId,SarFileSplitInfoEO sarFileSplitInfoEO,String splitSource);
 
     /**
      * 拆分文档保存
diff --git a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/service/impl/DocumentSplitServiceImpl.java b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/service/impl/DocumentSplitServiceImpl.java
index 615aafe..d16b2ad 100644
--- a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/service/impl/DocumentSplitServiceImpl.java
+++ b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/service/impl/DocumentSplitServiceImpl.java
@@ -312,7 +312,7 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
     }
 
     @Override
-    public void add(String token,SarFileSplitInfoEO sarFileSplitInfoEO,String splitSource) {
+    public void add(String token,String appId,SarFileSplitInfoEO sarFileSplitInfoEO,String splitSource) {
         // 唯一校验
         uniqueCheck(sarFileSplitInfoEO);
         // 保存文本拆分数据
@@ -323,7 +323,7 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
                 //拆分
                 int count = -1;
                 try{
-                    count = fileSpiltService.fileCHN(sarFileSplitInfoEO, SplitFileTypeTypeEnum.GBT,splitSource);
+                    count = fileSpiltService.fileCHN(sarFileSplitInfoEO, SplitFileTypeTypeEnum.GBT,splitSource,token,appId);
                 }catch (Exception e){
                     log.error("拆分标准失败:" + e.getMessage());
                 }
diff --git a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/onlyoffice/controller/OnlyOfficeController.java b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/onlyoffice/controller/OnlyOfficeController.java
index b82df16..410312f 100644
--- a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/onlyoffice/controller/OnlyOfficeController.java
+++ b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/onlyoffice/controller/OnlyOfficeController.java
@@ -603,6 +603,7 @@ public class OnlyOfficeController {
                 Map<String, Object> params = new HashMap<>();
                 params.put("fileId", createTimeLatestOnlineFileLog2.getHisId()); // 每一次草稿的id(第一次发起文档编辑时的id)
                 params.put("docId", createTimeLatestOnlineFileLog2.getId());     // 基线文档主键id
+                params.put("jxFileName", jxFileName);     // 基线文档名称
 
                 // 使用HttpEntity对象包装请求体和请求头
                 HttpEntity<Map<String, Object>> requestEntity = new HttpEntity<>(params, headers);
diff --git a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java
index 62391d2..8dfef8b 100644
--- a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java
+++ b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java
@@ -141,7 +141,7 @@ public class FileSpiltService {
      * @param enumByValue
      * @return
      */
-    public int fileCHN(SarFileSplitInfoEO sarFileSplitInfoEO, SplitFileTypeTypeEnum enumByValue,String splitSource) {
+    public int fileCHN(SarFileSplitInfoEO sarFileSplitInfoEO, SplitFileTypeTypeEnum enumByValue,String splitSource,String token,String appId) {
         if (sarFileSplitInfoEO.getStopNumber() <= 0) {
             sarFileSplitInfoEO.setStopNumber(200);
         }
@@ -223,6 +223,8 @@ public class FileSpiltService {
                 RestTemplate restTemplate = new RestTemplate();
                 HttpHeaders headers = new HttpHeaders();
                 headers.setContentType(MediaType.APPLICATION_JSON);
+                headers.add("Authorization",token);
+                headers.add("appId",appId);
 
                 // 创建MultiValueMap对象，用于存储请求参数
                 Map<String, String> params = new HashMap<>();
diff --git a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java
index 7166ed5..b5e42c1 100644
--- a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java
+++ b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java
@@ -96,7 +96,7 @@ public class SarFileSplitInfoServiceImpl extends ServiceImpl<SarFileSplitInfoMap
 		}*/
 
 		int result = 0;
-		result = fileSpiltService.fileCHN(sarFileSplitInfoEO,SplitFileTypeTypeEnum.GBT, CommonConstant.SPLIT_SOURCE_1);
+		result = fileSpiltService.fileCHN(sarFileSplitInfoEO,SplitFileTypeTypeEnum.GBT, CommonConstant.SPLIT_SOURCE_1,"","");
 
 		if(result == -1){
 			if(LanguageEnum.CN.equals(MessageUtils.getLanguage())) {