From 11af23e0c7976eed1211ba2ca0beae3a12e19310 Mon Sep 17 00:00:00 2001
From: lxp <1928192722@qq.com>
Date: 星期三, 12 三月 2025 15:37:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
basic-server/src/main/java/com/ruoyi/basic/controller/CapacityScopeController.java | 179 ++++++++++++++++++++++++++++-------------------------------
1 files changed, 84 insertions(+), 95 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/controller/CapacityScopeController.java b/basic-server/src/main/java/com/ruoyi/basic/controller/CapacityScopeController.java
index 810c430..a567c11 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/controller/CapacityScopeController.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/controller/CapacityScopeController.java
@@ -3,12 +3,10 @@
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.poi.excel.ExcelUtil;
import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.util.StringUtils;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.common.core.domain.Result;
-import com.ruoyi.common.core.domain.entity.SysDictData;
-import com.ruoyi.system.service.ISysDictTypeService;
import com.ruoyi.basic.dto.PageTestObjectDto;
import com.ruoyi.basic.dto.ProductDTO1;
import com.ruoyi.basic.excel.StructureTestObjectData;
@@ -21,6 +19,10 @@
import com.ruoyi.basic.service.ProductService;
import com.ruoyi.basic.service.StandardTemplateService;
import com.ruoyi.basic.service.StructureItemParameterService;
+import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.core.domain.entity.SysDictData;
+import com.ruoyi.framework.exception.ErrorException;
+import com.ruoyi.system.service.ISysDictTypeService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
@@ -60,8 +62,8 @@
private StandardTemplateService standardTemplateService;
@ApiOperation(value = "鑾峰彇椤圭洰妫�楠屽弬鏁板垪琛�")
- @PostMapping("/selectItemParameterList")
- public Result selectItemParameterList(Page page,StructureItemParameter itemParameter) throws Exception {
+ @GetMapping("/selectItemParameterList")
+ public Result selectItemParameterList(Page page, StructureItemParameter itemParameter) throws Exception {
return Result.success(capacityScopeService.selectItemParameterList(page, itemParameter));
}
@@ -72,7 +74,7 @@
}
@ApiOperation(value = "鍒犻櫎椤圭洰妫�楠屽弬鏁�")
- @PostMapping("/delItemParameter")
+ @DeleteMapping("/delItemParameter")
public Result<?> delItemParameter(Integer id) {
return Result.success(capacityScopeService.delItemParameter(id));
}
@@ -84,8 +86,8 @@
}
@ApiOperation(value = "鑾峰彇妫�楠屽璞�")
- @PostMapping("/selectTestObjectList")
- public Result selectTestObjectList(Page page,PageTestObjectDto pageTestObjectDto) throws Exception {
+ @GetMapping("/selectTestObjectList")
+ public Result selectTestObjectList(Page page, PageTestObjectDto pageTestObjectDto) throws Exception {
return Result.success(capacityScopeService.selectTestObjectList(page, pageTestObjectDto));
}
@@ -96,7 +98,7 @@
}
@ApiOperation(value = "鍒犻櫎妫�楠屽璞�")
- @PostMapping("/delTestObject")
+ @DeleteMapping("/delTestObject")
public Result<?> delTestObject(Integer id) {
return Result.success(capacityScopeService.delTestObject(id));
}
@@ -113,15 +115,27 @@
return Result.success(capacityScopeService.selectTestObjectByName());
}
+ @ApiOperation(value = "鑾峰彇妫�楠岄」鍜屽瓙椤�")
+ @GetMapping("/selectTestInspectionItem")
+ public Result selectTestObjectInspectionItem(String specimenName) {
+ return Result.success(structureItemParameterService.selectTestObjectInspectionItem(specimenName));
+ }
+
+ @ApiOperation(value = "鑾峰彇妫�楠岄」鍜屽瓙椤�")
+ @GetMapping("/selectTestInspectionItemSub")
+ public Result selectTestInspectionItemSub(String inspectionItemSubclass) {
+ return Result.success(structureItemParameterService.selectTestInspectionItemSub(inspectionItemSubclass));
+ }
+
@ApiOperation(value = "璁惧閲岄潰閫夋嫨妫�楠岄」鐩�(鏍戝舰缁撴瀯)")
- @PostMapping("/getInsProduction")
+ @GetMapping("/getInsProduction")
public Result getInsProduction() {
return Result.success(capacityScopeService.getInsProduction());
}
@ApiOperation(value = "缁存姢妫�楠屽璞＄殑浜у搧")
- @PostMapping("/selectProductListByObjectId")
- public Result selectProductListByObjectId(Page page,ProductDTO1 productDTO) throws Exception {
+ @GetMapping("/selectProductListByObjectId")
+ public Result selectProductListByObjectId(Page page, ProductDTO1 productDTO) throws Exception {
return Result.success(productService.selectProductListByObjectId(page, productDTO));
}
@@ -138,7 +152,7 @@
}
@ApiOperation(value = "鍒犻櫎浜у搧")
- @PostMapping("/delProduct")
+ @DeleteMapping("/delProduct")
public Result delProduct(Integer id) {
return Result.success(productService.delProduct(id));
}
@@ -149,11 +163,9 @@
return Result.success(capacityScopeService.getItemTree());
}
-
- @ApiOperation(value = "瑁呭瀵煎叆妫�楠岄」鐩�")
- @PostMapping("/importEquipData")
- @Transactional
- public Result importEquipData(@RequestParam("file") MultipartFile file) throws Exception {
+ @ApiOperation(value = "瀵煎叆妫�楠岄」鐩�")
+ @PostMapping("/importData")
+ public Result importData(@RequestParam("file") MultipartFile file) throws Exception {
InputStream inputStream = file.getInputStream();
List<StructureItemParameter> lists = new ArrayList<>();
AtomicReference<String> sample = new AtomicReference<>();
@@ -163,20 +175,18 @@
}
if (l >= 1) {
StructureItemParameter str = new StructureItemParameter();
- // 娴嬭瘯瀵硅薄
if (list1.get(1) == null) {
str.setSample(null);
} else {
String brand = (String) list1.get(1);
StringBuilder builder = new StringBuilder();
builder.append("[");
- // 浜у搧
if (ObjectUtil.isNotEmpty(list1.get(2))) {
String production = (String) list1.get(2);
- if (!production.contains("锛�")) {
+ if (!production.contains("銆�")) {
builder.append(String.format("[\"%s\",\"%s\"]", brand, production));
} else {
- Arrays.stream(production.split("锛�")).forEach(item -> {
+ Arrays.stream(production.split("銆�")).forEach(item -> {
builder.append(String.format("[\"%s\",\"%s\"],", brand, item));
});
builder.deleteCharAt(builder.length() - 1);
@@ -189,63 +199,54 @@
builder.append("]");
str.setSample(builder.toString());
}
- // 妫�楠岄」
- str.setInspectionItem(list1.get(4).toString().trim());
- // 妫�楠岄」鑻辨枃
+ str.setInspectionItem(list1.get(4).toString());
if (list1.get(5) != null) {
str.setInspectionItemEn(list1.get(5).toString());
}
- // 妫�楠屽瓙椤�
if (list1.get(6) == null) {
str.setInspectionItemSubclass(null);
} else {
- str.setInspectionItemSubclass(list1.get(6).toString().trim());
+ str.setInspectionItemSubclass(list1.get(6).toString());
}
- // 妫�楠屽瓙椤硅嫳鏂�
if (list1.get(7) == null) {
str.setInspectionItemSubclassEn(null);
} else {
str.setInspectionItemSubclassEn(String.valueOf(list1.get(7).toString()));
}
- // 妫�楠岄」鍒嗙被
- if (list1.get(22) != null && list1.get(22) != "") {
- str.setInspectionItemClass(list1.get(22).toString().trim());
+ StructureItemParameter db_str;
+ if (StringUtils.isEmpty(str.getInspectionItemSubclass())) {
+ // 姣旇緝涓や釜鏉′欢
+ try {
+ db_str = structureItemParameterService.getOne(Wrappers.lambdaQuery(StructureItemParameter.class)
+ .eq(StructureItemParameter::getInspectionItem, str.getInspectionItem())
+ .eq(StructureItemParameter::getSample, str.getSample())
+ .last("limit 1")
+ );
+ } catch (Exception e) {
+ throw new ErrorException("閲嶅鏌ヨ锛�" + str.getInspectionItem());
+ }
} else {
- str.setInspectionItemClass(null);
+ try {
+ db_str = structureItemParameterService.getOne(Wrappers.lambdaQuery(StructureItemParameter.class)
+ .eq(StructureItemParameter::getInspectionItem, str.getInspectionItem())
+ .eq(StructureItemParameter::getSample, str.getSample())
+ .eq(StructureItemParameter::getInspectionItemSubclass, str.getInspectionItemSubclass())
+ .last("limit 1")
+ );
+ } catch (Exception e) {
+ throw new ErrorException("閲嶅鏌ヨ锛�" + str.getInspectionItem() + " " + str.getInspectionItemSubclass());
+ }
}
- // 妫�楠岄」鍒嗙被鑻辨枃
- if (list1.get(23) != null && list1.get(23) != "") {
- str.setInspectionItemClassEn(list1.get(23) + "");
- } else {
- str.setInspectionItemClassEn(null);
- }
-
- LambdaQueryWrapper<StructureItemParameter> wrapper = Wrappers.lambdaQuery(StructureItemParameter.class)
- .eq(StructureItemParameter::getInspectionItem, str.getInspectionItem())
- .eq(StructureItemParameter::getSample, str.getSample())
-
- .last("limit 1");
- // 鍒ゆ柇鏄惁鏈夋楠岄」绫诲瀷
- if (ObjectUtils.isNotEmpty(str.getInspectionItemClass())) {
- wrapper.eq(StructureItemParameter::getInspectionItemClass, str.getInspectionItemClass());
- }
-
- // 鍒ゆ柇鏄惁鏈夋楠屽瓙椤�
- if (ObjectUtils.isNotEmpty(str.getInspectionItemSubclass())) {
- wrapper.eq(StructureItemParameter::getInspectionItemSubclass, str.getInspectionItemSubclass());
- }
- StructureItemParameter db_str = structureItemParameterService.getOne(wrapper);
if (ObjectUtils.isNotEmpty(db_str)) {
str.setId(db_str.getId());
}
- // 鏂规硶鍚嶇О
if (list1.get(8) == null) {
str.setMethod(null);
} else {
StringBuffer buffer = new StringBuffer();
String input = list1.get(8).toString();
buffer.append("[");
- String[] values = input.split("锛�");
+ String[] values = input.split("銆�");
for (String value : values) {
buffer.append("\"").append(value.trim()).append("\",");
}
@@ -253,55 +254,53 @@
buffer.append("]");
str.setMethod(buffer.toString());
}
- // 璇曢獙瀹�
+
if (list1.get(9) == null) {
str.setSonLaboratory(null);
} else {
str.setSonLaboratory(list1.get(9).toString());
}
- // 璁￠噺鍗曚綅
if (list1.get(10) == null) {
str.setUnit(null);
} else {
str.setUnit(list1.get(10).toString());
}
- // 瑕佹眰鍊�
+
if (list1.get(11) == null) {
str.setAskTell(null);
} else {
str.setAskTell(list1.get(11).toString());
}
- // 瑕佹眰鎻忚堪
+
if (list1.get(12) == null) {
str.setAsk(null);
} else {
str.setAsk(list1.get(12).toString());
}
- // 鍗曚环
+
if (list1.get(13) == null) {
str.setPrice(null);
} else {
str.setPrice(list1.get(13) + "");
}
- // 宸ユ椂绯绘暟
+
if (list1.get(14) == null) {
str.setManHour(null);
} else {
str.setManHour(Double.valueOf(list1.get(14).toString()));
}
- // 宸ユ椂鍒嗙粍
+
if (list1.get(15) == null) {
str.setManHourGroup(null);
} else {
str.setManHourGroup(list1.get(15).toString());
}
- // 棰勮瀹屾垚鏃堕棿
+
if (list1.get(16) == null) {
str.setManDay(null);
} else {
str.setManDay(Integer.valueOf(list1.get(16).toString()));
}
- // 鏁版嵁绫诲瀷
String jy;
if (list1.get(17).toString().equals("闈為噰闆嗙被鍨�")) {
jy = "0";
@@ -309,28 +308,24 @@
jy = "1";
}
str.setInspectionItemType(jy);
- // 妫�楠岄」绫诲瀷
String validateValueType = list1.get(18).toString();
- if (ObjectUtils.isNotEmpty(validateValueType)) {
+ if (StringUtils.isNotBlank(validateValueType)) {
List<SysDictData> enums = dictTypeService.selectDictDataByName("妫�楠屽�肩被鍨�")
.stream().filter(sysDictData -> sysDictData.getDictLabel().equals(validateValueType)).collect(Collectors.toList());
str.setInspectionValueType(enums.get(0).getDictValue());
}
int bsm;
- //鐗规畩鏍囪瘑
if (list1.get(19).toString().equals("鍚�")) {
bsm = 0;
} else {
bsm = 1;
}
str.setBsm(bsm + "");
- // 鏁板瓧瀛楀吀
if (list1.get(20) != null) {
str.setDic(list1.get(20) + "");
} else {
str.setDic(null);
}
- // 鍘熷璁板綍妯℃澘
StandardTemplate standTempIdByName = standardTemplateService.getStandTempIdByName(String.valueOf(list1.get(21)));
if (standTempIdByName != null) {
str.setTemplateId(standTempIdByName.getId());
@@ -338,48 +333,42 @@
str.setTemplateId(null);
}
try {
+ if (list1.get(22) != null && list1.get(22) != "") {
+ str.setInspectionItemClass(list1.get(22) + "");
+ } else {
+ str.setInspectionItemClass(null);
+ }
+ } catch (Exception e) {
+ }
+ try {
+ if (list1.get(23) != null && list1.get(23) != "") {
+ str.setInspectionItemClassEn(list1.get(23) + "");
+ } else {
+ str.setInspectionItemClassEn(null);
+ }
+ } catch (Exception e) {
+ }
+ try {
if (list1.get(24) != null) {
str.setLaboratory(list1.get(24) + "");
}
} catch (Exception e) {
}
-
- // 鏉′欢
- if (list1.get(25) == null) {
- str.setRadiusList(null);
- } else {
- StringBuffer buffer = new StringBuffer();
- String input = list1.get(25).toString();
- buffer.append("[");
- String[] values = input.split("锛�");
- for (String value : values) {
- buffer.append("\"").append(value.trim()).append("\",");
- }
- buffer.deleteCharAt(buffer.length() - 1);
- buffer.append("]");
- str.setRadiusList(buffer.toString());
- }
- // 鏀惰垂鏍囧噯
- if (list1.get(26) == null) {
- str.setRates(null);
- } else {
- str.setRates(list1.get(26) + "");
- }
-
lists.add(str);
}
});
-// structureItemParameterService.removeNoSample(sample.get());
+ structureItemParameterService.removeNoSample(sample.get());
// 濡傛灉鏁版嵁搴撻噷闈㈢殑鏁版嵁瀛樺湪閭ｄ箞灏辨墽琛屾洿鏂版嫹璐濇搷浣�
try {
structureItemParameterService.saveOrUpdateBatch(lists);
} catch (Exception e) {
e.printStackTrace();
- throw new RuntimeException("鏈嶅姟绔姤閿�");
+ throw new RuntimeException("鏈嶅姟绔姤閿欏暒!!!");
}
return Result.success();
}
+
@ApiOperation(value = "瀵煎叆妫�楠屽璞�")
@PostMapping("/importExcel")
public Result importExcel(@RequestParam("file") MultipartFile file) {
--
Gitblit v1.9.3