Prechádzať zdrojové kódy

修改删除隔离点逻辑

车车 2 mesiacov pred
rodič
commit
11b20afe39

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

@@ -182,13 +182,18 @@ public class IsIsolationPointServiceImpl extends ServiceImpl<IsIsolationPointMap
         }
         // 检查电柜有没有配置该隔离点,如果还在配置中,需要先从电柜解除绑定
         for (Long longId : longIds) {
-            String usePoint = '"' + "pointId" + '"' + ": " + '"' + longId + '"' + ",";
+            /*String usePoint = '"' + "pointId" + '"' + ": " + '"' + longId + '"' + ",";
             List<IsLotoStation> list = iIsLotoStationService.list(Wrappers.<IsLotoStation>lambdaQuery()
                     .like(IsLotoStation::getMap, usePoint));
             if (!list.isEmpty()) {
                 IsIsolationPoint isolationPoint = getById(longId);
                 Assert.isTrue(false, isolationPoint.getPointName() + "正在被" + list.get(0).getLotoName() + "锁定站使用,请先从锁定站解除绑定!");
-            }
+            }*/
+            // 清理is_map_point
+            iIsMapPointService.remove(Wrappers.<IsMapPoint>lambdaQuery()
+                    .and(item -> item.eq(IsMapPoint::getMapType, "2")
+                            .or().eq(IsMapPoint::getMapType, "3"))
+                    .eq(IsMapPoint::getEntityId, longId));
         }
 
     }