feat(device): 核查计划明细设备型号独立存储不再拼接进设备名称；设备导入模板与校验文案统一设备名称命名

吴羡

2026-10-26 43ab09b69686d72a4e3b75a23c52ab98314be25a

feat(device): 核查计划明细设备型号独立存储不再拼接进设备名称；设备导入模板与校验文案统一设备名称命名

 cnas-device/src/main/java/com/ruoyi/device/excel/upload/DeviceImport.java

@@ -8,7 +8,7 @@
@ColumnWidth(22)
public class DeviceImport {

    @ExcelProperty("仪器名称*")
    @ExcelProperty("设备名称*")
    private String deviceName;

    @ExcelProperty("规格型号*")
@@ -26,7 +26,7 @@
    @ExcelProperty("校准周期(月)*")
    private String calibrationDate;

    @ExcelProperty("英文名称")
    @ExcelProperty("设备EN名称")
    private String enDeviceName;

    @ExcelProperty("生产厂家")

 cnas-device/src/main/java/com/ruoyi/device/pojo/DeviceExternalApply.java

@@ -31,7 +31,7 @@
    @Schema(description = "地址")
    private String address;

    @Schema(description = "仪器名称")
    @Schema(description = "设备名称")
    private String deviceName;

    @Schema(description = "仪器型号")

 cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceExaminePlanServiceImpl.java

@@ -176,6 +176,7 @@
                    throw new ErrorException("设备编号" + examinePlanDetail.getDeviceNumber() + "未查询到核查人");
                }
                examinePlanDetail.setDeviceId(device.getId());
                examinePlanDetail.setDeviceModel(device.getSpecificationModel());
                examinePlanDetail.setCheckChargerUserId(user.getId());
            }

@@ -510,11 +511,8 @@
        DeviceExaminePlanDetails detail = new DeviceExaminePlanDetails();
        detail.setPlanId(plan.getPlanId());
        detail.setDeviceId(device.getId());
        String deviceName = device.getDeviceName() == null ? "" : device.getDeviceName();
        if (StringUtils.isNotBlank(device.getSpecificationModel())) {
            deviceName = deviceName + " " + device.getSpecificationModel();
        }
        detail.setDeviceName(deviceName);
        detail.setDeviceName(device.getDeviceName() == null ? "" : device.getDeviceName());
        detail.setDeviceModel(device.getSpecificationModel());
        detail.setDeviceNumber(device.getManagementNumber());
        detail.setCheckTime(checkTime);
        deviceExaminePlanDetailsMapper.insert(detail);
@@ -587,11 +585,8 @@
        DeviceExaminePlanDetails detail = new DeviceExaminePlanDetails();
        detail.setPlanId(plan.getPlanId());
        detail.setDeviceId(device.getId());
        String deviceName = device.getDeviceName() == null ? "" : device.getDeviceName();
        if (StringUtils.isNotBlank(device.getSpecificationModel())) {
            deviceName = deviceName + " " + device.getSpecificationModel();
        }
        detail.setDeviceName(deviceName);
        detail.setDeviceName(device.getDeviceName() == null ? "" : device.getDeviceName());
        detail.setDeviceModel(device.getSpecificationModel());
        detail.setDeviceNumber(device.getManagementNumber());
        String detailCheckTime = normalizeCheckDate(checkTime);
        detail.setCheckTime(StringUtils.isBlank(detailCheckTime) ? checkMonth : detailCheckTime);

 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();