diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/controller/CommonController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/controller/CommonController.java index 967954a..864417e 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/controller/CommonController.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/controller/CommonController.java @@ -25,8 +25,6 @@ import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.HandlerMapping; import org.springframework.web.servlet.ModelAndView; -import javax.imageio.ImageIO; -import java.awt.image.BufferedImage; import java.io.*; import java.net.URLDecoder; import java.util.ArrayList; @@ -213,7 +211,7 @@ public class CommonController { @PostMapping(value = "/uploadAll") public Result uploadAll(HttpServletRequest request) throws Exception { Result result = new Result<>(); - String savePath = "123"; + String savePath = ""; String bizPath = ""; MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; @@ -223,19 +221,16 @@ public class CommonController { Map resultMap = extractExperimentFile(file); // 获取是否包含必填的文件类型 - //savePath = CommonUtils.upload(file, bizPath, uploadType); + savePath = CommonUtils.upload(file, bizPath, uploadType); OssFile ossFile = new OssFile(); ossFile.setFileName(file.getOriginalFilename()); ossFile.setUrl("测试路径.txt"); -// ossFile.setUrl(savePath); -// ossFileService.save(ossFile); + ossFile.setUrl(savePath); + ossFileService.save(ossFile); resultMap.put("file", ossFile); result.setResult(resultMap); - - - if (oConvertUtils.isNotEmpty(savePath)) { result.setMessage(savePath); result.setSuccess(true); @@ -286,10 +281,6 @@ public class CommonController { allFileResult.put("sylcjyd", "1"); } - if (fullText.toString().contains("试验流程检查单")){ - Map map = new HashMap<>(); - allFileResult.put("sylcjyd", "1"); - } }