diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/ins/GeneratedInsFactory.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/ins/GeneratedInsFactory.java index 2a312e0..be236cc 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/ins/GeneratedInsFactory.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/ins/GeneratedInsFactory.java @@ -82,7 +82,7 @@ public class GeneratedInsFactory { null, false, "", - "downFile", SecurityConstants.INNER); + "wrkGen", SecurityConstants.INNER); // 不为空时, 说明 上传成功 if (listResult.isSuccess() && CollectionUtil.isNotEmpty(listResult.getData())){ log.info("上传成功"); diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/TemplateController.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/TemplateController.java index 2b03e90..ff2b3c9 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/TemplateController.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/TemplateController.java @@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; +import java.io.IOException; /** * 模板相关管理 @@ -90,8 +91,9 @@ public class TemplateController { @SysLog(value = "模板", businessType = BusinessType.UPLOAD) @PostMapping(value = "/upload") @RequiresPermissions(value = "ins:template:upload") - public AjaxResult uploadTemplate(@RequestParam MultipartFile file){ - return AjaxResult.success(tbTemplateService.uploadFile(file)); + public AjaxResult uploadTemplate(@RequestPart(name = "file") MultipartFile file, + @RequestParam String templateType) throws IOException { + return AjaxResult.success(tbTemplateService.uploadFile(file, templateType)); } } diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/TbTemplateService.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/TbTemplateService.java index c1e3540..e8a6efd 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/TbTemplateService.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/TbTemplateService.java @@ -8,6 +8,8 @@ import com.chushang.inspection.project.po.Template; import com.chushang.oss.entity.vo.FileSourceVo; import org.springframework.web.multipart.MultipartFile; +import java.io.IOException; + /** * @auther: zhao * @date: 2024/7/2 11:04 @@ -27,5 +29,5 @@ public interface TbTemplateService extends IService