From 3fcb4d19953100b087487f874e14049eab82af8f Mon Sep 17 00:00:00 2001 From: "=.*" <17638147107@163.com> Date: Tue, 25 Jun 2024 09:19:46 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/controller/WrkProjectController.java | 5 +++-- .../project/service/WrkProjectContractService.java | 8 ++++---- .../inspection/project/service/WrkProjectService.java | 1 + .../project/service/impl/PollingTaskServiceImpl.java | 2 +- .../java/com/chushang/oss/controller/FileController.java | 2 +- .../java/com/chushang/oss/service/FileSourceService.java | 4 ++-- 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/WrkProjectController.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/WrkProjectController.java index 904077c..83cfab6 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/WrkProjectController.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/WrkProjectController.java @@ -11,6 +11,7 @@ import com.chushang.common.mybatis.utils.PageResult; import com.chushang.inspection.project.dto.ContractDTO; import com.chushang.inspection.project.dto.ProjectDTO; import com.chushang.inspection.project.po.WrkProject; +import com.chushang.inspection.project.po.WrkProjectContract; import com.chushang.inspection.project.service.WrkProjectContractService; import com.chushang.inspection.project.service.WrkProjectService; import com.chushang.security.annotation.RequiresPermissions; @@ -128,10 +129,10 @@ public class WrkProjectController { */ @GetMapping(value = "/contract/list") @RequiresPermissions("inspection:contract:list") - public AjaxResult list(Long projectId) + public AjaxResult list(WrkProjectContract contract) { CommonParam commonParam = CommonParam.buildPageRequest(); - return AjaxResult.success(contractService.pageList(projectId, commonParam)); + return AjaxResult.success(contractService.pageList(contract, commonParam)); } // /** diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectContractService.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectContractService.java index 6a11162..38ef46e 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectContractService.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectContractService.java @@ -34,10 +34,10 @@ public class WrkProjectContractService extends ServiceImpl queryWrapper = WrapperUtils.builder(contract, commonParam); diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectService.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectService.java index 6ed8495..d5b8ad2 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectService.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectService.java @@ -81,6 +81,7 @@ public class WrkProjectService extends ServiceImpl wrkProject.setProjectEffect(1); } this.save(wrkProject); + contract.setProjectId(wrkProject.getProjectId()); // 项目合同 saveContract(contract); return wrkProject.getProjectId(); diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/impl/PollingTaskServiceImpl.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/impl/PollingTaskServiceImpl.java index a2053f0..0023320 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/impl/PollingTaskServiceImpl.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/impl/PollingTaskServiceImpl.java @@ -8,6 +8,7 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; +import com.alibaba.nacos.shaded.com.google.common.collect.Maps; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.chushang.common.core.constant.SecurityConstants; @@ -29,7 +30,6 @@ import com.chushang.task.entity.dto.CreateTaskDTO; import com.chushang.task.enums.ServiceEnum; import com.chushang.task.enums.TaskTypeEnum; import com.chushang.task.feign.RemoteTaskService; -import com.google.common.collect.Maps; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/chushang-modules/chushang-module-oss/oss-service/src/main/java/com/chushang/oss/controller/FileController.java b/chushang-modules/chushang-module-oss/oss-service/src/main/java/com/chushang/oss/controller/FileController.java index a1a771a..a20bf88 100644 --- a/chushang-modules/chushang-module-oss/oss-service/src/main/java/com/chushang/oss/controller/FileController.java +++ b/chushang-modules/chushang-module-oss/oss-service/src/main/java/com/chushang/oss/controller/FileController.java @@ -54,7 +54,7 @@ public class FileController { */ @SysLog(value = "合同上传", businessType = BusinessType.INSERT) @PostMapping(value = "/uploadContract") - @RequiresPermissions("system:file:ucontract") + @RequiresPermissions("system:file:upload") public AjaxResult uploadContract(@RequestParam(value = "file") MultipartFile file) throws Exception { return AjaxResult.success(fileSourceService.uploadContract(file)); diff --git a/chushang-modules/chushang-module-oss/oss-service/src/main/java/com/chushang/oss/service/FileSourceService.java b/chushang-modules/chushang-module-oss/oss-service/src/main/java/com/chushang/oss/service/FileSourceService.java index 437d3d9..dfb6d8b 100644 --- a/chushang-modules/chushang-module-oss/oss-service/src/main/java/com/chushang/oss/service/FileSourceService.java +++ b/chushang-modules/chushang-module-oss/oss-service/src/main/java/com/chushang/oss/service/FileSourceService.java @@ -238,7 +238,7 @@ public class FileSourceService public String uploadContract(MultipartFile file) throws Exception{ String ip = IPUtils.clientIp(ServletUtils.getRequest()); String fid = generateFid(); - String fName = file.getName(); + String fName = file.getOriginalFilename(); long length = file.getSize(); String md5 = FileUtils.getMd5(file.getInputStream()); // image/jpeg mimeType @@ -247,7 +247,7 @@ public class FileSourceService fileSourceInfo.setFid(fid); fileSourceInfo.setName(fName); fileSourceInfo.setSize(length); - fileSourceInfo.setPath("qcCode/"+fName); + fileSourceInfo.setPath("contract/"+fName); fileSourceInfo.setMd5(md5); fileSourceInfo.setMimeType("image/jpeg"); String upload = ossService.upload(file.getInputStream(), fileSourceInfo);