From 9075785a9e14f6220783d052d231f915c6930b87 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期三, 04 十一月 2026 10:21:45 +0800
Subject: [PATCH] revert(collect): 撤销 collect 数采模块（新高设备管理已有自己的采集方式）
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/process/MesProProcessServiceImpl.java | 89 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 88 insertions(+), 1 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/process/MesProProcessServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/process/MesProProcessServiceImpl.java
index 27023cb..69764ee 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/process/MesProProcessServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/process/MesProProcessServiceImpl.java
@@ -2,23 +2,30 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
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.process.vo.MesProProcessImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.process.vo.MesProProcessImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.process.vo.MesProProcessPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.process.vo.MesProProcessSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.process.MesProProcessDO;
import cn.iocoder.yudao.module.mes.dal.mysql.pro.process.MesProProcessMapper;
import cn.iocoder.yudao.module.mes.service.pro.route.MesProRouteProcessService;
+import cn.iocoder.yudao.module.mes.service.pd.processparamtemplate.MesPdProcessParamTemplateService;
import jakarta.annotation.Resource;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+import java.util.LinkedHashMap;
import java.util.List;
+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.*;
@@ -26,7 +33,7 @@
/**
* MES 鐢熶骇宸ュ簭 Service 瀹炵幇绫�
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Service
@Validated
@@ -34,6 +41,9 @@
@Resource
private MesProProcessMapper processMapper;
+
+ @Resource
+ private MesPdProcessParamTemplateService paramTemplateService;
@Resource
private MesProProcessContentService processContentService;
@@ -129,6 +139,30 @@
validateProcessCodeUnique(saveReqVO.getId(), saveReqVO.getCode());
// 2. 鏍￠獙鍚嶇О鍞竴
validateProcessNameUnique(saveReqVO.getId(), saveReqVO.getName());
+ validateParamConfiguration(saveReqVO);
+ }
+
+ private void validateParamConfiguration(MesProProcessSaveReqVO req) {
+ // 鍏煎鏈彂閫佹柊瀛楁鐨勬棫瀹㈡埛绔細鏇存柊鏃朵繚鐣欏凡鏈夐厤缃��
+ if (req.getParamCollectMode() == null) {
+ if (req.getId() == null) req.setParamCollectMode(0);
+ else {
+ MesProProcessDO current = processMapper.selectById(req.getId());
+ if (current != null) {
+ req.setParamCollectMode(current.getParamCollectMode() == null ? 0 : current.getParamCollectMode());
+ req.setParamTemplateId(current.getParamTemplateId());
+ }
+ }
+ }
+ Integer mode = req.getParamCollectMode();
+ if (mode == null || mode < 0 || mode > 2) throw exception(PRO_PROCESS_PARAM_CONFIG_INVALID);
+ if (mode != 0) {
+ if (req.getParamTemplateId() == null) throw exception(PRO_PROCESS_PARAM_TEMPLATE_REQUIRED);
+ paramTemplateService.validateProcessParamTemplateExists(req.getParamTemplateId());
+ if (CollUtil.isEmpty(paramTemplateService.getProcessParamTemplateDetailListByTemplateId(req.getParamTemplateId()))) {
+ throw exception(PRO_WORK_ORDER_PARAM_RECORD_TEMPLATE_NO_DETAIL);
+ }
+ }
}
@Override
@@ -145,6 +179,11 @@
}
@Override
+ public MesProProcessDO getProcessByName(String name) {
+ return processMapper.selectByName(name);
+ }
+
+ @Override
public PageResult<MesProProcessDO> getProcessPage(MesProProcessPageReqVO pageReqVO) {
return processMapper.selectPage(pageReqVO);
}
@@ -154,4 +193,52 @@
return processMapper.selectListByStatus(status);
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public MesProProcessImportRespVO importProcessList(List<MesProProcessImportExcelVO> importList,
+ boolean updateSupport) {
+ // 1. 鏍￠獙闈炵┖
+ if (CollUtil.isEmpty(importList)) {
+ throw exception(PRO_PROCESS_IMPORT_LIST_IS_EMPTY);
+ }
+
+ // 2. 閫愯澶勭悊
+ MesProProcessImportRespVO respVO = MesProProcessImportRespVO.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;
+ }
+ // 2.1 鍒ゆ柇锛氬垱寤� or 鏇存柊
+ MesProProcessDO existProcess = processMapper.selectByCode(importItem.getCode());
+ if (existProcess == null) {
+ // 2.1.1 鏂板
+ MesProProcessDO process = BeanUtils.toBean(importItem, MesProProcessDO.class);
+ process.setId(null);
+ process.setStatus(ObjUtil.defaultIfNull(importItem.getStatus(), CommonStatusEnum.ENABLE.getStatus()));
+ processMapper.insert(process);
+ respVO.getCreateCodes().add(importItem.getCode());
+ } else if (updateSupport) {
+ // 2.1.2 鏇存柊
+ MesProProcessDO updateObj = BeanUtils.toBean(importItem, MesProProcessDO.class);
+ updateObj.setId(existProcess.getId());
+ updateObj.setCode(existProcess.getCode());
+ processMapper.updateById(updateObj);
+ respVO.getUpdateCodes().add(importItem.getCode());
+ } else {
+ respVO.getFailureCodes().put(key, "宸ュ簭缂栫爜宸插瓨鍦�");
+ }
+ });
+ return respVO;
+ }
+
}
--
Gitblit v1.9.3