|
|
@@ -220,17 +220,22 @@ public class OrderImageController {
|
|
|
@RequestMapping(value = "/uploadFileForOrder")
|
|
|
@ResponseBody
|
|
|
public Result uploadFile(HttpServletRequest request, String storeId, String orderId, String userId, String typeFlag) {
|
|
|
+
|
|
|
+
|
|
|
CommonsMultipartResolver multipartResolver = new CommonsMultipartResolver(request.getSession().getServletContext());
|
|
|
if (multipartResolver.isMultipart(request)) {
|
|
|
MultipartHttpServletRequest multiRequest = (MultipartHttpServletRequest) request;
|
|
|
Iterator it = multiRequest.getFileNames();
|
|
|
- List<ImageUploadLog> paths = new ArrayList<>();
|
|
|
+ List<OrderImage> paths = new ArrayList<>();
|
|
|
while (it.hasNext()) {
|
|
|
MultipartFile file = multiRequest.getFile(it.next().toString());
|
|
|
if (file != null) {
|
|
|
try {
|
|
|
String originalFilename = file.getOriginalFilename();
|
|
|
|
|
|
+
|
|
|
+ String fileType = originalFilename.split("[.]")[originalFilename.split("[.]").length - 1];
|
|
|
+
|
|
|
long srcSize = file.getSize();
|
|
|
|
|
|
|
|
|
@@ -257,7 +262,7 @@ public class OrderImageController {
|
|
|
|
|
|
String min = OSSFileService.upload(ImagesUtil.changeMinPhoto(
|
|
|
file.getInputStream(),
|
|
|
- originalFilename.split("[.]")[1],
|
|
|
+ fileType,
|
|
|
2000, 1), minPath);
|
|
|
|
|
|
imageUploadLog.setUrl(min);
|
|
|
@@ -265,8 +270,54 @@ public class OrderImageController {
|
|
|
|
|
|
imageUploadLogService.createImageUploadLog(imageUploadLog);
|
|
|
|
|
|
+ OrderImage orderImage = new OrderImage();
|
|
|
+ orderImage.setOrderId(orderId);
|
|
|
+ orderImage.setImageName(originalFilename);
|
|
|
+ orderImage = orderImageService.getOrderImage(orderImage);
|
|
|
+
|
|
|
+ if (orderImage != null) {
|
|
|
+
|
|
|
+ orderImage.setImageName(originalFilename);
|
|
|
+
|
|
|
+ if ("original".equals(typeFlag)) {
|
|
|
+ orderImage.setOriginalSize(imageUploadLog.getImageSize());
|
|
|
+ orderImage.setOriginalImage(imageUploadLog.getUrl());
|
|
|
+ orderImage.setOriginalArtwork(imageUploadLog.getArtworkUrl());
|
|
|
+
|
|
|
+ } else if ("finished".equals(typeFlag)) {
|
|
|
+
|
|
|
+ if (orderImage.getStatusFlag() != 1) {
|
|
|
+ orderImage.setStatusFlag(0);
|
|
|
+ }
|
|
|
+
|
|
|
+ orderImage.setFinishedSize(imageUploadLog.getImageSize());
|
|
|
+ orderImage.setFinishedImage(imageUploadLog.getUrl());
|
|
|
+ orderImage.setFinishedArtwork(imageUploadLog.getArtworkUrl());
|
|
|
+ }
|
|
|
+
|
|
|
+ orderImageService.updateOrderImage(orderImage);
|
|
|
+
|
|
|
+ } else {
|
|
|
+ if ("original".equals(typeFlag)) {
|
|
|
+ orderImage = new OrderImage();
|
|
|
+
|
|
|
+ orderImage.setOrderId(orderId);
|
|
|
+ orderImage.setUserId(userId);
|
|
|
+ orderImage.setStoreId(storeId);
|
|
|
+ orderImage.setImageName(originalFilename);
|
|
|
+
|
|
|
+
|
|
|
+ orderImage.setOriginalSize(imageUploadLog.getImageSize());
|
|
|
+ orderImage.setOriginalImage(imageUploadLog.getUrl());
|
|
|
+ orderImage.setOriginalArtwork(imageUploadLog.getArtworkUrl());
|
|
|
+
|
|
|
+
|
|
|
+ orderImageService.createOrderImage(orderImage);
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
|
|
|
- paths.add(imageUploadLog);
|
|
|
+ paths.add(orderImage);
|
|
|
} catch (IOException e) {
|
|
|
logger.error("上传订单图片失败", e);
|
|
|
return new Result(false, "上传失败");
|