fix:完善图片新增逻辑

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/controller/BulkOrderManagementController.java

@@ -6,10 +6,11 @@ import org.dromara.bulk.domain.bo.NewBulkOrderBo;
 import org.dromara.bulk.service.BulkOrderManagementService;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.web.core.BaseController;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.List;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 大货订单管理接口
@@ -27,19 +28,8 @@ class BulkOrderManagementController extends BaseController {
      */
     @SaIgnore
     @PostMapping()
-    public R<Void> insertBulkOrder(@RequestBody NewBulkOrderBo newBulkOrderBo){
+    public R<Void> insertBulkOrder(@Validated @RequestBody NewBulkOrderBo newBulkOrderBo){
         return toAjax(BulkOrderManagementService.insertBulkOrder(newBulkOrderBo));
     }
-
-    /**
-     * 上传图片
-     * @param imageList 图片列表
-     * @return 结果
-     */
-    @SaIgnore
-    @PostMapping("uploadImage")
-    public R<Void> uploadImage(@RequestParam("imageList") List<MultipartFile> imageList){
-        return toAjax(BulkOrderManagementService.uploadImage(imageList));
-    }
 }
 

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/domain/FlowerPattern.java

@@ -0,0 +1,47 @@
+package org.dromara.bulk.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 图片关联表基类
+ */
+@Data
+@TableName("fa_kuyou_flower_pattern")
+public class FlowerPattern {
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 图片地址
+     */
+    @TableField("image")
+    private String imageUrl;
+
+    /**
+     * 花型号id
+     */
+    @TableField("code")
+    private String OemId;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 用户订单id
+     */
+    private Long userOrderId;
+
+    /**
+     * 用户id
+     */
+    private Long userId;
+}

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/domain/bo/FlowerPatternBo.java

@@ -0,0 +1,54 @@
+package org.dromara.bulk.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.dromara.bulk.domain.FlowerPattern;
+
+import java.util.Date;
+
+/**
+ * 图片关联表Bo类
+ */
+@Data
+@NoArgsConstructor
+@AutoMapper(target = FlowerPattern.class, reverseConvertGenerate = false)
+public class FlowerPatternBo {
+
+    public FlowerPatternBo(String imageUrl, Date createTime, Long userOrderId, Long userId) {
+        this.imageUrl = imageUrl;
+        this.createTime = createTime;
+        this.userOrderId = userOrderId;
+        this.userId = userId;
+    }
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 图片地址
+     */
+    private String imageUrl;
+
+    /**
+     * 花型号id
+     */
+    private String OemId;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 用户订单id
+     */
+    private Long userOrderId;
+
+    /**
+     * 用户id
+     */
+    private Long userId;
+}

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/domain/vo/BulkOrderListVo.java

@@ -90,12 +90,12 @@ public class BulkOrderListVo extends BaseEntity {
     /**
     * 基本数量
     */
-    private double basicNmber;
+    private double basicNumber;
 
     /**
     * 基本份数
     */
-    private double basicFenNmber;
+    private double basicFenNumber;
 
     /**
     * 金额
@@ -160,7 +160,7 @@ public class BulkOrderListVo extends BaseEntity {
     /**
     * 工艺单价
     */
-    private double gongyiPrice;
+    private double craftPrice;
 
     /**
     * 款号
@@ -278,6 +278,11 @@ public class BulkOrderListVo extends BaseEntity {
     /**
      * 商品图片
      */
-    private String image;
+    private String imageUrl;
+
+    /**
+     * 状态
+     */
+    private int status;
 
 }

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/domain/vo/FlowerPatternVo.java

@@ -0,0 +1,45 @@
+package org.dromara.bulk.domain.vo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.bulk.domain.FlowerPattern;
+
+import java.util.Date;
+
+/**
+ * 图片关联表Vo类
+ */
+@Data
+@AutoMapper(target = FlowerPattern.class)
+public class FlowerPatternVo {
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 图片地址
+     */
+    private String imageUrl;
+
+    /**
+     * 花型号id
+     */
+    private String OemId;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 用户订单id
+     */
+    private Long userOrderId;
+
+    /**
+     * 用户id
+     */
+    private Long userId;
+}

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/mapper/FlowerPatternMapper.java

@@ -0,0 +1,10 @@
+package org.dromara.bulk.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.bulk.domain.FlowerPattern;
+import org.dromara.bulk.domain.vo.FlowerPatternVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+@Mapper
+public interface FlowerPatternMapper extends BaseMapperPlus<FlowerPattern, FlowerPatternVo> {
+}

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/mapstruct/NewBulkOrderMapstruct.java

@@ -13,6 +13,9 @@ import org.mapstruct.Mapping;
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * 新增生产订单映射
+ */
 @Mapper(componentModel = "spring")
 public interface NewBulkOrderMapstruct {
 
@@ -25,7 +28,7 @@ public interface NewBulkOrderMapstruct {
     @Mapping(target = "defaultUnit", constant = "5")
     @Mapping(target = "goodsTypeExtend1Id", source = "orderList.daHuoNumberName")
     @Mapping(target = "goodsTypeExtend4Id", source = "orderList.oemId")
-    @Mapping(target = "gongyiPrice", source = "orderList.craftPrice")
+    @Mapping(target = "craftPrice", source = "orderList.craftPrice")
     @Mapping(target = "duizhangStatus", constant = "0")
     BulkOrderList toBulkOrderList(NewBulkOrderBo newBulkOrderBo,
                                   OrderListBo orderList,

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/service/BulkOrderManagementService.java

@@ -1,15 +1,10 @@
 package org.dromara.bulk.service;
 
 import org.dromara.bulk.domain.bo.NewBulkOrderBo;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.List;
 
 public interface BulkOrderManagementService {
 
 //    TableDataInfo<BulkOrderListVo> selectPageVoList(BulkOrderListBo bulkOrderListBo, PageQuery pageQuery);
 
     int insertBulkOrder(NewBulkOrderBo newBulkOrderBo);
-
-    int uploadImage(List<MultipartFile> imageList);
 }

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/service/impl/BulkOrderManagementServiceImpl.java

@@ -2,17 +2,12 @@ package org.dromara.bulk.service.impl;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.dromara.bulk.domain.Attachment;
-import org.dromara.bulk.domain.BulkOrderList;
-import org.dromara.bulk.domain.UserOrder;
-import org.dromara.bulk.domain.UserOrderTemplate;
+import org.dromara.bulk.domain.*;
 import org.dromara.bulk.domain.bo.AttachmentBo;
+import org.dromara.bulk.domain.bo.FlowerPatternBo;
 import org.dromara.bulk.domain.bo.NewBulkOrderBo;
 import org.dromara.bulk.domain.bo.OrderListBo;
-import org.dromara.bulk.mapper.BulkOrderListMapper;
-import org.dromara.bulk.mapper.AttachmentMapper;
-import org.dromara.bulk.mapper.UserOrderMapper;
-import org.dromara.bulk.mapper.UserOrderTemplateMapper;
+import org.dromara.bulk.mapper.*;
 import org.dromara.bulk.mapstruct.NewBulkOrderMapstruct;
 import org.dromara.bulk.service.BulkOrderManagementService;
 import org.dromara.common.core.utils.MapstructUtils;
@@ -23,9 +18,7 @@ import org.dromara.system.domain.vo.SysOssVo;
 import org.dromara.system.service.impl.SysOssServiceImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -41,23 +34,11 @@ public class BulkOrderManagementServiceImpl implements BulkOrderManagementServic
     private final UserOrderMapper userOrderMapper;
     private final UserOrderTemplateMapper userOrderTemplateMapper;
     private final AttachmentMapper attachmentMapper;
+    private final FlowerPatternMapper flowerPatternMapper;
 
     private final NewBulkOrderMapstruct newBulkOrderMapstruct;
     private final SysOssServiceImpl sysOssService;
 
-    private List<MultipartFile> imageList;
-
-    /**
-     * 单独上传图片的处理
-     * @param inputImageList 图片列表
-     * @return 结果
-     */
-    @Override
-    public int uploadImage(List<MultipartFile> inputImageList) {
-        imageList = inputImageList;
-        return imageList == null ? 0 : 1;
-    }
-
     /**
      * 新增生产订单
      *
@@ -68,16 +49,9 @@ public class BulkOrderManagementServiceImpl implements BulkOrderManagementServic
     @Transactional(rollbackFor = Exception.class)
     public int insertBulkOrder(NewBulkOrderBo newBulkOrderBo) {
         try {
-            //保存上传的图片
-            List<SysOssVo> ossList = new ArrayList<>();
-            for (MultipartFile image : imageList) {
-                ossList.add(sysOssService.upload(image));
-            }
             //批量处理新增生产订单
             OrderNumberGenerator orderNumberGenerator = OrderNumberGenerator.getInstance();
-            for (int i = 0; i < newBulkOrderBo.getOrderLists().size(); i++) {
-                OrderListBo orderList = newBulkOrderBo.getOrderLists().get(i);
-                SysOssVo sysOssVo = ossList.get(i);
+            for (OrderListBo orderList : newBulkOrderBo.getOrderLists()) {
                 // 生成单号
                 String sysNo = orderNumberGenerator.generateOrderNumber("SYS");
                 String purchaseCode = orderNumberGenerator.generateOrderNumber("SC");
@@ -125,17 +99,29 @@ public class BulkOrderManagementServiceImpl implements BulkOrderManagementServic
                     userOrderTemplateMapper.insert(templates);
                 }
 
-                // 处理图片关联性
-                attachmentMapper.insert(MapstructUtils.convert(new AttachmentBo(
-                    "image",
-                    newBulkOrderBo.getUserId(),
-                    sysOssVo.getUrl(),
-                    sysOssVo.getFileSuffix(),
-                    sysOssVo.getFileName(),
-                    newBulkOrderBo.getCreateTime(),
-                    newBulkOrderBo.getUpdateTime(),
-                    sysOssVo.getCreateTime(),
-                    sysOssVo.getOssId().toString()), Attachment.class));
+                if (orderList.getOssId() != null) {
+                    SysOssVo sysOssVo =  sysOssService.getById(orderList.getOssId());
+                    // 处理图片关联性
+                    attachmentMapper.insert(MapstructUtils.convert(new AttachmentBo(
+                        "image",
+                        newBulkOrderBo.getUserId(),
+                        sysOssVo.getUrl(),
+                        sysOssVo.getFileSuffix(),
+                        sysOssVo.getFileName(),
+                        "image/" + sysOssVo.getFileSuffix(),
+                        sysOssVo.getCreateTime(),
+                        newBulkOrderBo.getUpdateTime(),
+                        newBulkOrderBo.getCreateTime()
+                        ), Attachment.class)
+                    );
+                    flowerPatternMapper.insert(MapstructUtils.convert(new FlowerPatternBo(
+                        sysOssVo.getUrl(),
+                        sysOssVo.getCreateTime(),
+                        userOrder.getId(),
+                        newBulkOrderBo.getUserId()
+                        ), FlowerPattern.class)
+                    );
+                }
             }
             return 1;
         } catch (Exception e) {

ruoyi-modules/ruoyi-bulkOrder/src/main/resources/mapper/FlowerPatternMapper.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.bulk.mapper.FlowerPatternMapper">
+</mapper>