From d0f6cc46ad7d968697e7d43d2cdcdd53083c2924 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B4=BE=E5=90=8C=E5=AD=A6?= <stary1993@qq.com>
Date: Tue, 26 Aug 2025 15:37:32 +0800
Subject: [PATCH] =?UTF-8?q?UPDATE:=E4=BF=AE=E6=94=B9=E5=AD=90=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E8=A7=A3=E7=BB=91=E6=88=96=E7=BB=91=E5=AE=9A=E8=A2=AB?=
 =?UTF-8?q?=E6=A3=80=E8=AE=BE=E5=A4=87=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gather/plan/service/IAdPlanService.java   |  3 +-
 .../plan/service/impl/AdPlanServiceImpl.java  | 36 +++++++------------
 2 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/detection/src/main/java/com/njcn/gather/plan/service/IAdPlanService.java b/detection/src/main/java/com/njcn/gather/plan/service/IAdPlanService.java
index b8591497..9bd21030 100644
--- a/detection/src/main/java/com/njcn/gather/plan/service/IAdPlanService.java
+++ b/detection/src/main/java/com/njcn/gather/plan/service/IAdPlanService.java
@@ -157,8 +157,7 @@ public interface IAdPlanService extends IService<AdPlan> {
     /**
      * 子计划绑定/解绑被检设备
      *
-     * @param planId
-     * @param pqDevIds
+     * @param param
      * @return
      */
     boolean updateBindDev(PqDevParam.BindPlanParam param);
diff --git a/detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java b/detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java
index d54bed35..ca098d70 100644
--- a/detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java
+++ b/detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java
@@ -444,7 +444,15 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
             }
 
             // 删除检测计划、标准设备关联
-            adPlanStandardDevService.deleteAdPlanStandardDev(ids);
+            for (String id : ids) {
+                AdPlan plan = this.getById(id);
+                if (plan.getFatherPlanId().equals(CommonEnum.FATHER_ID.getValue())) {
+                    adPlanStandardDevService.deleteAdPlanStandardDev(ids);
+                } else {
+                    adPlanStandardDevService.lambdaUpdate().set(AdPlanStandardDev::getPlanId, plan.getFatherPlanId()).eq(AdPlanStandardDev::getPlanId, id).update();
+                }
+            }
+
             // 删除检测配置
             adPlanTestConfigService.remove(new LambdaQueryWrapper<AdPlanTestConfig>().in(AdPlanTestConfig::getPlanId, ids));
         } else {
@@ -848,32 +856,14 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
 
     @Override
     public boolean updateBindDev(PqDevParam.BindPlanParam param) {
-
-        List<AdPlan> list = new ArrayList<>();
         AdPlan plan = this.getById(param.getPlanId());
-        AdPlan fatherPlan = this.getById(plan.getFatherPlanId());
-
-        List<PqDev> pqDevList1 = pqDevService.list(new QueryWrapper<PqDev>().eq("Plan_Id", param.getPlanId()).eq("State", DataStateEnum.ENABLE.getCode()));
-        List<String> devIds1 = pqDevList1.stream().map(PqDev::getId).collect(Collectors.toList());
-
-        List<PqDev> pqDevList2 = pqDevService.list(new QueryWrapper<PqDev>().eq("Plan_Id", fatherPlan.getId()).eq("State", DataStateEnum.ENABLE.getCode()));
-        List<String> devIds2 = pqDevList2.stream().map(PqDev::getId).collect(Collectors.toList());
-
+        // 0-解绑、1-绑定
         if (param.getBindFlag().equals(1)) {
-            devIds1.addAll(param.getDevIds());
-            devIds2.removeAll(param.getDevIds());
+            pqDevService.lambdaUpdate().set(PqDev::getPlanId, plan.getId()).in(PqDev::getId, param.getDevIds()).update();
         } else {
-            devIds1.removeAll(param.getDevIds());
-            devIds2.addAll(param.getDevIds());
+            pqDevService.lambdaUpdate().set(PqDev::getPlanId, plan.getFatherPlanId()).in(PqDev::getId, param.getDevIds()).update();
         }
-
-        plan.setTestState(pqDevService.bind(param.getPlanId(), devIds1));
-        list.add(plan);
-
-        fatherPlan.setTestState(pqDevService.bind(fatherPlan.getId(), devIds2));
-        list.add(fatherPlan);
-
-        return this.updateBatchById(list);
+        return true;
     }
 
     @Override