From 7458288ffad815780b146043935e8b1fbe2d71c6 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Wed, 24 Apr 2024 15:55:31 +0800 Subject: [PATCH 1/9] =?UTF-8?q?fix:=20=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=9A=84=E6=B5=81=E7=A8=8B=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hiwork/service/impl/SendMessageServiceImpl.java | 13 ++++++++----- .../service/impl/EsRevisionServiceImpl.java | 4 +++- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/SendMessageServiceImpl.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/SendMessageServiceImpl.java index 81bc47be..dbaa563d 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/SendMessageServiceImpl.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/SendMessageServiceImpl.java @@ -1,5 +1,6 @@ package com.jero.modules.docking.hiwork.service.impl; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.common.api.dto.message.SendMessageDTO; import com.jero.common.api.vo.SendMessageAPI; @@ -82,11 +83,13 @@ public class SendMessageServiceImpl implements SendMessageAPI { } List typeList = Arrays.asList(sysMessageTemplate.getTemplateType().split(",")); - if (openPage.contains("/workCenter/processCenter/processCenter")) { - if (openPage.contains("?")) { - openPage = openPage + "&activeTab=TodoList"; - } else { - openPage = openPage + "?activeTab=TodoList"; + if (StrUtil.isNotBlank(openPage)) { + if (openPage.contains("/workCenter/processCenter/processCenter")) { + if (openPage.contains("?")) { + openPage = openPage + "&activeTab=TodoList"; + } else { + openPage = openPage + "?activeTab=TodoList"; + } } } String finalOpenType = openType; diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java index df6f1298..a2ac59af 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java @@ -870,7 +870,9 @@ public class EsRevisionServiceImpl extends ServiceImpl Date: Wed, 24 Apr 2024 17:00:37 +0800 Subject: [PATCH 2/9] =?UTF-8?q?fix:=20=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E6=B5=81=E7=A8=8B=E6=9C=80=E5=90=8E=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esRevision/listener/ProcessESRevisionEndListener.java | 2 ++ .../modules/laws/common/service/impl/LawsCommonServiceImpl.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/listener/ProcessESRevisionEndListener.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/listener/ProcessESRevisionEndListener.java index 3ed77206..3f3d79c7 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/listener/ProcessESRevisionEndListener.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/listener/ProcessESRevisionEndListener.java @@ -27,6 +27,8 @@ import org.activiti.engine.delegate.DelegateExecution; import org.activiti.engine.delegate.ExecutionListener; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.*; diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java index 476988c6..6670ba87 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java @@ -732,6 +732,8 @@ public class LawsCommonServiceImpl implements ILawsCommonService { String id = ""; if (StrUtil.isBlank(existId)) { id = executeInsertByModel(module); + } else { + id = existId; } // 更新语句 UpdateWrapper updateWrapper = new UpdateWrapper(); From 59d38a6aabd5c65612fe6d2bb46604fbaefa3ed3 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Wed, 24 Apr 2024 17:35:52 +0800 Subject: [PATCH 3/9] =?UTF-8?q?fix:=20Es=E6=97=A0=E9=99=90=E5=88=B7?= =?UTF-8?q?=E6=97=A5=E5=BF=97BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../laws/home/service/impl/LawsHomeSearchServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java index ffc9796b..1a6d4aa4 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java @@ -1346,7 +1346,7 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService { List listIdsSub = listIds.subList(startIndex, endIndex); List listLawsEnterpriseStandard = lawsEnterpriseStandardService.listByIds(listIdsSub); if(CollectionUtils.isEmpty(listLawsEnterpriseStandard)){ - continue; + break; } for (LawsEnterpriseStandard lawsEnterpriseStandard : listLawsEnterpriseStandard) { try { From 6f1da5b2eeeae52dcc55357fb35a4a5fc1bc0596 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Wed, 24 Apr 2024 17:36:12 +0800 Subject: [PATCH 4/9] =?UTF-8?q?fix:=20=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E6=B5=81=E7=A8=8B=E7=BB=93=E6=9D=9F=E4=B8=8D=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E4=BC=81=E6=A0=87BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/service/impl/LawsCommonServiceImpl.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java index 6670ba87..35810970 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java @@ -729,12 +729,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService { // 对默认的字段赋值 String existId = parameterMap.get(FieldCommon.ID) == null ? "" : parameterMap.get(FieldCommon.ID).toString(); //先新增后面在编辑 - String id = ""; - if (StrUtil.isBlank(existId)) { - id = executeInsertByModel(module); - } else { - id = existId; - } + String id = executeInsertByModel(module, existId); // 更新语句 UpdateWrapper updateWrapper = new UpdateWrapper(); updateWrapper.eq("id", id); @@ -966,21 +961,25 @@ public class LawsCommonServiceImpl implements ILawsCommonService { } } - private String executeInsertByModel(String module) { + private String executeInsertByModel(String module, String id) { if (TableNameEnum.DOMESTIC_REGULATIONS.getValue().equals(module)) { LawsDomesticStandard lawsDomesticStandard = new LawsDomesticStandard(); + lawsDomesticStandard.setId(id); lawsDomesticStandardService.save(lawsDomesticStandard); return lawsDomesticStandard.getId(); } else if (TableNameEnum.FOREIGN_REGULATIONS.getValue().equals(module)) { LawsOverseasStandard lawsOverseasStandard = new LawsOverseasStandard(); + lawsOverseasStandard.setId(id); lawsOverseasStandardService.save(lawsOverseasStandard); return lawsOverseasStandard.getId(); } else if (TableNameEnum.ENTERPRISE_STANDARDS.getValue().equals(module)) { LawsEnterpriseStandard lawsEnterpriseStandard = new LawsEnterpriseStandard(); + lawsEnterpriseStandard.setId(id); lawsEnterpriseStandardService.save(lawsEnterpriseStandard); return lawsEnterpriseStandard.getId(); } else { LawsDocumentSplit lawsDocumentSplit = new LawsDocumentSplit(); + lawsDocumentSplit.setId(id); documentSplitMapper.insert(lawsDocumentSplit); return lawsDocumentSplit.getId(); } From 06d557391635e08976ba5bcc043940a25f5a1363 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Thu, 25 Apr 2024 15:57:19 +0800 Subject: [PATCH 5/9] =?UTF-8?q?feat:=20=E5=9C=A8=E7=BA=BF=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E6=B5=81=E7=A8=8B=E7=BB=93=E6=9D=9F=E5=B0=86docx?= =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E4=B8=BApdf?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oss/controller/OSSFileController.java | 7 + .../com/jero/modules/oss/entity/OSSFile.java | 7 + .../listener/ProcessESChangeEndListener.java | 10 -- .../impl/BusProcessModelHisServiceImpl.java | 11 ++ .../onlyoffice/utils/OnlyOfficePdfUtil.java | 162 ++++++++++++++++++ 5 files changed, 187 insertions(+), 10 deletions(-) create mode 100644 laws-modules/src/main/java/com/jero/modules/onlyoffice/utils/OnlyOfficePdfUtil.java diff --git a/laws-module-system/src/main/java/com/jero/modules/oss/controller/OSSFileController.java b/laws-module-system/src/main/java/com/jero/modules/oss/controller/OSSFileController.java index b9a86491..25ad5396 100644 --- a/laws-module-system/src/main/java/com/jero/modules/oss/controller/OSSFileController.java +++ b/laws-module-system/src/main/java/com/jero/modules/oss/controller/OSSFileController.java @@ -1,5 +1,6 @@ package com.jero.modules.oss.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -81,12 +82,18 @@ public class OSSFileController { public Result queryById(@RequestParam(name = "id") String id) { Result result = new Result<>(); OSSFile file = ossFileService.getById(id); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(OSSFile::getBindId, id); + OSSFile pdfFile = ossFileService.getOne(queryWrapper); if (file == null) { return Result.error("未找到对应实体"); } else { result.setResult(file); result.setSuccess(true); + if (pdfFile != null) { + file.setPdfId(pdfFile.getId()); + } } return result; } diff --git a/laws-module-system/src/main/java/com/jero/modules/oss/entity/OSSFile.java b/laws-module-system/src/main/java/com/jero/modules/oss/entity/OSSFile.java index 5032c05c..799adb33 100644 --- a/laws-module-system/src/main/java/com/jero/modules/oss/entity/OSSFile.java +++ b/laws-module-system/src/main/java/com/jero/modules/oss/entity/OSSFile.java @@ -59,6 +59,13 @@ public class OSSFile extends JeroEntity { @ApiModelProperty(value = "所属部门") private String sysOrgCode; + @ApiModelProperty(value = "docx文件对应的pdf文件 使用此字段绑定docx的版本") + private String bindId; + + @TableField(exist = false) + @ApiModelProperty(value = "PDF版本对应的文件Id") + private String pdfId; + /** * 带文件下载的相对路径 */ diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/listener/ProcessESChangeEndListener.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/listener/ProcessESChangeEndListener.java index 4ded80a1..6d8dc898 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/listener/ProcessESChangeEndListener.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/listener/ProcessESChangeEndListener.java @@ -4,13 +4,10 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.common.api.CommonAPI; import com.jero.common.api.vo.Result; -import com.jero.common.constant.enums.YesOrNoEnum; import com.jero.common.exception.JeroBootException; import com.jero.common.system.vo.DictModel; import com.jero.common.system.vo.SysDictItemCore; import com.jero.modules.activiti.entity.ProcessApprovalRecord; -import com.jero.modules.activiti.enums.CommitFlagEnum; -import com.jero.modules.activiti.enums.FinishFlagEnum; import com.jero.modules.activiti.process.common.enums.StandardStateEnum; import com.jero.modules.activiti.process.esChange.entity.EsChangeOpinion; import com.jero.modules.activiti.process.esChange.entity.EsChangeTaskNameConstant; @@ -28,7 +25,6 @@ import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.system.controller.CommonController; import com.jero.modules.system.entity.SysDepart; -import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.*; import com.jero.modules.tag.enums.TableNameEnum; import lombok.extern.slf4j.Slf4j; @@ -75,12 +71,6 @@ public class ProcessESChangeEndListener implements ExecutionListener { @Resource private ILawsCommonService commonService; - @Resource - private ISysUserService sysUserService; - - @Resource - private ISysUserDepartService sysUserDepartService; - @Resource private ISysDepartService sysDepartService; diff --git a/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/impl/BusProcessModelHisServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/impl/BusProcessModelHisServiceImpl.java index 1ada901b..c3d5d4db 100644 --- a/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/impl/BusProcessModelHisServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/impl/BusProcessModelHisServiceImpl.java @@ -3,6 +3,7 @@ package com.jero.modules.onlyoffice.service.impl; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.exception.JeroBootException; import com.jero.common.util.CommonUtils; @@ -18,6 +19,7 @@ import com.jero.modules.onlyoffice.entity.StandardFileType; import com.jero.modules.onlyoffice.mapper.BusProcessModelHisMapper; import com.jero.modules.onlyoffice.mapper.OnlineFileLogDao; import com.jero.modules.onlyoffice.service.IBusProcessModelHisService; +import com.jero.modules.onlyoffice.utils.OnlyOfficePdfUtil; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; import org.apache.commons.io.FileUtils; @@ -75,6 +77,9 @@ public class BusProcessModelHisServiceImpl extends ServiceImpl parameters = new HashMap<>(); + parameters.put("async", false); + parameters.put("filetype", "docx"); + parameters.put("key", key); + parameters.put("outputtype", "pdf"); + parameters.put("title", fileName + ".pdf"); + parameters.put("url", downloadFileUrl + onlineFilePath); + log.info("转换文件参数: {}", parameters); + JSONObject requestJson = new JSONObject(parameters); + String data = requestJson.toString(); + + try (CloseableHttpClient httpClient = createHttpClient()) { + String url = onlyOfficeUrl + transferPDfUrl; + log.info("访问onlyOfficeUrl：{}", url); + HttpPost httpPost = new HttpPost(url); + httpPost.setEntity(new StringEntity(data, "UTF-8")); + httpPost.setHeader("Content-type", "application/json; charset=UTF-8"); + + try (CloseableHttpResponse response = httpClient.execute(httpPost)) { + return handleResponse(response); + } + } + } + + @SneakyThrows + private void fetchAndSaveFile(CloseableHttpClient httpClient, String fileName, String fileUrl, String key) { + String pdfFileName = fileName + ".pdf"; + HttpGet get = new HttpGet(fileUrl); + try (CloseableHttpResponse response = httpClient.execute(get)) { + if (response.getStatusLine().getStatusCode() != HttpStatus.SC_OK) { + throw new JeroBootException("Failed to fetch the file: " + response); + } + HttpEntity entity = response.getEntity(); + if (entity != null) { + try (InputStream content = entity.getContent()) { + MultipartFile file = new MockMultipartFile(pdfFileName, pdfFileName, ContentType.APPLICATION_OCTET_STREAM.toString(), content); + // 保存文件逻辑 + String savePath = CommonUtils.upload(file, "", uploadType); + if (oConvertUtils.isNotEmpty(savePath)) { + // 如果有的话，删除原来的pdf版本 + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(OSSFile::getBindId, key); + ossFileService.remove(lambdaQueryWrapper); + + // 上传成功 进行数据库存储 + OSSFile ossFile = new OSSFile(); + // 文件名 + ossFile.setFileName(pdfFileName); + ossFile.setUrl(savePath); + ossFile.setBindId(key); + ossFileService.save(ossFile); + } + } + } + } + } + + @SneakyThrows + private String handleResponse(CloseableHttpResponse response) { + HttpEntity entity = response.getEntity(); + if (entity != null) { + String responseData = EntityUtils.toString(entity, "UTF-8"); + return analysisXML(responseData); + } + return null; + } + + @SneakyThrows + public static String analysisXML(String xmlString) { + log.info("OnlyOffice返回xmlString:{}", xmlString); + Document document = DocumentHelper.parseText(xmlString); + Element root = document.getRootElement(); + return root.elementText("FileUrl").replaceAll("&", "&"); + } + +} From 90b532fe9d722f16db4b78c847ad33503712ea81 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Thu, 25 Apr 2024 15:59:24 +0800 Subject: [PATCH 6/9] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0onlyoffic?= =?UTF-8?q?=E8=BD=AC=E6=8D=A2pdf=E7=9A=84url?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- laws-single-startup/src/main/resources/application-dev.yml | 4 +++- laws-single-startup/src/main/resources/application-prod.yml | 1 + laws-single-startup/src/main/resources/application-test.yml | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/laws-single-startup/src/main/resources/application-dev.yml b/laws-single-startup/src/main/resources/application-dev.yml index ec6fc4f9..959358ae 100644 --- a/laws-single-startup/src/main/resources/application-dev.yml +++ b/laws-single-startup/src/main/resources/application-dev.yml @@ -540,4 +540,6 @@ standardProperty: #onlyoffice保存时回调url替换 onlyoffice: replaceUrl: srms.sinotruk.com,srms-onlyoffice.sinotruk.com - toUrl: onlyoffice-j3qlv.yf-grp:8080 + toUrl: http://10.10.10.45:8107 + transferPDfUrl: /7.5.1-23/ConvertService.ashx +# toUrl: onlyoffice-j3qlv.yf-grp:8080 diff --git a/laws-single-startup/src/main/resources/application-prod.yml b/laws-single-startup/src/main/resources/application-prod.yml index 879fe728..1a0b292e 100644 --- a/laws-single-startup/src/main/resources/application-prod.yml +++ b/laws-single-startup/src/main/resources/application-prod.yml @@ -507,3 +507,4 @@ standardProperty: onlyoffice: replaceUrl: srms.sinotruk.com,srms-onlyoffice.sinotruk.com toUrl: onlyoffice-j3qlv.yf-grp:8080 + transferPDfUrl: /7.5.1-23/ConvertService.ashx diff --git a/laws-single-startup/src/main/resources/application-test.yml b/laws-single-startup/src/main/resources/application-test.yml index 870a48de..06b0ad39 100644 --- a/laws-single-startup/src/main/resources/application-test.yml +++ b/laws-single-startup/src/main/resources/application-test.yml @@ -507,3 +507,4 @@ standardProperty: onlyoffice: replaceUrl: srms-test.sinotruk.com,srmstest-onlyoffice.sinotruk.com toUrl: onlyoffice-sa2of.yf-grp:8080 + transferPDfUrl: /7.5.1-23/ConvertService.ashx From edb4e5bd759a477ccc9768e70b7e05b62b4a0b79 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Thu, 25 Apr 2024 18:03:06 +0800 Subject: [PATCH 7/9] =?UTF-8?q?fix:=20=E4=BC=81=E6=A0=87=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=96=87=E4=BB=B6=E8=BD=AC=E6=8D=A2=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/BusProcessModelHisServiceImpl.java | 2 +- .../onlyoffice/utils/OnlyOfficePdfUtil.java | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/impl/BusProcessModelHisServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/impl/BusProcessModelHisServiceImpl.java index c3d5d4db..091a5855 100644 --- a/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/impl/BusProcessModelHisServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/impl/BusProcessModelHisServiceImpl.java @@ -406,7 +406,7 @@ public class BusProcessModelHisServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(OSSFile::getBindId, key); + lambdaQueryWrapper.eq(OSSFile::getBindId, originFileId); ossFileService.remove(lambdaQueryWrapper); // 上传成功 进行数据库存储 @@ -133,7 +135,7 @@ public class OnlyOfficePdfUtil { // 文件名 ossFile.setFileName(pdfFileName); ossFile.setUrl(savePath); - ossFile.setBindId(key); + ossFile.setBindId(originFileId); ossFileService.save(ossFile); } } From cf650daf6868b411a1ed52c026b4966129a48344 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Fri, 26 Apr 2024 09:15:56 +0800 Subject: [PATCH 8/9] =?UTF-8?q?ci:=20=E6=96=87=E4=BB=B6=E8=A1=A8=E6=96=B0?= =?UTF-8?q?=E5=A2=9Epdf=E6=96=87=E4=BB=B6=E7=BB=91=E5=AE=9Aid=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/prod/2024-3-18-变更.sql | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/db/prod/2024-3-18-变更.sql b/db/prod/2024-3-18-变更.sql index d3a63d73..8da2a1a8 100644 --- a/db/prod/2024-3-18-变更.sql +++ b/db/prod/2024-3-18-变更.sql @@ -91,4 +91,7 @@ ALTER TABLE `laws_enterprise_standard_review_meeting_record` ADD COLUMN `review_user` varchar(2000) NULL COMMENT '评审人' AFTER `review_date`; -- 2024 0418 企标制修订流程表增加评审人列 ALTER TABLE `process_es_revision` - ADD COLUMN `review_user` varchar(2000) NULL COMMENT '评审人（标准化审批）' AFTER `comments_summary`; \ No newline at end of file + ADD COLUMN `review_user` varchar(2000) NULL COMMENT '评审人（标准化审批）' AFTER `comments_summary`; +-- 2024 0426 文件表新增pdf文件绑定id字段 +ALTER TABLE `oss_file` + ADD COLUMN `bind_id` varchar(255) NULL COMMENT 'docx文件对应的pdf文件 使用此字段绑定docx的版本' AFTER `standard_file_type`; \ No newline at end of file From 469b13586164417cf0f4cc0aa54539af7a65a553 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Fri, 26 Apr 2024 16:56:07 +0800 Subject: [PATCH 9/9] =?UTF-8?q?fix:=20=E4=BC=81=E6=A0=87=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=96=B0=E5=A2=9E=E6=96=87=E4=BB=B6=E4=B8=8D?= =?UTF-8?q?=E7=94=9F=E6=88=90docx?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../listener/ProcessESChangeEndListener.java | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/listener/ProcessESChangeEndListener.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/listener/ProcessESChangeEndListener.java index 6d8dc898..a6683930 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/listener/ProcessESChangeEndListener.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/listener/ProcessESChangeEndListener.java @@ -97,6 +97,11 @@ public class ProcessESChangeEndListener implements ExecutionListener { @Resource private IBusProcessModelHisService busProcessModelHisService; + + @Resource + private ILawsCommonService lawsCommonService; + + private static final String MODULE_VALUE = TableNameEnum.ENTERPRISE_STANDARDS.getValue(); @Override public void notify(DelegateExecution delegateExecution) { @@ -111,12 +116,23 @@ public class ProcessESChangeEndListener implements ExecutionListener { // 根据标准编号找到标准Id LawsEnterpriseStandard es = esService.getOne(new LambdaQueryWrapper() .eq(LawsEnterpriseStandard::getStandardNumber, standNo)); + Map esDataMap = lawsCommonService.getByIdAndModule(es.getId(), MODULE_VALUE, "2", null); // 转换成Map 然后走commonEdit接口 Map parameterMap = new HashMap<>(); this.buildMap(parameterMap, change); - // 替换相应文件的url - if (StrUtil.isNotBlank(change.getReplaceFileId()) && StrUtil.isNotBlank(change.getOnEditFile())) { - busProcessModelHisService.replaceFile(change.getOnEditFile(), change.getReplaceFileId()); + String onEditFileId = change.getOnEditFile(); + String replaceFileId = change.getReplaceFileId(); + if (StrUtil.isNotBlank(onEditFileId)) { + if (StrUtil.isNotBlank(replaceFileId)) { + busProcessModelHisService.replaceFile(onEditFileId, replaceFileId); + } else { + String fileId = busProcessModelHisService.saveProcessFileToOss(onEditFileId); + String existFileIds = (String) esDataMap.get(FieldCommon.FILE_PUBLISH_OF_ORIGINAL); + if (StrUtil.isNotBlank(existFileIds)) { + fileId += "," + existFileIds; + } + parameterMap.put(FieldCommon.FILE_PUBLISH_OF_ORIGINAL, fileId); + } } // 保存修改的文件 commonService.commonEdit(parameterMap);