diff --git a/web/src/main/java/com/dite/znpt/web/controller/CommonController.java b/web/src/main/java/com/dite/znpt/web/controller/CommonController.java index 1edc6e8..75f14fe 100644 --- a/web/src/main/java/com/dite/znpt/web/controller/CommonController.java +++ b/web/src/main/java/com/dite/znpt/web/controller/CommonController.java @@ -105,7 +105,7 @@ public class CommonController { return Result.ok(GenderEnum.listAll()); } - @ApiOperation(value = "上传图片", httpMethod = "POST") + @ApiOperation(value = "上传图片-遥控器app使用,已废弃", httpMethod = "POST") @PostMapping("/upload-image/{imageSource}") public Result uploadImage(@PathVariable String imageSource, ImageWorkReq workReq, MultipartFile file) throws IOException { if(null == file){ @@ -114,7 +114,7 @@ public class CommonController { return Result.ok(imageService.batchUploadCommonImage(imageSource, workReq, new MultipartFile[]{file}).get(0)); } - @ApiOperation(value = "批量上传图片", httpMethod = "POST") + @ApiOperation(value = "批量上传图片-遥控器app使用,已废弃", httpMethod = "POST") @PostMapping("/batch-upload-image/{imageSource}") public Result batchUploadImage(@PathVariable String imageSource, ImageWorkReq workReq, @RequestParam("file") MultipartFile[] files) throws IOException { diff --git a/web/src/main/java/com/dite/znpt/web/controller/ImageController.java b/web/src/main/java/com/dite/znpt/web/controller/ImageController.java index 9ee105b..002a073 100644 --- a/web/src/main/java/com/dite/znpt/web/controller/ImageController.java +++ b/web/src/main/java/com/dite/znpt/web/controller/ImageController.java @@ -57,9 +57,9 @@ public class ImageController { @ApiOperation(value = "上传图像", httpMethod = "POST") @PostMapping("/{imageSource}/upload/{partId}") - public Result uploadOutWork(@PathVariable String imageSource, @PathVariable String partId, ImageCollectReq collectReq, @RequestParam("file") MultipartFile file) { + public Result uploadOutWork(@PathVariable String imageSource, @PathVariable String partId, ImageCollectReq collectReq, @RequestParam("file") MultipartFile file) { MultipartFile[] files = {file}; - return Result.ok(imageService.batchUploadDefectImage(partId, imageSource, collectReq, files).get(0).getImagePath()); + return Result.ok(imageService.batchUploadDefectImage(partId, imageSource, collectReq, files).get(0)); } @ApiOperation(value = "设置信息", httpMethod = "POST") @@ -76,13 +76,13 @@ public class ImageController { return Result.ok(); } - @ApiOperation(value = "获取APP上传的图片列表", httpMethod = "GET") + @ApiOperation(value = "获取APP上传的图片列表-废弃", httpMethod = "GET") @GetMapping("/list/app-upload-images") public Result> listAppUploadImages() throws IOException { return Result.ok(imageService.listAppUploadImages()); } - @ApiOperation(value = "关联APP上传图片到机组", httpMethod = "POST") + @ApiOperation(value = "关联APP上传图片到机组-废弃", httpMethod = "POST") @PostMapping("/linkAppImagesToPart") public Result linkAppImagesToPart(@RequestBody AppImageToPartReq partReq) { imageService.linkAppImagesToPart(partReq);