From 43ab09b69686d72a4e3b75a23c52ab98314be25a Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期一, 26 十月 2026 13:53:52 +0800
Subject: [PATCH] feat(device): 核查计划明细设备型号独立存储不再拼接进设备名称；设备导入模板与校验文案统一设备名称命名
---
cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java
index 70671c3..810d54e 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java
@@ -580,10 +580,10 @@
Set<String> fileKeys = new HashSet<>();
for (int i = 0; i < rows.size(); i++) {
String managementNumber = required(rows.get(i).getManagementNumber(), i + 2, "绠＄悊缂栧彿");
- String deviceName = required(rows.get(i).getDeviceName(), i + 2, "浠櫒鍚嶇О");
+ String deviceName = required(rows.get(i).getDeviceName(), i + 2, "璁惧鍚嶇О");
String specificationModel = required(rows.get(i).getSpecificationModel(), i + 2, "瑙勬牸鍨嬪彿");
if (!fileKeys.add(deviceKey(deviceName, specificationModel, managementNumber))) {
- throw new RuntimeException("绗�" + (i + 2) + "琛岋細浠櫒鍚嶇О+瑙勬牸鍨嬪彿+绠＄悊缂栧彿鍦ㄦ枃浠朵腑閲嶅");
+ throw new RuntimeException("绗�" + (i + 2) + "琛岋細璁惧鍚嶇О+瑙勬牸鍨嬪彿+绠＄悊缂栧彿鍦ㄦ枃浠朵腑閲嶅");
}
}
Set<String> existingKeys = baseMapper.selectList(Wrappers.<Device>lambdaQuery()
@@ -601,10 +601,10 @@
int rowNumber = i + 2;
DeviceImport row = rows.get(i);
String managementNumber = required(row.getManagementNumber(), rowNumber, "绠＄悊缂栧彿");
- String deviceName = required(row.getDeviceName(), rowNumber, "浠櫒鍚嶇О");
+ String deviceName = required(row.getDeviceName(), rowNumber, "璁惧鍚嶇О");
String specificationModel = required(row.getSpecificationModel(), rowNumber, "瑙勬牸鍨嬪彿");
if (existingKeys.contains(deviceKey(deviceName, specificationModel, managementNumber))) {
- throw new RuntimeException("绗�" + rowNumber + "琛岋細浠櫒鍚嶇О鈥�" + deviceName + "鈥�+瑙勬牸鍨嬪彿鈥�" + specificationModel + "鈥�+绠＄悊缂栧彿鈥�" + managementNumber + "鈥濆凡瀛樺湪");
+ throw new RuntimeException("绗�" + rowNumber + "琛岋細璁惧鍚嶇О鈥�" + deviceName + "鈥�+瑙勬牸鍨嬪彿鈥�" + specificationModel + "鈥�+绠＄悊缂栧彿鈥�" + managementNumber + "鈥濆凡瀛樺湪");
}
Device device = new Device();
--
Gitblit v1.9.3