From 9097df6b9559b04682e9907d900eb86d5109f84a Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 23 四月 2024 21:23:32 +0800
Subject: [PATCH] 去掉coreboot的无用注释

---
 smart-man-boot/src/main/java/com/qianwen/smartman/modules/tpm/service/impl/MaintainPlanServiceImpl.java |  594 ++++++++++------------------------------------------------
 1 files changed, 109 insertions(+), 485 deletions(-)

diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tpm/service/impl/MaintainPlanServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tpm/service/impl/MaintainPlanServiceImpl.java
index 9fec85c..ab31448 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tpm/service/impl/MaintainPlanServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tpm/service/impl/MaintainPlanServiceImpl.java
@@ -86,471 +86,8 @@
     private final BusinessSendFactory businessSendFactory;
     private final IBusinessNotifyStateService businessNotifyStateService;
 
-    private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
-        String implMethodName = lambda.getImplMethodName();
-        boolean z = true;
-        switch (implMethodName.hashCode()) {
-            case -1107875961:
-                if (implMethodName.equals("getDeviceId")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case -904436898:
-                if (implMethodName.equals("getProjectId")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case -798691761:
-                if (implMethodName.equals("getMaintainDate")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case -75622813:
-                if (implMethodName.equals("getCode")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 98245393:
-                if (implMethodName.equals("getId")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 112409713:
-                if (implMethodName.equals("getPlanStatus")) {
-                    z = false;
-                    break;
-                }
-                break;
-            case 482925913:
-                if (implMethodName.equals("getDeviceCode")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 483240439:
-                if (implMethodName.equals("getDeviceName")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 515366127:
-                if (implMethodName.equals("getIsAuto")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 710250778:
-                if (implMethodName.equals("getPlanId")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 731625057:
-                if (implMethodName.equals("getDeviceTypeId")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 771206363:
-                if (implMethodName.equals("getTenantId")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 1071464927:
-                if (implMethodName.equals("getCreateTime")) {
-                    z = true;
-                    break;
-                }
-                break;
-        }
-        switch (z) {
-            case false:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getPlanStatus();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getPlanStatus();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getPlanStatus();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getPlanStatus();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getPlanStatus();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getPlanStatus();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getPlanStatus();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getPlanStatus();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getPlanStatus();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getPlanStatus();
-                    };
-                }
-                break;
-            case true:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/util/Date;")) {
-                    return (v0) -> {
-                        return v0.getCreateTime();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/util/Date;")) {
-                    return (v0) -> {
-                        return v0.getCreateTime();
-                    };
-                }
-                break;
-            case true:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getProjectId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getProjectId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/MaintainProjectItem") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getProjectId();
-                    };
-                }
-                break;
-            case true:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getId();
-                    };
-                }
-                break;
-            case true:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/time/LocalDateTime;")) {
-                    return (v0) -> {
-                        return v0.getMaintainDate();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/time/LocalDateTime;")) {
-                    return (v0) -> {
-                        return v0.getMaintainDate();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/time/LocalDateTime;")) {
-                    return (v0) -> {
-                        return v0.getMaintainDate();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/time/LocalDateTime;")) {
-                    return (v0) -> {
-                        return v0.getMaintainDate();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/time/LocalDateTime;")) {
-                    return (v0) -> {
-                        return v0.getMaintainDate();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/time/LocalDateTime;")) {
-                    return (v0) -> {
-                        return v0.getMaintainDate();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/time/LocalDateTime;")) {
-                    return (v0) -> {
-                        return v0.getMaintainDate();
-                    };
-                }
-                break;
-            case RegionCache.VILLAGE_LEVEL /* 5 */:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/tenant/mp/TenantEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getTenantId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/tenant/mp/TenantEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getTenantId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/tenant/mp/TenantEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getTenantId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/tenant/mp/TenantEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getTenantId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/tenant/mp/TenantEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getTenantId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/tenant/mp/TenantEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getTenantId();
-                    };
-                }
-                break;
-            case true:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/MaintainPlanItem") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getPlanId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/MaintainPlanItem") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getPlanId();
-                    };
-                }
-                break;
-            case true:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getDeviceId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getDeviceId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getDeviceId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getDeviceId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getDeviceId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getDeviceId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getDeviceId();
-                    };
-                }
-                break;
-            case true:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getDeviceCode();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getDeviceCode();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getDeviceCode();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getDeviceCode();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getDeviceCode();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getDeviceCode();
-                    };
-                }
-                break;
-            case true:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getIsAuto();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getIsAuto();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getIsAuto();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getIsAuto();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getIsAuto();
-                    };
-                }
-                break;
-            case true:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getDeviceTypeId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getDeviceTypeId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getDeviceTypeId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getDeviceTypeId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getDeviceTypeId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getDeviceTypeId();
-                    };
-                }
-                break;
-            case true:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getDeviceName();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getDeviceName();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getDeviceName();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getDeviceName();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getDeviceName();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getDeviceName();
-                    };
-                }
-                break;
-            case true:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getCode();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getCode();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getCode();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getCode();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getCode();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getCode();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getCode();
-                    };
-                }
-                break;
-        }
-        throw new IllegalArgumentException("Invalid lambda deserialization");
-    }
 
