From 9daeb6eac6e46710055e625bbbd56331b8890e21 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期三, 04 十一月 2026 10:10:20 +0800
Subject: [PATCH] revert(energy): 撤销 energy 模块移植（与新高原有 em 模块重复）
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/indicator/MesQcIndicatorServiceImpl.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 53 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/indicator/MesQcIndicatorServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/indicator/MesQcIndicatorServiceImpl.java
index 10fa498..5d91712 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/indicator/MesQcIndicatorServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/indicator/MesQcIndicatorServiceImpl.java
@@ -23,6 +23,11 @@
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.indicator.vo.MesQcIndicatorImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.indicator.vo.MesQcIndicatorImportRespVO;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
/**
* MES 璐ㄦ鎸囨爣 Service 瀹炵幇绫�
@@ -143,4 +148,52 @@
return convertMap(indicators, MesQcIndicatorDO::getId);
}
+
+ @Override
+ public MesQcIndicatorImportRespVO importIndicatorList(List<MesQcIndicatorImportExcelVO> importList, boolean updateSupport) {
+ if (CollUtil.isEmpty(importList)) {
+ throw exception(QC_INDICATOR_IMPORT_LIST_IS_EMPTY);
+ }
+ MesQcIndicatorImportRespVO respVO = MesQcIndicatorImportRespVO.builder()
+ .createCodes(new ArrayList<>()).updateCodes(new ArrayList<>())
+ .failureCodes(new LinkedHashMap<>()).build();
+ AtomicInteger index = new AtomicInteger(1);
+ importList.forEach(importItem -> {
+ int currentIndex = index.getAndIncrement();
+ String key = StrUtil.blankToDefault(importItem.getCode(), "绗� " + currentIndex + " 琛�");
+ if (StrUtil.isBlank(importItem.getCode())) {
+ respVO.getFailureCodes().put(key, "妫�娴嬮」缂栫爜涓嶈兘涓虹┖");
+ return;
+ }
+ if (StrUtil.isBlank(importItem.getName())) {
+ respVO.getFailureCodes().put(key, "妫�娴嬮」鍚嶇О涓嶈兘涓虹┖");
+ return;
+ }
+ if (importItem.getType() == null) {
+ respVO.getFailureCodes().put(key, "妫�娴嬮」绫诲瀷涓嶈兘涓虹┖");
+ return;
+ }
+ if (importItem.getResultType() == null) {
+ respVO.getFailureCodes().put(key, "缁撴灉鍊肩被鍨嬩笉鑳戒负绌�");
+ return;
+ }
+ MesQcIndicatorDO exist = indicatorMapper.selectByCode(importItem.getCode());
+ if (exist == null) {
+ MesQcIndicatorDO indicator = BeanUtils.toBean(importItem, MesQcIndicatorDO.class);
+ indicator.setId(null);
+ indicatorMapper.insert(indicator);
+ respVO.getCreateCodes().add(importItem.getCode());
+ } else if (updateSupport) {
+ MesQcIndicatorDO updateObj = BeanUtils.toBean(importItem, MesQcIndicatorDO.class);
+ updateObj.setId(exist.getId());
+ updateObj.setCode(exist.getCode());
+ indicatorMapper.updateById(updateObj);
+ respVO.getUpdateCodes().add(importItem.getCode());
+ } else {
+ respVO.getFailureCodes().put(key, "妫�娴嬮」缂栫爜宸插瓨鍦�");
+ }
+ });
+ return respVO;
+ }
+
}
--
Gitblit v1.9.3