From ca788dcbd73c5c8665b45da7ff4a0b1d92196b2c Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期三, 27 八月 2025 09:49:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pim-jlmy' into pim-jlmy
---
basic-server/src/main/java/com/ruoyi/basic/service/impl/CoalFieldServiceImpl.java | 47 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 47 insertions(+), 0 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/CoalFieldServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/CoalFieldServiceImpl.java
index 67a6c5e..e476244 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/CoalFieldServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/CoalFieldServiceImpl.java
@@ -9,15 +9,19 @@
import com.ruoyi.basic.entity.CoalField;
import com.ruoyi.basic.mapper.CoalFieldMapper;
import com.ruoyi.basic.service.CoalFieldService;
+import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.bean.BeanUtils;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
+import java.util.Collections;
import java.util.List;
import java.util.Objects;
+import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import java.util.stream.Collectors;
/**
* <p>
@@ -80,6 +84,49 @@
return coalFieldMapper.selectList(null);
}
+ @Override
+ public List<CoalFieldDto> getFieldsByNames(Set<String> fieldNames) {
+ // 1. 鍙傛暟鏍￠獙
+ if (fieldNames == null || fieldNames.isEmpty()) {
+ throw new IllegalArgumentException("瀛楁鍚嶉泦鍚堜笉鑳戒负绌�");
+ }
+
+ // 2. 杩囨护绌哄��
+ Set<String> filteredNames = fieldNames.stream()
+ .filter(name -> name != null && !name.trim().isEmpty())
+ .collect(Collectors.toSet());
+
+ if (filteredNames.isEmpty()) {
+ return Collections.emptyList();
+ }
+
+ // 3. 鏌ヨ鏁版嵁搴�
+ try {
+ List<CoalField> entities = coalFieldMapper.getFieldsByNames(filteredNames);
+
+ // 4. 瀹炰綋杞珼TO
+ return entities.stream()
+ .map(this::convertToDto)
+ .collect(Collectors.toList());
+
+ } catch (Exception e) {
+ throw new BaseException("鏌ヨ鐓よ川瀛楁淇℃伅澶辫触锛岃绋嶅悗閲嶈瘯");
+ }
+ }
+
+ private CoalFieldDto convertToDto(CoalField entity) {
+ CoalFieldDto dto = new CoalFieldDto();
+ dto.setId(entity.getId());
+ dto.setFields(entity.getFields());
+ dto.setFieldName(entity.getFieldName());
+ return dto;
+ }
+
+ @Override
+ public Set<String> getFieldNamesByNames(Set<String> fieldNames) {
+ return coalFieldMapper.getFieldNamesByNames(fieldNames);
+ }
+
private String generateNextFieldNumber() {
// 鑾峰彇鎵�鏈夊凡瀛樺湪鐨� CoalField 璁板綍锛屽寘鎷凡鍒犻櫎鐨�
LambdaQueryWrapper<CoalField> queryWrapper = new LambdaQueryWrapper<>();
--
Gitblit v1.9.3