From d54fbc9d4f8981fa0f7f613b33a28a8cd4f764ea Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期日, 25 十月 2026 16:29:53 +0800
Subject: [PATCH] feat(system): 优化用户搜索功能并完善ERP和MES模块验证逻辑
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/emergencyplan/MesProEmergencyPlanServiceImpl.java | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 48 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/emergencyplan/MesProEmergencyPlanServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/emergencyplan/MesProEmergencyPlanServiceImpl.java
index 0a579d6..77dc488 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/emergencyplan/MesProEmergencyPlanServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/emergencyplan/MesProEmergencyPlanServiceImpl.java
@@ -2,8 +2,12 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil;
+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.module.mes.controller.admin.pro.emergencyplan.vo.MesProEmergencyPlanImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.emergencyplan.vo.MesProEmergencyPlanImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.emergencyplan.vo.MesProEmergencyPlanPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.emergencyplan.vo.MesProEmergencyPlanSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.emergencyplan.MesProEmergencyPlanDO;
@@ -13,10 +17,15 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
+import java.util.ArrayList;
import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.List;
import java.util.Objects;
+import java.util.concurrent.atomic.AtomicInteger;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.MES_PRO_EMERGENCY_PLAN_IMPORT_LIST_IS_EMPTY;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.PRO_WORK_ORDER_NOT_EXISTS;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.PRO_WORK_ORDER_NOT_PREPARE;
@@ -91,6 +100,45 @@
planMapper.updateById(new MesProEmergencyPlanDO().setId(id).setStatus(STATUS_PUBLISHED));
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public MesProEmergencyPlanImportRespVO importPlanList(List<MesProEmergencyPlanImportExcelVO> importList,
+ boolean updateSupport) {
+ if (CollUtil.isEmpty(importList)) {
+ throw exception(MES_PRO_EMERGENCY_PLAN_IMPORT_LIST_IS_EMPTY);
+ }
+ MesProEmergencyPlanImportRespVO respVO = MesProEmergencyPlanImportRespVO.builder()
+ .createNames(new ArrayList<>()).updateNames(new ArrayList<>())
+ .failureNames(new LinkedHashMap<>()).build();
+ AtomicInteger index = new AtomicInteger(1);
+ importList.forEach(importItem -> {
+ int currentIndex = index.getAndIncrement();
+ String key = StrUtil.blankToDefault(importItem.getName(), "绗� " + currentIndex + " 琛�");
+ if (StrUtil.isBlank(importItem.getName())) {
+ respVO.getFailureNames().put(key, "棰勬鍚嶇О涓嶈兘涓虹┖");
+ return;
+ }
+ MesProEmergencyPlanSaveReqVO reqVO = BeanUtils.toBean(importItem, MesProEmergencyPlanSaveReqVO.class);
+ MesProEmergencyPlanDO existPlan = planMapper.selectByName(importItem.getName());
+ try {
+ if (existPlan == null) {
+ reqVO.setId(null);
+ createPlan(reqVO);
+ respVO.getCreateNames().add(importItem.getName());
+ } else if (updateSupport) {
+ reqVO.setId(existPlan.getId());
+ updatePlan(reqVO);
+ respVO.getUpdateNames().add(importItem.getName());
+ } else {
+ respVO.getFailureNames().put(key, "棰勬鍚嶇О宸插瓨鍦�");
+ }
+ } catch (ServiceException e) {
+ respVO.getFailureNames().put(key, e.getMessage());
+ }
+ });
+ return respVO;
+ }
+
private String generateCode() {
return "YJ" + DateUtil.format(java.time.LocalDateTime.now(), "yyyyMMddHHmmss")
+ String.format("%03d", (int) (Math.random() * 1000));
--
Gitblit v1.9.3