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-system/src/main/java/cn/iocoder/yudao/module/system/service/dict/DictDataServiceImpl.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 51 insertions(+), 0 deletions(-)
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/dict/DictDataServiceImpl.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/dict/DictDataServiceImpl.java
index 8ff9d26..1d213b7 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/dict/DictDataServiceImpl.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/dict/DictDataServiceImpl.java
@@ -1,10 +1,15 @@
package cn.iocoder.yudao.module.system.service.dict;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.DictDataImportExcelVO;
+import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.DictDataImportReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.DictDataImportRespVO;
import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.DictDataPageReqVO;
import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.DictDataSaveReqVO;
import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictDataDO;
@@ -15,12 +20,15 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.Comparator;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.filterList;
import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*;
/**
@@ -181,4 +189,47 @@
return list;
}
+ @Override
+ public DictDataImportRespVO importDictDataList(List<DictDataImportExcelVO> importDictDatas, DictDataImportReqVO importReqVO) {
+ importDictDatas = filterList(importDictDatas, item -> StrUtil.isNotBlank(item.getLabel()));
+ if (CollUtil.isEmpty(importDictDatas)) {
+ throw exception(DICT_DATA_IMPORT_LIST_IS_EMPTY);
+ }
+ DictDataImportRespVO respVO = DictDataImportRespVO.builder()
+ .createDictDataNames(new ArrayList<>())
+ .updateDictDataNames(new ArrayList<>())
+ .failureDictDataNames(new LinkedHashMap<>())
+ .build();
+ importDictDatas.forEach(importDictData -> {
+ try {
+ // 1. 鏍￠獙瀛楀吀绫诲瀷鏈夋晥
+ validateDictTypeExists(importDictData.getDictType());
+ // 2. 鍒ゆ柇鏄惁瀛樺湪锛堝瓧鍏哥被鍨� + 瀛楀吀鍊� 鍞竴锛�
+ DictDataDO existDictData = dictDataMapper.selectByDictTypeAndValue(
+ importDictData.getDictType(), importDictData.getValue());
+ if (existDictData == null) {
+ // 2.1 鏂板
+ validateDictDataValueUnique(null, importDictData.getDictType(), importDictData.getValue());
+ DictDataDO dictData = BeanUtils.toBean(importDictData, DictDataDO.class);
+ dictDataMapper.insert(dictData);
+ respVO.getCreateDictDataNames().add(importDictData.getLabel());
+ return;
+ }
+ // 2.2 宸插瓨鍦紝鍒ゆ柇鏄惁鍏佽鏇存柊
+ if (!importReqVO.getUpdateSupport()) {
+ respVO.getFailureDictDataNames().put(importDictData.getLabel(),
+ StrUtil.format(DICT_DATA_VALUE_DUPLICATE.getMsg()));
+ return;
+ }
+ DictDataDO updateDictData = BeanUtils.toBean(importDictData, DictDataDO.class)
+ .setId(existDictData.getId());
+ dictDataMapper.updateById(updateDictData);
+ respVO.getUpdateDictDataNames().add(importDictData.getLabel());
+ } catch (ServiceException ex) {
+ respVO.getFailureDictDataNames().put(importDictData.getLabel(), ex.getMessage());
+ }
+ });
+ return respVO;
+ }
+
}
--
Gitblit v1.9.3