From 6e3d8e950e7dec3551bee3512673e1fc2d384d2b Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期日, 18 十月 2026 20:25:55 +0800
Subject: [PATCH] fix(mes): 修复能耗抄表控制器启动时的 bean 名称冲突
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackServiceImpl.java | 61 ++++++++++++++++++++++++++++++
1 files changed, 61 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackServiceImpl.java
index 0692667..273de0a 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackServiceImpl.java
@@ -4,6 +4,8 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
@@ -58,9 +60,11 @@
import java.util.Map;
import java.util.Objects;
import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
/**
@@ -130,6 +134,63 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
+ public MesProFeedbackImportRespVO importFeedbackList(List<MesProFeedbackImportExcelVO> importList,
+ boolean updateSupport) {
+ // 1. 鏍￠獙闈炵┖
+ if (CollUtil.isEmpty(importList)) {
+ throw exception(MES_PRO_FEEDBACK_IMPORT_LIST_IS_EMPTY);
+ }
+
+ // 2. 閫愯澶勭悊
+ MesProFeedbackImportRespVO respVO = MesProFeedbackImportRespVO.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.getTaskCode())) {
+ respVO.getFailureCodes().put(key, "鐢熶骇浠诲姟缂栫爜涓嶈兘涓虹┖");
+ return;
+ }
+ // 2.1 瑙ｆ瀽鐢熶骇浠诲姟
+ MesProTaskDO task = taskService.getTaskByCode(importItem.getTaskCode().trim());
+ if (task == null) {
+ respVO.getFailureCodes().put(key, "鐢熶骇浠诲姟缂栫爜[" + importItem.getTaskCode() + "]涓嶅瓨鍦�");
+ return;
+ }
+ // 2.2 鏋勫缓璇锋眰骞跺垱寤�/鏇存柊锛堝鐢� create/update 鏈嶅姟锛屾姤宸ヤ汉/瀹℃牳浜哄彇褰撳墠鐧诲綍鐢ㄦ埛锛�
+ MesProFeedbackSaveReqVO reqVO = BeanUtils.toBean(importItem, MesProFeedbackSaveReqVO.class);
+ reqVO.setTaskId(task.getId());
+ Long loginUserId = getLoginUserId();
+ reqVO.setFeedbackUserId(ObjUtil.defaultIfNull(reqVO.getFeedbackUserId(), loginUserId));
+ reqVO.setApproveUserId(ObjUtil.defaultIfNull(reqVO.getApproveUserId(), loginUserId));
+ MesProFeedbackDO existFeedback = feedbackMapper.selectByCode(importItem.getCode());
+ try {
+ if (existFeedback == null) {
+ reqVO.setId(null);
+ createFeedback(reqVO);
+ respVO.getCreateCodes().add(importItem.getCode());
+ } else if (updateSupport) {
+ reqVO.setId(existFeedback.getId());
+ updateFeedback(reqVO);
+ respVO.getUpdateCodes().add(importItem.getCode());
+ } else {
+ respVO.getFailureCodes().put(key, "鎶ュ伐鍗曠紪鍙峰凡瀛樺湪");
+ }
+ } catch (ServiceException e) {
+ respVO.getFailureCodes().put(key, e.getMessage());
+ }
+ });
+ return respVO;
+ }
+
+ @Override
public void deleteFeedback(Long id) {
// 1. 鏍￠獙瀛樺湪 + 鑽夌鐘舵��
validateFeedbackStatusPrepare(id);
--
Gitblit v1.9.3