From 53280151160d772f3490ca05d2de56d70089dfc0 Mon Sep 17 00:00:00 2001
From: hewei <hewei@itfsw.com>
Date: Wed, 16 May 2018 15:43:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E8=BF=87=E6=9C=9F=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plugins/LogicalDeletePlugin.java          | 20 -------------------
 .../plugins/LogicalDeletePluginTest.java      |  2 +-
 2 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/src/main/java/com/itfsw/mybatis/generator/plugins/LogicalDeletePlugin.java b/src/main/java/com/itfsw/mybatis/generator/plugins/LogicalDeletePlugin.java
index b80a6e0..470b8e0 100644
--- a/src/main/java/com/itfsw/mybatis/generator/plugins/LogicalDeletePlugin.java
+++ b/src/main/java/com/itfsw/mybatis/generator/plugins/LogicalDeletePlugin.java
@@ -461,12 +461,6 @@ public class LogicalDeletePlugin extends BasePlugin {
                 } else {
                     logicalDeleteValue = this.logicalDeleteValue;
                 }
-                // TODO 过期
-                Field field = JavaElementGeneratorTools.generateStaticFinalField("DEL_FLAG_OFF", this.logicalDeleteColumn.getFullyQualifiedJavaType(), logicalDeleteValue);
-                field.addAnnotation("@Deprecated");
-                commentGenerator.addFieldComment(field, introspectedTable);
-                // 常量插入到第一位
-                fields.add(0, field);
 
                 Field logicalDeleteConstField = JavaElementGeneratorTools.generateStaticFinalField(this.logicalDeleteConstName, this.logicalDeleteColumn.getFullyQualifiedJavaType(), logicalDeleteValue);
                 commentGenerator.addFieldComment(logicalDeleteConstField, introspectedTable);
@@ -485,13 +479,6 @@ public class LogicalDeletePlugin extends BasePlugin {
                     logicalUnDeleteValue = this.logicalUnDeleteValue;
                 }
 
-                // TODO 过期
-                Field field1 = JavaElementGeneratorTools.generateStaticFinalField("DEL_FLAG_ON", this.logicalDeleteColumn.getFullyQualifiedJavaType(), logicalUnDeleteValue);
-                field1.addAnnotation("@Deprecated");
-                commentGenerator.addFieldComment(field1, introspectedTable);
-                // 常量插入到第一位
-                fields.add(0, field1);
-
                 Field logicalUnDeleteConstField = JavaElementGeneratorTools.generateStaticFinalField(this.logicalUnDeleteConstName, this.logicalDeleteColumn.getFullyQualifiedJavaType(), logicalUnDeleteValue);
                 commentGenerator.addFieldComment(logicalUnDeleteConstField, introspectedTable);
                 fields.add(0, logicalUnDeleteConstField);
@@ -565,13 +552,6 @@ public class LogicalDeletePlugin extends BasePlugin {
                     method.addBodyLine(sb.toString());
 
                     FormatTools.addMethodWithBestPosition(innerClass, method);
-
-                    // TODO 过期方法
-                    Method mAndDeleted = new Method(method);
-                    mAndDeleted.setName("andDeleted");
-                    mAndDeleted.addAnnotation("@Deprecated");
-                    FormatTools.addMethodWithBestPosition(innerClass, mAndDeleted);
-                    logger.debug("itfsw(逻辑删除插件):" + topLevelClass.getType().getShortName() + "." + innerClass.getType().getShortName() + "增加andDeleted方法。");
                 }
             }
         }
diff --git a/src/test/java/com/itfsw/mybatis/generator/plugins/LogicalDeletePluginTest.java b/src/test/java/com/itfsw/mybatis/generator/plugins/LogicalDeletePluginTest.java
index 75e3a86..79655fe 100644
--- a/src/test/java/com/itfsw/mybatis/generator/plugins/LogicalDeletePluginTest.java
+++ b/src/test/java/com/itfsw/mybatis/generator/plugins/LogicalDeletePluginTest.java
@@ -141,7 +141,7 @@ public class LogicalDeletePluginTest {
 
                 ObjectUtil tbExample = new ObjectUtil(loader, packagz + ".TbExample");
                 ObjectUtil criteria = new ObjectUtil(tbExample.invoke("createCriteria"));
-                criteria.invoke("andDeleted", true);
+                criteria.invoke("andLogicalDeleted", true);
                 criteria.invoke("andIdEqualTo", 3l);