From 00310b8b5bf002f0135ba0b60715b17e5a3da31f Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 13 六月 2024 18:02:39 +0800
Subject: [PATCH] 小功能调整
---
cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java | 59 +++++++++++++++++++++++++++++++++++------------------------
1 files changed, 35 insertions(+), 24 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java
index fe1dd1b..0bcb4ac 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java
@@ -8,6 +8,7 @@
import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.dto.PageTestObjectDto;
+import com.yuanchu.mom.exception.ErrorException;
import com.yuanchu.mom.pojo.*;
import com.yuanchu.mom.service.*;
import com.yuanchu.mom.utils.JackSonUtil;
@@ -172,8 +173,8 @@
List<StructureItemParameter> lists = new ArrayList<>();
AtomicReference<String> sample = new AtomicReference<>();
ExcelUtil.readBySax(inputStream, 0, (i, l, list1) -> {
- if(i == 0 && l == 1){
- sample.set(list1.get(1)+"");
+ if (i == 0 && l == 1) {
+ sample.set(list1.get(1) + "");
}
if (i == 0 && l >= 1) {
StructureItemParameter str = new StructureItemParameter();
@@ -183,26 +184,28 @@
String brand = (String) list1.get(1);
StringBuilder builder = new StringBuilder();
builder.append("[");
- if (ObjectUtil.isNotEmpty(list1.get(2))){
+ if (ObjectUtil.isNotEmpty(list1.get(2))) {
String production = (String) list1.get(2);
- if (!production.contains("銆�")){
- builder.append(String.format("[\"%s\",\"%s\"]",brand,production));
- }else{
- Arrays.stream(production.split("銆�")).forEach(item->{
- builder.append(String.format("[\"%s\",\"%s\"],",brand,item));
+ if (!production.contains("銆�")) {
+ builder.append(String.format("[\"%s\",\"%s\"]", brand, production));
+ } else {
+ Arrays.stream(production.split("銆�")).forEach(item -> {
+ builder.append(String.format("[\"%s\",\"%s\"],", brand, item));
});
builder.deleteCharAt(builder.length() - 1);
}
- }else{
+ } else {
builder.append("[");
- builder.append(String.format("\"%s\"",brand));
+ builder.append(String.format("\"%s\"", brand));
builder.append("]");
}
builder.append("]");
str.setSample(builder.toString());
}
str.setInspectionItem(list1.get(4).toString());
- str.setInspectionItemEn(list1.get(5).toString());
+ if (list1.get(5) != null) {
+ str.setInspectionItemEn(list1.get(5).toString());
+ }
if (list1.get(6) == null) {
str.setInspectionItemSubclass(null);
} else {
@@ -214,20 +217,28 @@
str.setInspectionItemSubclassEn(String.valueOf(list1.get(7).toString()));
}
StructureItemParameter db_str;
- if (StringUtils.isEmpty(str.getInspectionItemSubclass())){
+ if (StringUtils.isEmpty(str.getInspectionItemSubclass())) {
// 姣旇緝涓や釜鏉′欢
- db_str = structureItemParameterService.getOne(Wrappers.lambdaQuery(StructureItemParameter.class)
- .eq(StructureItemParameter::getInspectionItem, str.getInspectionItem())
- .eq(StructureItemParameter::getSample, str.getSample())
- );
- }else{
- db_str = structureItemParameterService.getOne(Wrappers.lambdaQuery(StructureItemParameter.class)
- .eq(StructureItemParameter::getInspectionItem, str.getInspectionItem())
- .eq(StructureItemParameter::getSample, str.getSample())
- .eq(StructureItemParameter::getInspectionItemSubclass,str.getInspectionItemSubclass())
- );
+ try {
+ db_str = structureItemParameterService.getOne(Wrappers.lambdaQuery(StructureItemParameter.class)
+ .eq(StructureItemParameter::getInspectionItem, str.getInspectionItem())
+ .eq(StructureItemParameter::getSample, str.getSample())
+ );
+ } catch (Exception e) {
+ throw new ErrorException("閲嶅鏌ヨ锛�" + str.getInspectionItem());
+ }
+ } else {
+ try {
+ db_str = structureItemParameterService.getOne(Wrappers.lambdaQuery(StructureItemParameter.class)
+ .eq(StructureItemParameter::getInspectionItem, str.getInspectionItem())
+ .eq(StructureItemParameter::getSample, str.getSample())
+ .eq(StructureItemParameter::getInspectionItemSubclass, str.getInspectionItemSubclass())
+ );
+ } catch (Exception e) {
+ throw new ErrorException("閲嶅鏌ヨ锛�" + str.getInspectionItem() + " " + str.getInspectionItemSubclass());
+ }
}
- if (ObjectUtils.isNotEmpty(db_str)){
+ if (ObjectUtils.isNotEmpty(db_str)) {
str.setId(db_str.getId());
}
if (list1.get(8) == null) {
@@ -299,7 +310,7 @@
}
str.setInspectionItemType(jy);
String validateValueType = list1.get(18).toString();
- if (StringUtils.isNotBlank(validateValueType)){
+ if (StringUtils.isNotBlank(validateValueType)) {
Enums enums = enumService.getOne(Wrappers.lambdaQuery(Enums.class)
.eq(Enums::getCategory, "妫�楠屽�肩被鍨�")
.eq(Enums::getLabel, validateValueType));
--
Gitblit v1.9.3