no message

main
HUOJIN\92525 2024-09-18 10:50:16 +08:00
parent db602f669f
commit 78f15dcd2a
3 changed files with 11 additions and 14 deletions

View File

@ -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);

View File

@ -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;

View File

@ -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;
/**
*