企业物料库bug修改

src/main/java/com/uas/ps/product/controller/ProductController.java

@@ -105,6 +105,8 @@ public class ProductController {
             if (org.apache.commons.collections.CollectionUtils.isEmpty(products)) {
                 Product product1 = productService.save(product);
                 resultProducts.add(product1.getId());
+            } else {
+                resultProducts.add(products.get(0).getId());
             }
         }
 //        logger.log("更新物料", "[" + productInfo.getUserUU() + "]更新了id为" + productInfo.getId() + "的["

src/main/java/com/uas/ps/product/controller/ProductUsersController.java

@@ -6,21 +6,20 @@ import com.uas.ps.entity.Product;
 import com.uas.ps.entity.ProductUsers;
 import com.uas.ps.product.entity.FileUpload;
 import com.uas.ps.product.exception.IllegalOperatorException;
+import com.uas.ps.product.service.ProductService;
 import com.uas.ps.product.service.ProductUsersService;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -35,6 +34,9 @@ public class ProductUsersController {
     @Autowired
     private ProductUsersService productUsersService;
 
+    @Autowired
+    private ProductService productService;
+
     /**
      * 保存用户个人物料信息
      *
@@ -52,6 +54,30 @@ public class ProductUsersController {
         return map;
     }
 
+    /**
+     * 批量导入个人物料信息（包括绑定至个人）
+     *
+     * @param data 用户个人物料信息
+     * @return
+     */
+    @RequestMapping(value = "/saveBatch", method = RequestMethod.POST)
+    public List<Long> saveProductUsersBatch(@RequestBody String data) throws UnsupportedEncodingException {
+        String json = URLDecoder.decode(data, "utf-8");
+        List<Product> productInfo = JSONObject.parseArray(URLDecoder.decode(data, "utf-8"), Product.class);
+        List<Long> resultProducts = new ArrayList<>();
+
+        for (Product product : productInfo) {
+            List<Product> products = productService.findByEnUUAndCmpCodeAndBrand(product.getEnUU(),product.getCmpCode(),product.getBrand());
+            if (org.apache.commons.collections.CollectionUtils.isEmpty(products)) {
+                Product product1 = productService.save(product);
+                resultProducts.add(product1.getId());
+            }
+        }
+//        logger.log("更新物料", "[" + productInfo.getUserUU() + "]更新了id为" + productInfo.getId() + "的["
+//                + productInfo.getTitle() + "]");
+        return resultProducts;
+    }
+
     /**
      * 通过excel批量导入个人物料
      *