-    public MaintainPlanServiceImpl(final OssBuilder ossBuilder, final IMaintainPlanItemService maintainPlanItemService, final IMachineService machineService, final ICodeGeneratorService codeGeneratorService, final IMaintainProjectService maintainProjectService, final IMaintainProjectItemService maintainProjectItemService, final BusinessSendFactory businessSendFactory, final IBusinessNotifyStateService businessNotifyStateService) {
+    public MaintainPlanServiceImpl(OssBuilder ossBuilder,IMaintainPlanItemService maintainPlanItemService, IMachineService machineService, ICodeGeneratorService codeGeneratorService, IMaintainProjectService maintainProjectService, IMaintainProjectItemService maintainProjectItemService, BusinessSendFactory businessSendFactory, IBusinessNotifyStateService businessNotifyStateService) {
         this.ossBuilder = ossBuilder;
         this.maintainPlanItemService = maintainPlanItemService;
         this.machineService = machineService;
@@ -607,9 +144,11 @@
         updateMaintainPlan.setUpdateTime(LocalDateTimeUtils.LocalDateTimeToDate(now));
         List<MaintainPlan> maintainPlanList = checkPlanStatus(Arrays.asList(updateMaintainPlan), now);
         updateBatchById(maintainPlanList);
+        this.maintainPlanItemService.remove(Wrappers.<MaintainPlanItem>query().lambda().in(MaintainPlanItem::getPlanId, maintainPlan.getId()));
+        /*
         this.maintainPlanItemService.remove((Wrapper) Wrappers.query().lambda().in((v0) -> {
             return v0.getPlanId();
-        }, new Object[]{maintainPlan.getId()}));
+        }, new Object[]{maintainPlan.getId()}));*/
         List<MaintainPlanItem> maintainPlanItemList = new ArrayList<>();
         maintainPlanUpdateVO.getMaintainItemList().forEach(maintainItem -> {
             MaintainPlanItem bean = new MaintainPlanItem();
@@ -626,7 +165,7 @@
     @Override // org.springblade.modules.tpm.service.IMaintainPlanService
     public MaintainPlanVO getMaintainPlan(Long id) {
         MaintainPlanVO maintainPlanVO = (MaintainPlanVO) Optional.ofNullable(getById(id)).map(maintainPlan -> {
-            MaintainPlanVO bean = MaintainPlanConvert.INSTANCE.convert((MaintainPlanConvert) maintainPlan);
+            MaintainPlanVO bean = MaintainPlanConvert.INSTANCE.convert(maintainPlan);
             bean.setPlanStatusName(MaintainPlanStatusEnum.getDescDetail(bean.getPlanStatus()));
             bean.setMaintainNatureName(RepairNatureEnum.getDescDetail(bean.getMaintainNature()));
             bean.setIsAutoName(MaintainPlanIsAutoEnum.getDescDetail(bean.getIsAuto()));
@@ -639,9 +178,16 @@
 
     @Override // org.springblade.modules.tpm.service.IMaintainPlanService
     public List<MaintainPlanVO> queryMaintainPlanList(MaintainPlanSearchVO maintainPlanSearchVO) {
-        List<MaintainPlan> list;
-        new ArrayList();
+    	List<MaintainPlan> list = new ArrayList<>();
+    	
         if (!maintainPlanSearchVO.getFilterPlus().booleanValue()) {
+        	list = list(Wrappers.<MaintainPlan>query().lambda().in((maintainPlanSearchVO.getDeviceTypeId() != null), MaintainPlan::getDeviceTypeId, new Object[] { maintainPlanSearchVO.getDeviceTypeId() }).eq((maintainPlanSearchVO.getDeviceId() != null), MaintainPlan::getDeviceId, maintainPlanSearchVO.getDeviceId())
+        	          .eq(maintainPlanSearchVO.getIsAuto() != null, MaintainPlan::getIsAuto, maintainPlanSearchVO.getIsAuto())
+        	          .in(CollectionUtil.isNotEmpty(maintainPlanSearchVO.getPlanStatusList()), MaintainPlan::getPlanStatus, maintainPlanSearchVO.getPlanStatusList())
+        	          .and(Func.isNotEmpty(maintainPlanSearchVO.getKeyWord()), i -> i.likeRight(MaintainPlan::getDeviceName, maintainPlanSearchVO.getKeyWord()).or().likeRight(MaintainPlan::getCode, maintainPlanSearchVO.getKeyWord()).or().likeRight(MaintainPlan::getDeviceCode, maintainPlanSearchVO.getKeyWord()))
+        	          
+        	          .orderByAsc(MaintainPlan::getMaintainDate));
+        	/*
             list = list((Wrapper) Wrappers.query().lambda().in(maintainPlanSearchVO.getDeviceTypeId() != null, (v0) -> {
                 return v0.getDeviceTypeId();
             }, new Object[]{maintainPlanSearchVO.getDeviceTypeId()}).eq(maintainPlanSearchVO.getDeviceId() != null, (v0) -> {
@@ -660,8 +206,18 @@
                 }, maintainPlanSearchVO.getKeyWord());
             }).orderByAsc((v0) -> {
                 return v0.getMaintainDate();
-            }));
+            }));*/
         } else {
+        	list = list(Condition.getQueryWrapper(maintainPlanSearchVO.getParam(), MaintainPlan.class).lambda()
+        			.in(maintainPlanSearchVO.getDeviceTypeId() != null, MaintainPlan::getDeviceTypeId, new Object[] { maintainPlanSearchVO.getDeviceTypeId() })
+        				.eq((maintainPlanSearchVO.getDeviceId() != null), MaintainPlan::getDeviceId, maintainPlanSearchVO.getDeviceId())
+        	          .eq((maintainPlanSearchVO.getIsAuto() != null), MaintainPlan::getIsAuto, maintainPlanSearchVO.getIsAuto())
+        	          .in(CollectionUtil.isNotEmpty(maintainPlanSearchVO.getPlanStatusList()), MaintainPlan::getPlanStatus, maintainPlanSearchVO.getPlanStatusList())
+        	          .and(Func.isNotEmpty(maintainPlanSearchVO.getKeyWord()), i -> i.likeRight(MaintainPlan::getDeviceName, maintainPlanSearchVO.getKeyWord()).or().likeRight(MaintainPlan::getCode, maintainPlanSearchVO.getKeyWord()).or().likeRight(MaintainPlan::getDeviceCode, maintainPlanSearchVO.getKeyWord()))
+        	          
+        	          .orderByAsc(MaintainPlan::getMaintainDate));
+        	
+        	/*
             list = list((Wrapper) Condition.getQueryWrapper(maintainPlanSearchVO.getParam(), MaintainPlan.class).lambda().in(maintainPlanSearchVO.getDeviceTypeId() != null, (v0) -> {
                 return v0.getDeviceTypeId();
             }, new Object[]{maintainPlanSearchVO.getDeviceTypeId()}).eq(maintainPlanSearchVO.getDeviceId() != null, (v0) -> {
@@ -680,9 +236,9 @@
                 }, maintainPlanSearchVO.getKeyWord());
             }).orderByAsc((v0) -> {
                 return v0.getMaintainDate();
-            }));
+            }));*/
         }
-        List<MaintainPlanVO> result = MaintainPlanConvert.INSTANCE.convert((List) list);
+        List<MaintainPlanVO> result = MaintainPlanConvert.INSTANCE.convert( list);
         result.forEach(bean -> {
             bean.setPlanStatusName(MaintainPlanStatusEnum.getDescDetail(bean.getPlanStatus()));
             bean.setIsAutoName(MaintainPlanIsAutoEnum.getDescDetail(bean.getIsAuto()));
@@ -695,6 +251,17 @@
     public IPage<MaintainPlanVO> queryMaintainPlanPage(MaintainPlanSearchVO maintainPlanSearchVO, Query query) {
         IPage<MaintainPlan> pages;
         if (!maintainPlanSearchVO.getFilterPlus().booleanValue()) {
+        	pages = page(Condition.getPage(query), Wrappers.<MaintainPlan>query().lambda()
+        			.in(maintainPlanSearchVO.getDeviceTypeId() != null, MaintainPlan::getDeviceTypeId, new Object[] { maintainPlanSearchVO.getDeviceTypeId()})
+        			.eq((maintainPlanSearchVO.getDeviceId() != null), MaintainPlan::getDeviceId, maintainPlanSearchVO.getDeviceId())
+        	          .eq((maintainPlanSearchVO.getIsAuto() != null), MaintainPlan::getIsAuto, maintainPlanSearchVO.getIsAuto())
+        	          .in(CollectionUtil.isNotEmpty(maintainPlanSearchVO.getPlanStatusList()), MaintainPlan::getPlanStatus, maintainPlanSearchVO.getPlanStatusList())
+        	          .and(Func.isNotEmpty(maintainPlanSearchVO.getKeyWord()), i -> i.likeRight(MaintainPlan::getDeviceName, maintainPlanSearchVO.getKeyWord()).or().likeRight(MaintainPlan::getCode, maintainPlanSearchVO.getKeyWord()).or().likeRight(MaintainPlan::getDeviceCode, maintainPlanSearchVO.getKeyWord()))
+        	          
+        	          .orderByDesc(MaintainPlan::getCreateTime).orderByDesc(MaintainPlan::getId)
+        			);
+        	
+        	/*
             pages = page(Condition.getPage(query), (Wrapper) ((LambdaQueryWrapper) Wrappers.query().lambda().in(maintainPlanSearchVO.getDeviceTypeId() != null, (v0) -> {
                 return v0.getDeviceTypeId();
             }, new Object[]{maintainPlanSearchVO.getDeviceTypeId()}).eq(maintainPlanSearchVO.getDeviceId() != null, (v0) -> {
@@ -715,8 +282,19 @@
                 return v0.getCreateTime();
             })).orderByDesc((v0) -> {
                 return v0.getId();
-            }));
+            }));*/
         } else {
+        	pages = page(Condition.getPage(query), Condition.getQueryWrapper(maintainPlanSearchVO.getParam(), MaintainPlan.class)
+        	          
+        	          .lambda().in((maintainPlanSearchVO.getDeviceTypeId() != null), MaintainPlan::getDeviceTypeId, new Object[] { maintainPlanSearchVO.getDeviceTypeId() })
+        			.eq((maintainPlanSearchVO.getDeviceId() != null), MaintainPlan::getDeviceId, maintainPlanSearchVO.getDeviceId())
+        	          .eq((maintainPlanSearchVO.getIsAuto() != null), MaintainPlan::getIsAuto, maintainPlanSearchVO.getIsAuto())
+        	          .in(CollectionUtil.isNotEmpty(maintainPlanSearchVO.getPlanStatusList()), MaintainPlan::getPlanStatus, maintainPlanSearchVO.getPlanStatusList())
+        	          .and(Func.isNotEmpty(maintainPlanSearchVO.getKeyWord()), i -> i.likeRight(MaintainPlan::getDeviceName, maintainPlanSearchVO.getKeyWord()).or().likeRight(MaintainPlan::getCode, maintainPlanSearchVO.getKeyWord()).or().likeRight(MaintainPlan::getDeviceCode, maintainPlanSearchVO.getKeyWord()))
+        	          
+        	          .orderByDesc(MaintainPlan::getCreateTime).orderByDesc(MaintainPlan::getId));
+        	
+        	/*
             pages = page(Condition.getPage(query), (Wrapper) ((LambdaQueryWrapper) Condition.getQueryWrapper(maintainPlanSearchVO.getParam(), MaintainPlan.class).lambda().in(maintainPlanSearchVO.getDeviceTypeId() != null, (v0) -> {
                 return v0.getDeviceTypeId();
             }, new Object[]{maintainPlanSearchVO.getDeviceTypeId()}).eq(maintainPlanSearchVO.getDeviceId() != null, (v0) -> {
@@ -737,9 +315,9 @@
                 return v0.getCreateTime();
             })).orderByDesc((v0) -> {
                 return v0.getId();
-            }));
+            }));*/
         }
-        IPage<MaintainPlanVO> result = MaintainPlanConvert.INSTANCE.convert((IPage) pages);
+        IPage<MaintainPlanVO> result = MaintainPlanConvert.INSTANCE.convert(pages);
         result.getRecords().forEach(bean -> {
             bean.setPlanStatusName(MaintainPlanStatusEnum.getDescDetail(bean.getPlanStatus()));
             bean.setIsAutoName(MaintainPlanIsAutoEnum.getDescDetail(bean.getIsAuto()));
@@ -774,9 +352,11 @@
             }
         }
         removeByIds(maintainPlanIdListVO.getIdList());
+        this.maintainPlanItemService.remove(Wrappers.<MaintainPlanItem>query().lambda().in(MaintainPlanItem::getPlanId, maintainPlanIdListVO.getIdList()));
+        /*
         this.maintainPlanItemService.remove((Wrapper) Wrappers.query().lambda().in((v0) -> {
             return v0.getPlanId();
-        }, maintainPlanIdListVO.getIdList()));
+        }, maintainPlanIdListVO.getIdList()));*/
         for (MaintainPlan bean2 : maintainPlanList) {
             this.machineService.updateDeviceMaintainStatus(bean2.getDeviceId(), bean2.getId(), null);
         }
@@ -804,17 +384,24 @@
 
     @Override // org.springblade.modules.tpm.service.IMaintainPlanService
     public List<MaintainPlan> getMaintainPlanListByStatus(List<Integer> statusList) {
+    	return list(Wrappers.<MaintainPlan>query().lambda().in(MaintainPlan::getPlanStatus, statusList)
+    	        .eq(Func.isNotBlank(AuthUtil.getTenantId()), MaintainPlan::getTenantId, AuthUtil.getTenantId()).orderByAsc(MaintainPlan::getMaintainDate));
+    	/*
         return list((Wrapper) ((LambdaQueryWrapper) Wrappers.query().lambda().in((v0) -> {
             return v0.getPlanStatus();
         }, statusList)).eq(Func.isNotBlank(AuthUtil.getTenantId()), (v0) -> {
             return v0.getTenantId();
         }, AuthUtil.getTenantId()).orderByAsc((v0) -> {
             return v0.getMaintainDate();
-        }));
+        }));*/
     }
 
     @Override // org.springblade.modules.tpm.service.IMaintainPlanService
     public List<MaintainPlan> getMaintainPlanListByStatusAndProjectId(List<Integer> statusList, Long projectId) {
+    	return list(Wrappers.<MaintainPlan>query().lambda().in(MaintainPlan::getPlanStatus, statusList)
+    	        .eq(Func.isNotBlank(AuthUtil.getTenantId()), MaintainPlan::getTenantId, AuthUtil.getTenantId())
+    	        .eq(Func.isNotEmpty(projectId), MaintainPlan::getProjectId, projectId).orderByAsc(MaintainPlan::getMaintainDate));
+    	/*
         return list((Wrapper) ((LambdaQueryWrapper) Wrappers.query().lambda().in((v0) -> {
             return v0.getPlanStatus();
         }, statusList)).eq(Func.isNotBlank(AuthUtil.getTenantId()), (v0) -> {
@@ -823,7 +410,7 @@
             return v0.getProjectId();
         }, projectId).orderByAsc((v0) -> {
             return v0.getMaintainDate();
-        }));
+        }));*/
     }
 
     @Override // org.springblade.modules.tpm.service.IMaintainPlanService
@@ -834,7 +421,7 @@
         if (list.isEmpty()) {
             return true;
         }
-        List<Long> planIdList = (List) list.stream().map((v0) -> {
+        List<Long> planIdList = list.stream().map((v0) -> {
             return v0.getId();
         }).distinct().collect(Collectors.toList());
         List<MaintainPlan> planList = listByIds(planIdList);
@@ -849,13 +436,16 @@
 
     @Override // org.springblade.modules.tpm.service.IMaintainPlanService
     public List<MaintainPlanVO> queryMaintainPlanListByStatus(Integer planStatus) {
+    	List<MaintainPlan> list = list(Wrappers.<MaintainPlan>query().lambda().eq(Func.isNotEmpty(planStatus), MaintainPlan::getPlanStatus, planStatus)
+    	        .eq(Func.isNotBlank(AuthUtil.getTenantId()), MaintainPlan::getTenantId, AuthUtil.getTenantId()).orderByAsc(MaintainPlan::getMaintainDate));
+    	/*
         List<MaintainPlan> list = list((Wrapper) Wrappers.query().lambda().eq(Func.isNotEmpty(planStatus), (v0) -> {
             return v0.getPlanStatus();
         }, planStatus).eq(Func.isNotBlank(AuthUtil.getTenantId()), (v0) -> {
             return v0.getTenantId();
         }, AuthUtil.getTenantId()).orderByAsc((v0) -> {
             return v0.getMaintainDate();
-        }));
+        }));*/
         return MaintainPlanConvert.INSTANCE.convert((List) list);
     }
 
@@ -922,13 +512,18 @@
     }
 
     private boolean checkCodeIsExist(String code, Long id) {
+    	List<MaintainPlan> maintainPlanList = this.baseMapper.selectList(Wrappers.<MaintainPlan>query()
+    			.lambda().eq(Func.isNotEmpty(AuthUtil.getTenantId()), MaintainPlan::getTenantId, AuthUtil.getTenantId())
+    			.in(Func.isNotBlank(code), MaintainPlan::getCode, Func.toStrList(code)).notIn(
+    	          Func.isNotEmpty(id), MaintainPlan::getId, new Object[] { id }));
+    	/*
         List<MaintainPlan> maintainPlanList = this.baseMapper.selectList(Wrappers.query().lambda().eq(Func.isNotEmpty(AuthUtil.getTenantId()), (v0) -> {
             return v0.getTenantId();
         }, AuthUtil.getTenantId()).in(Func.isNotBlank(code), (v0) -> {
             return v0.getCode();
         }, Func.toStrList(code)).notIn(Func.isNotEmpty(id), (v0) -> {
             return v0.getId();
-        }, new Object[]{id}));
+        }, new Object[]{id}));*/
         return maintainPlanList != null && maintainPlanList.size() > 0;
     }
 
@@ -936,6 +531,15 @@
     public IPage<MaintainPlanVO> queryMaintainPlanPageByPlanStatus(MaintainPlanSearchByPlanStatusVO maintainPlanSearchByPlanStatusVO, Query query) {
         IPage<MaintainPlan> pages;
         if (!maintainPlanSearchByPlanStatusVO.getFilterPlus().booleanValue()) {
+        	pages = page(Condition.getPage(query), Wrappers.<MaintainPlan>query().lambda()
+        			.in((maintainPlanSearchByPlanStatusVO.getDeviceTypeId() != null), MaintainPlan::getDeviceTypeId, new Object[] { maintainPlanSearchByPlanStatusVO.getDeviceTypeId() })
+        			.eq((maintainPlanSearchByPlanStatusVO.getDeviceId() != null), MaintainPlan::getDeviceId, maintainPlanSearchByPlanStatusVO.getDeviceId())
+        	          .and(Func.isNotEmpty(maintainPlanSearchByPlanStatusVO.getKeyWord()), i -> i.like(MaintainPlan::getDeviceName, maintainPlanSearchByPlanStatusVO.getKeyWord()).or().like(MaintainPlan::getCode, maintainPlanSearchByPlanStatusVO.getKeyWord()).or().like(MaintainPlan::getDeviceCode, maintainPlanSearchByPlanStatusVO.getKeyWord()))
+        	          
+        	          .eq((maintainPlanSearchByPlanStatusVO.getPlanStatus() != null), MaintainPlan::getPlanStatus, maintainPlanSearchByPlanStatusVO.getPlanStatus())
+        	          .orderByAsc(MaintainPlan::getMaintainDate));
+        	
+        	/*
             pages = page(Condition.getPage(query), (Wrapper) Wrappers.query().lambda().in(maintainPlanSearchByPlanStatusVO.getDeviceTypeId() != null, (v0) -> {
                 return v0.getDeviceTypeId();
             }, new Object[]{maintainPlanSearchByPlanStatusVO.getDeviceTypeId()}).eq(maintainPlanSearchByPlanStatusVO.getDeviceId() != null, (v0) -> {
@@ -952,8 +556,17 @@
                 return v0.getPlanStatus();
             }, maintainPlanSearchByPlanStatusVO.getPlanStatus()).orderByAsc((v0) -> {
                 return v0.getMaintainDate();
-            }));
+            }));*/
         } else {
+        	pages = page(Condition.getPage(query),Condition.getQueryWrapper(maintainPlanSearchByPlanStatusVO.getParam(), MaintainPlan.class)
+        	          
+        	          .lambda().in((maintainPlanSearchByPlanStatusVO.getDeviceTypeId() != null), MaintainPlan::getDeviceTypeId, new Object[] { maintainPlanSearchByPlanStatusVO.getDeviceTypeId() })
+        	          .eq((maintainPlanSearchByPlanStatusVO.getDeviceId() != null), MaintainPlan::getDeviceId, maintainPlanSearchByPlanStatusVO.getDeviceId())
+        	          .and(Func.isNotEmpty(maintainPlanSearchByPlanStatusVO.getKeyWord()), i -> i.like(MaintainPlan::getDeviceName, maintainPlanSearchByPlanStatusVO.getKeyWord()).or().like(MaintainPlan::getCode, maintainPlanSearchByPlanStatusVO.getKeyWord()).or().like(MaintainPlan::getDeviceCode, maintainPlanSearchByPlanStatusVO.getKeyWord()))
+        	          
+        	          .eq((maintainPlanSearchByPlanStatusVO.getPlanStatus() != null), MaintainPlan::getPlanStatus, maintainPlanSearchByPlanStatusVO.getPlanStatus())
+        	          .orderByAsc(MaintainPlan::getMaintainDate));
+        	/*
             pages = page(Condition.getPage(query), (Wrapper) Condition.getQueryWrapper(maintainPlanSearchByPlanStatusVO.getParam(), MaintainPlan.class).lambda().in(maintainPlanSearchByPlanStatusVO.getDeviceTypeId() != null, (v0) -> {
                 return v0.getDeviceTypeId();
             }, new Object[]{maintainPlanSearchByPlanStatusVO.getDeviceTypeId()}).eq(maintainPlanSearchByPlanStatusVO.getDeviceId() != null, (v0) -> {
@@ -970,9 +583,9 @@
                 return v0.getPlanStatus();
             }, maintainPlanSearchByPlanStatusVO.getPlanStatus()).orderByAsc((v0) -> {
                 return v0.getMaintainDate();
-            }));
+            }));*/
         }
-        IPage<MaintainPlanVO> result = MaintainPlanConvert.INSTANCE.convert((IPage) pages);
+        IPage<MaintainPlanVO> result = MaintainPlanConvert.INSTANCE.convert(pages);
         result.getRecords().forEach(bean -> {
             bean.setPlanStatusName(MaintainPlanStatusEnum.getDescDetail(bean.getPlanStatus()));
             bean.setMaintainNatureName(RepairNatureEnum.getDescDetail(bean.getMaintainNature()));
@@ -985,6 +598,13 @@
     public Boolean createMaintainPlanAuto(MaintainPlanAutoAddVO maintainPlanAutoAddVO) {
         List<DeviceSimpleDTO> deviceSimpleDTOList = this.machineService.deviceListByDeviceIdList(maintainPlanAutoAddVO.getDeviceIdList());
         List<MaintainProject> maintainProjectList = this.maintainProjectService.listByIds(maintainPlanAutoAddVO.getMaintainProjectIdList());
+        List<MaintainPlan> maintainPlanList = this.baseMapper.selectList(Wrappers.<MaintainPlan>query().lambda()
+        		.eq(Func.isNotEmpty(AuthUtil.getTenantId()), MaintainPlan::getTenantId, AuthUtil.getTenantId())
+                .in(MaintainPlan::getDeviceId, maintainPlanAutoAddVO.getDeviceIdList())
+                .in(MaintainPlan::getProjectId, maintainPlanAutoAddVO.getMaintainProjectIdList())
+                .eq(MaintainPlan::getIsAuto, Integer.valueOf(MaintainPlanIsAutoEnum.T1.getType()))
+                .ne(MaintainPlan::getPlanStatus, Integer.valueOf(MaintainPlanStatusEnum.T5.getType())));
+        /*
         List<MaintainPlan> maintainPlanList = this.baseMapper.selectList((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.query().lambda().eq(Func.isNotEmpty(AuthUtil.getTenantId()), (v0) -> {
             return v0.getTenantId();
         }, AuthUtil.getTenantId()).in((v0) -> {
@@ -995,17 +615,21 @@
             return v0.getIsAuto();
         }, Integer.valueOf(MaintainPlanIsAutoEnum.T1.getType()))).ne((v0) -> {
             return v0.getPlanStatus();
-        }, Integer.valueOf(MaintainPlanStatusEnum.T5.getType())));
+        }, Integer.valueOf(MaintainPlanStatusEnum.T5.getType())));*/
         Set<String> set = new HashSet<>();
         maintainPlanList.forEach(i -> {
             set.add(String.valueOf(i.getDeviceId()) + String.valueOf(i.getProjectId()));
         });
         for (MaintainProject maintainProject : maintainProjectList) {
+        	List<MaintainProjectItem> maintainProjectItemList = this.maintainProjectItemService.list(Wrappers.<MaintainProjectItem>query().lambda()
+        			.eq(Func.isNotEmpty(AuthUtil.getTenantId()), MaintainProjectItem::getTenantId, AuthUtil.getTenantId())
+        	          .eq(MaintainProjectItem::getProjectId, maintainProject.getId()));
+        	/*
             List<MaintainProjectItem> maintainProjectItemList = this.maintainProjectItemService.list((Wrapper) Wrappers.query().lambda().eq(Func.isNotEmpty(AuthUtil.getTenantId()), (v0) -> {
                 return v0.getTenantId();
             }, AuthUtil.getTenantId()).eq((v0) -> {
                 return v0.getProjectId();
-            }, maintainProject.getId()));
+            }, maintainProject.getId()));*/
             for (DeviceSimpleDTO deviceSimpleDTO : deviceSimpleDTOList) {
                 if (!set.contains(String.valueOf(deviceSimpleDTO.getDeviceId()) + maintainProject.getId())) {
                     MaintainPlanBatchVO maintainPlanBatchVO = MaintainPlanBatchVO.builder().deviceSimpleDTO(deviceSimpleDTO).maintainProject(maintainProject).maintainProjectItemList(maintainProjectItemList).lastTime(null).remark(maintainPlanAutoAddVO.getRemark()).maintainUserId(maintainPlanAutoAddVO.getMaintainUserId()).maintainUserName(maintainPlanAutoAddVO.getMaintainUserName()).maintainNature(maintainPlanAutoAddVO.getMaintainNature()).notifyBusinessSend(maintainPlanAutoAddVO.getNotifyBusinessSend()).build();

--
Gitblit v1.9.3