From 78f15dcd2a106edef3cb43b01242db710a71cff6 Mon Sep 17 00:00:00 2001
From: "HUOJIN\\92525" <925258474@qq.com>
Date: Wed, 18 Sep 2024 10:50:16 +0800
Subject: [PATCH] no message

---
 .../basicdata/rest/ItemController.java        |  2 +-
 .../service/impl/ItemServiceImpl.java         | 19 +++++++++----------
 .../youchain/utils/BatchCreateOrUpdate.java   |  4 +---
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/youchain-system/src/main/java/com/youchain/basicdata/rest/ItemController.java b/youchain-system/src/main/java/com/youchain/basicdata/rest/ItemController.java
index d0dbf50..4b1d686 100644
--- a/youchain-system/src/main/java/com/youchain/basicdata/rest/ItemController.java
+++ b/youchain-system/src/main/java/com/youchain/basicdata/rest/ItemController.java
@@ -32,6 +32,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import io.swagger.annotations.*;
 import org.springframework.web.multipart.MultipartFile;
+
 import java.io.IOException;
 import java.util.*;
 import javax.servlet.http.HttpServletResponse;
@@ -87,7 +88,6 @@ public class ItemController {
     @ApiOperation("导入物料")
     @PreAuthorize("@el.check('point:importPoint')")
     public ResponseEntity<Object> importItem(@RequestParam("file") MultipartFile multipartFile) {
-        //编码、名称、物料类型
         try {
             String result = itemService.impoertItem(multipartFile);
             return successRequest(result);
diff --git a/youchain-system/src/main/java/com/youchain/basicdata/service/impl/ItemServiceImpl.java b/youchain-system/src/main/java/com/youchain/basicdata/service/impl/ItemServiceImpl.java
index 9bec814..32e272d 100644
--- a/youchain-system/src/main/java/com/youchain/basicdata/service/impl/ItemServiceImpl.java
+++ b/youchain-system/src/main/java/com/youchain/basicdata/service/impl/ItemServiceImpl.java
@@ -187,7 +187,6 @@ public class ItemServiceImpl implements ItemService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String impoertItem(MultipartFile multipartFile) {
-        //编码、名称、物料类型
         FileUtil.checkSize(properties.getMaxSize(), multipartFile.getSize());
         String suffix = FileUtil.getExtensionName(multipartFile.getOriginalFilename());
         String type = FileUtil.getFileType(suffix);
@@ -237,20 +236,20 @@ public class ItemServiceImpl implements ItemService {
 
     private Item updateItems(Item item, Dept dept, Map<String, Object> record) {
         item.setDept(dept);
-        item.setName(record.get("名称").toString().trim());
-        item.setExtendD1(record.get("单台用量") == null ? 0 : Double.parseDouble(record.get("单台用量").toString()));
-        item.setUnit(record.get("单位").toString().trim());
-        item.setGoodType(record.get("物料类型") == null ? "" : record.get("物料类型").toString().trim());
+        item.setName(Optional.ofNullable(record.get("名称")).map(Object::toString).map(String::trim).orElse(null));
+        item.setExtendD1(Optional.ofNullable(record.get("单台用量")).map(Object::toString).map(Double::parseDouble).orElse(0.0));
+        item.setUnit(Optional.ofNullable(record.get("单位")).map(Object::toString).map(String::trim).orElse(null));
+        item.setGoodType(Optional.ofNullable(record.get("物料类型")).map(Object::toString).map(String::trim).orElse(null));
         return item;
     }
 
     private Item createItem(Dept dept, Map<String, Object> record) {
         Item item = new Item();
-        item.setCode(record.get("编码").toString().trim());
-        item.setName(record.get("名称").toString().trim());
-        item.setExtendD1(record.get("单台用量") == null ? 0 : Double.parseDouble(record.get("单台用量").toString()));
-        item.setUnit(record.get("单位").toString().trim());
-        item.setGoodType(record.get("物料类型") == null ? "" : record.get("物料类型").toString().trim());
+        item.setCode(Optional.ofNullable(record.get("编码")).map(Object::toString).map(String::trim).orElse(null));
+        item.setName(Optional.ofNullable(record.get("名称")).map(Object::toString).map(String::trim).orElse(null));
+        item.setExtendD1(Optional.ofNullable(record.get("单台用量")).map(Object::toString).map(Double::parseDouble).orElse(0.0));
+        item.setUnit(Optional.ofNullable(record.get("单位")).map(Object::toString).map(String::trim).orElse(null));
+        item.setGoodType(Optional.ofNullable(record.get("物料类型")).map(Object::toString).map(String::trim).orElse(null));
         item.setDept(dept);
         item.setEnabled(true);
         return item;
diff --git a/youchain-system/src/main/java/com/youchain/utils/BatchCreateOrUpdate.java b/youchain-system/src/main/java/com/youchain/utils/BatchCreateOrUpdate.java
index df71370..df13990 100644
--- a/youchain-system/src/main/java/com/youchain/utils/BatchCreateOrUpdate.java
+++ b/youchain-system/src/main/java/com/youchain/utils/BatchCreateOrUpdate.java
@@ -16,9 +16,7 @@ public class BatchCreateOrUpdate {
     @PersistenceContext
     private EntityManager entityManager;
 
-    //配置文件中每次批量提交的数量
-    @Value("${spring.jpa.properties.hibernate.jdbc.batch_size}")
-    private int batchSize;
+    private int batchSize=100;
 
     /**
      * 批量插入