From 00cf6c13531447af59a8d2121bbfb1a3a1f68c0d Mon Sep 17 00:00:00 2001
From: zhuguifei <zhuguifei@zhuguifeideiMac.local>
Date: 星期五, 06 六月 2025 09:15:29 +0800
Subject: [PATCH] Merge branch 'main' of http://lanpucloud.cn:1111/r/eims-master
---
eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsInspectPlanServiceImpl.java | 113 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 61 insertions(+), 52 deletions(-)
diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsInspectPlanServiceImpl.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsInspectPlanServiceImpl.java
index 6d23e51..ab7a0a9 100644
--- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsInspectPlanServiceImpl.java
+++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsInspectPlanServiceImpl.java
@@ -208,64 +208,73 @@
}
@Override
- public String importData(MultipartFile file, boolean updateSupport) throws IOException, IOException {
- // 鐐规椤圭洰鍒楄〃锛堝亣璁惧瓨鍦ㄥ搴旂殑鐐规椤筕O锛�
- InspectCheckItemImportListener checkItemImportListener = new InspectCheckItemImportListener(updateSupport);
- EasyExcel.read(file.getInputStream(), InspectCheckItemVo.class, checkItemImportListener).headRowNumber(3).sheet().doRead();
- List<InspectCheckItemVo> successList = checkItemImportListener.getSuccessList();
+ public String importData(MultipartFile file, boolean updateSupport) {
+ try {
+ // 鐐规椤圭洰鍒楄〃锛堝亣璁惧瓨鍦ㄥ搴旂殑鐐规椤筕O锛�
+ InspectCheckItemImportListener checkItemImportListener = new InspectCheckItemImportListener(updateSupport);
+ EasyExcel.read(file.getInputStream(), InspectCheckItemVo.class, checkItemImportListener)
+ .headRowNumber(3).sheet().doRead();
+ List<InspectCheckItemVo> successList = checkItemImportListener.getSuccessList();
- // 璇诲彇鍥哄畾璧勪骇缂栧彿锛堝亣璁句綅缃笉鍚岋級
- EasyExcelCellListener assetNoListener = new EasyExcelCellListener(2, 23);
- EasyExcel.read(file.getInputStream(), assetNoListener).headRowNumber(0).sheet().doReadSync();
- String assetNo = Optional.ofNullable(assetNoListener.getCellValue())
- .map(value -> {
- int colonIndex = Math.max(value.indexOf(":"), value.indexOf("锛�")); // 鍚堝苟鍐掑彿澶勭悊
- return colonIndex != -1 ? value.substring(colonIndex + 1) : value;
- })
- .map(String::trim)
- .orElseThrow(() -> new ServiceException("瀵煎叆澶辫触锛屾棤娉曡鍙栧浐瀹氳祫浜х紪鍙�"));
+ // 璇诲彇鍥哄畾璧勪骇缂栧彿锛堝亣璁句綅缃笉鍚岋級
+ EasyExcelCellListener assetNoListener = new EasyExcelCellListener(2, 23);
+ EasyExcel.read(file.getInputStream(), assetNoListener).headRowNumber(0).sheet().doReadSync();
+ String assetNo = Optional.ofNullable(assetNoListener.getCellValue())
+ .map(value -> {
+ int colonIndex = Math.max(value.indexOf(":"), value.indexOf("锛�")); // 鍚堝苟鍐掑彿澶勭悊
+ return colonIndex != -1 ? value.substring(colonIndex + 1) : value;
+ })
+ .map(String::trim)
+ .orElse("");
- // 鏌ヨ璁惧淇℃伅
- QueryWrapper<EimsEqu> query = new QueryWrapper<>();
- query.eq("asset_no", assetNo);
- EimsEquVo equVo = equMapper.selectVoOne(query);
- if (equVo == null) throw new ServiceException("璁惧鏈壘鍒帮紝璇峰厛鍦ㄨ澶囧彴甯愪腑娣诲姞");
-
- int successNum = 0;
- int failureNum = 0;
- StringBuilder successMsg = new StringBuilder();
- StringBuilder failureMsg = new StringBuilder();
-
- for (InspectCheckItemVo itemVo : successList) {
- if ("璁惧鐘舵�佸崱鐘舵��".equals(itemVo.getItemName())) break;
-
- // 濡傛灉鍏佽瑕嗙洊锛屽垯鍒犻櫎宸插瓨鍦ㄧ殑璁板綍
- if (updateSupport) {
- LambdaQueryWrapper<EimsInspectPlan> deleteWrapper = Wrappers.lambdaQuery();
- deleteWrapper.eq(EimsInspectPlan::getEquId, equVo.getEquId())
- .eq(EimsInspectPlan::getInspName, itemVo.getItemName())
- .eq(EimsInspectPlan::getStatus, "0");
- baseMapper.delete(deleteWrapper);
+ if (assetNo.isEmpty()) {
+ return file.getOriginalFilename() + " 瀵煎叆澶辫触锛屾棤娉曡鍙栧浐瀹氳祫浜х紪鍙�";
}
- // 鏂板鐐规璁″垝
- EimsInspectPlanBo bo = new EimsInspectPlanBo();
- bo.setEquId(equVo.getEquId());
- bo.setInspName(itemVo.getItemName());
- bo.setStatus("0");
- bo.setInspType("1");
- bo.setInspRule("0");
-
- if (!insertByBo(bo)) {
- failureNum++;
- failureMsg.append(failureNum).append("銆佸鍏ュけ璐�<br>");
- } else {
- successNum++;
- successMsg.append(successNum).append("銆佸鍏ユ垚鍔�<br>");
+ // 鏌ヨ璁惧淇℃伅
+ QueryWrapper<EimsEqu> query = new QueryWrapper<>();
+ query.eq("asset_no", assetNo);
+ EimsEquVo equVo = equMapper.selectVoOne(query);
+ if (equVo == null) {
+ return file.getOriginalFilename() + " 璁惧鏈壘鍒帮紝璇峰厛鍦ㄨ澶囧彴甯愪腑娣诲姞";
}
+
+ int successNum = 0;
+ int failureNum = 0;
+
+ for (InspectCheckItemVo itemVo : successList) {
+ if ("璁惧鐘舵�佸崱鐘舵��".equals(itemVo.getItemName()) || itemVo.getItemName().contains("杩愯鏃堕棿")) {
+ break;
+ }
+
+ // 濡傛灉鍏佽瑕嗙洊锛屽垯鍒犻櫎宸插瓨鍦ㄧ殑璁板綍
+ if (updateSupport) {
+ LambdaQueryWrapper<EimsInspectPlan> deleteWrapper = Wrappers.lambdaQuery();
+ deleteWrapper.eq(EimsInspectPlan::getEquId, equVo.getEquId())
+ .eq(EimsInspectPlan::getInspName, itemVo.getItemName())
+ .eq(EimsInspectPlan::getStatus, "0");
+ baseMapper.delete(deleteWrapper);
+ }
+
+ // 鏂板鐐规璁″垝
+ EimsInspectPlanBo bo = new EimsInspectPlanBo();
+ bo.setEquId(equVo.getEquId());
+ bo.setInspName(itemVo.getItemName());
+ bo.setStatus("0");
+ bo.setInspType("1");
+ bo.setInspRule("0");
+
+ if (!insertByBo(bo)) {
+ failureNum++;
+ } else {
+ successNum++;
+ }
+ }
+
+ return file.getOriginalFilename() + " 瀵煎叆鎴愬姛锛�" + successNum + "鏉★紝瀵煎叆澶辫触锛�" + failureNum + "鏉�";
+ } catch (Exception e) {
+ return file.getOriginalFilename() + " 瀵煎叆寮傚父锛�" + e.getMessage();
}
-
- return failureNum > 0 ? failureMsg.toString() : successMsg.toString();
}
--
Gitblit v1.9.3