diff --git a/bootstrap/src/main/java/com/electromagnetic/industry/software/data/manage/controller/EDDataController.java b/bootstrap/src/main/java/com/electromagnetic/industry/software/data/manage/controller/EDDataController.java index 82c82d1..9bd6750 100644 --- a/bootstrap/src/main/java/com/electromagnetic/industry/software/data/manage/controller/EDDataController.java +++ b/bootstrap/src/main/java/com/electromagnetic/industry/software/data/manage/controller/EDDataController.java @@ -5,10 +5,8 @@ import com.electromagnetic.industry.software.data.manage.request.indicator.EDDat import electromagnetic.data.framework.share.model.ElectromagneticResult; import electromagnetic.data.framework.share.model.ElectromagneticResultUtil; import io.swagger.annotations.ApiOperation; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; @@ -42,8 +40,11 @@ public class EDDataController { @ApiOperation(value = "上传",notes = "") @RequestMapping(value = "/upload", consumes = "multipart/form-data",method = RequestMethod.POST) - public ElectromagneticResult upload(@RequestBody EDDataRequest request){ - return edDataFacade.upload(request); + public ElectromagneticResult upload(@RequestParam("file") MultipartFile file, + @RequestParam("parentId") String parentId){ + System.out.println(parentId); +// return edDataFacade.upload(request); + return null; }