From 1f4e8c7e25f1ae390876b240dab74671fc50d094 Mon Sep 17 00:00:00 2001
From: xy <748613696@qq.com>
Date: Fri, 3 Jan 2025 14:40:51 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=BD=95=E5=85=A5=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=AD=A3=E5=88=99=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pojo/param/CsEquipmentDeliveryAddParm.java         |  5 +----
 .../service/impl/CsEquipmentDeliveryServiceImpl.java   | 10 ++++++++++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEquipmentDeliveryAddParm.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEquipmentDeliveryAddParm.java
index a1174a5..1ed9420 100644
--- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEquipmentDeliveryAddParm.java
+++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEquipmentDeliveryAddParm.java
@@ -1,13 +1,10 @@
 package com.njcn.csdevice.pojo.param;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Pattern;
-import java.util.Date;
 
 /**
  * 
@@ -35,7 +32,7 @@ public class CsEquipmentDeliveryAddParm{
      */
     @ApiModelProperty(value="网络设备ID")
     @NotBlank(message="网络设备ID不能为空！")
-    @Pattern(regexp = "^[A-Za-z0-9]{1,32}$", message = "网络设备ID只可为(数字,字母)")
+    @Pattern(regexp = "^[A-Za-z0-9]{6,32}$", message = "网络设备ID只可为数字或字母,长度至少为6位")
     private String ndid;
 
     /**
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java
index 7947bb5..23cc1b0 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java
@@ -449,6 +449,7 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
         //第一个sheet为台账信息
         params.setStartSheetIndex(0);
         params.setSheetNum(1);
+        String regex = "^[A-Za-z0-9]{6,32}$";
         try {
             ExcelImportResult<DeviceExcelTemplete> terminalBaseList = ExcelImportUtil.importExcelMore (file.getInputStream ( ), DeviceExcelTemplete.class, params);
             //如果存在非法数据，将不合格的数据导出
@@ -457,6 +458,15 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
 
             for (int i = 0; i < terminalBaseList.getList ( ).size ( ); i++) {
                 DeviceExcelTemplete deviceExcelTemplete = terminalBaseList.getList ( ).get (i);
+
+                if(!deviceExcelTemplete.getNdid().matches(regex)){
+                    DeviceExcelTemplete.IllegalityDeviceExcelTemplete idlegalityDeviceException = new DeviceExcelTemplete.IllegalityDeviceExcelTemplete();
+                    BeanUtils.copyProperties(deviceExcelTemplete,idlegalityDeviceException);
+                    idlegalityDeviceException.setMsg("网络设备ID只可为数字或字母,长度至少为6位");
+                    falseCollect.add(idlegalityDeviceException);
+                    continue;
+                }
+
                 CsEquipmentDeliveryPO po = this.queryEquipmentPOByndid (deviceExcelTemplete.getNdid ( ));
                 if(!Objects.isNull (po)){
                     DeviceExcelTemplete.IllegalityDeviceExcelTemplete idlegalityDeviceException = new DeviceExcelTemplete.IllegalityDeviceExcelTemplete();