From b809036ade43c97f86a0802fed57177884cc61f7 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期四, 26 十二月 2024 17:46:34 +0800 Subject: [PATCH] 赋码demo --- business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java | 71 +++++++++++++++++++++++++++++++++-- 1 files changed, 66 insertions(+), 5 deletions(-) diff --git a/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java index 0dd853d..8191b18 100644 --- a/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java +++ b/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java @@ -1,6 +1,8 @@ package com.ycl.service.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.io.IORuntimeException; +import cn.hutool.core.util.CharsetUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.ZipUtil; @@ -26,11 +28,10 @@ import com.ycl.common.utils.file.FileUploadUtils; import com.ycl.common.utils.file.FileUtils; import com.ycl.common.utils.poi.ExcelUtil; +import com.ycl.controller.ProjectInfoController; import com.ycl.domain.entity.*; import com.ycl.domain.excel.ProjectExcelTemplate; -import com.ycl.domain.form.DocumentInfoForm; -import com.ycl.domain.form.PlanForm; -import com.ycl.domain.form.ProjectInfoForm; +import com.ycl.domain.form.*; import com.ycl.domain.query.ProjectExportQuery; import com.ycl.domain.query.ProjectInfoQuery; import com.ycl.domain.vo.*; @@ -83,6 +84,10 @@ private final FileService fileService; private final FileMapper fileMapper; private final PlanMapper planMapper; + private final ProjectInvestmentInfoServiceImpl projectInvestmentInfoServiceImpl; + private final ProjectInvestmentFundingServiceImpl projectInvestmentFundingServiceImpl; + private final ProjectInvestmentPolicyComplianceServiceImpl projectInvestmentPolicyComplianceServiceImpl; + private final ProjectUnitRegistrationInfoServiceImpl projectUnitRegistrationInfoServiceImpl; /** * 娣诲姞 @@ -570,7 +575,13 @@ } tempDir = Files.createTempDirectory("temp-dir").toFile(); - ZipUtil.unzip(tempZip, tempDir, StandardCharsets.ISO_8859_1); + + try { + ZipUtil.unzip(tempZip, tempDir, CharsetUtil.CHARSET_UTF_8); + }catch (IORuntimeException e){ + log.error("瑙e帇澶辫触锛屽皾璇曚娇鐢℅BK缂栫爜瑙e帇..."); + ZipUtil.unzip(tempZip, tempDir, CharsetUtil.CHARSET_GBK); + } Path path = tempDir.toPath(); ProjectImportListener projectImportListener = new ProjectImportListener(); @@ -609,7 +620,7 @@ files.forEach(attachmentFile -> { try { //涓婁紶 - String url = FileUploadUtils.upload(filePath, file); + String url = FileUploadUtils.uploadIOFile(filePath, attachmentFile); //瀛樻斁鐨勬枃浠跺悕浼氬姞涓奯鏃堕棿鎴崇殑鍚庣紑 String newName = FileUtils.getName(url); attachments.add(new File() @@ -650,6 +661,56 @@ } } + @Override + public Result editProject(ProjectForm form) { + if (ObjectUtil.isNotNull(form.getProjectInfoForm())){ + if (ObjectUtil.isNull(form.getProjectInfoForm().getId())) { + //鏂板 + add(form.getProjectInfoForm()); + }else { + //鏇存柊 + update(form.getProjectInfoForm()); + } + } + if (ObjectUtil.isNotNull(form.getProjectInvestmentInfoForm())) { + if (ObjectUtil.isNull(form.getProjectInvestmentInfoForm().getId())) { + projectInvestmentInfoServiceImpl.add(form.getProjectInvestmentInfoForm()); + }else { + projectInvestmentInfoServiceImpl.update(form.getProjectInvestmentInfoForm()); + } + } + if (ObjectUtil.isNotNull(form.getProjectInvestmentFundingForm())) { + if (ObjectUtil.isNull(form.getProjectInvestmentFundingForm().getId())) { + projectInvestmentFundingServiceImpl.add(form.getProjectInvestmentFundingForm()); + }else { + projectInvestmentFundingServiceImpl.update(form.getProjectInvestmentFundingForm()); + } + } + if (ObjectUtil.isNotNull(form.getProjectInvestmentPolicyComplianceForm())) { + if (ObjectUtil.isNull(form.getProjectInvestmentPolicyComplianceForm().getId())) { + projectInvestmentPolicyComplianceServiceImpl.add(form.getProjectInvestmentPolicyComplianceForm()); + }else { + projectInvestmentPolicyComplianceServiceImpl.update(form.getProjectInvestmentPolicyComplianceForm()); + } + } + if (ObjectUtil.isNotNull(form.getProjectUnitRegistrationInfoForm())) { + if (ObjectUtil.isNull(form.getProjectUnitRegistrationInfoForm().getId())) { + projectUnitRegistrationInfoServiceImpl.add(form.getProjectUnitRegistrationInfoForm()); + }else { + projectUnitRegistrationInfoServiceImpl.update(form.getProjectUnitRegistrationInfoForm()); + } + } + if (ObjectUtil.isNotNull(form.getDocumentInfoForm())) { + if (ObjectUtil.isNull(form.getDocumentInfoForm().getProjectId())){ + return Result.error("璇峰厛淇濆瓨鎶曡祫绠$悊鍩烘湰淇℃伅"); + }else { + addDoc(form.getDocumentInfoForm()); + } + } + + return Result.ok("鎻愪氦鎴愬姛"); + } + private static void deleteDirectoryOrFile(java.io.File file) { if (ObjectUtil.isNull(file)) { return; -- Gitblit v1.8.0