车车 5 сар өмнө
parent
commit
644fbc9eca

+ 7 - 0
ktg-iscs/src/main/java/com/ktg/iscs/service/impl/IsIsolationPointServiceImpl.java

@@ -96,6 +96,9 @@ public class IsIsolationPointServiceImpl extends ServiceImpl<IsIsolationPointMap
         List<IsIsolationPoint> list3 = list(Wrappers.<IsIsolationPoint>lambdaQuery()
         List<IsIsolationPoint> list3 = list(Wrappers.<IsIsolationPoint>lambdaQuery()
                 .eq(IsIsolationPoint::getPointCode, isIsolationPoint.getPointCode()));
                 .eq(IsIsolationPoint::getPointCode, isIsolationPoint.getPointCode()));
         Assert.isTrue(list3.isEmpty(), "该编号已被使用!");
         Assert.isTrue(list3.isEmpty(), "该编号已被使用!");
+        List<IsIsolationPoint> list4 = list(Wrappers.<IsIsolationPoint>lambdaQuery()
+                .eq(IsIsolationPoint::getPointSerialNumber, isIsolationPoint.getPointSerialNumber()));
+        Assert.isTrue(list4.isEmpty(), "该序列号已被使用!");
         int i = isIsolationPointMapper.insertIsIsolationPoint(isIsolationPoint);
         int i = isIsolationPointMapper.insertIsIsolationPoint(isIsolationPoint);
         // 如果绑定的loto站已经绑定了mapId,则需要往is_map_point插入数据
         // 如果绑定的loto站已经绑定了mapId,则需要往is_map_point插入数据
         if (isIsolationPoint.getLotoId() != null) {
         if (isIsolationPoint.getLotoId() != null) {
@@ -137,6 +140,10 @@ public class IsIsolationPointServiceImpl extends ServiceImpl<IsIsolationPointMap
                 .eq(IsIsolationPoint::getPointCode, isIsolationPoint.getPointCode())
                 .eq(IsIsolationPoint::getPointCode, isIsolationPoint.getPointCode())
                 .ne(IsIsolationPoint::getPointId, isIsolationPoint.getPointId()));
                 .ne(IsIsolationPoint::getPointId, isIsolationPoint.getPointId()));
         Assert.isTrue(list3.isEmpty(), "该编号已被使用!");
         Assert.isTrue(list3.isEmpty(), "该编号已被使用!");
+        List<IsIsolationPoint> list4 = list(Wrappers.<IsIsolationPoint>lambdaQuery()
+                .eq(IsIsolationPoint::getPointSerialNumber, isIsolationPoint.getPointSerialNumber())
+                .ne(IsIsolationPoint::getPointId, isIsolationPoint.getPointId()));
+        Assert.isTrue(list4.isEmpty(), "该序列号已被使用!");
         isIsolationPoint.setUpdateTime(DateUtils.getNowDate());
         isIsolationPoint.setUpdateTime(DateUtils.getNowDate());
         return isIsolationPointMapper.updateIsIsolationPoint(isIsolationPoint);
         return isIsolationPointMapper.updateIsIsolationPoint(isIsolationPoint);
     }
     }