精简根据主键查询时的where条件。

Author: abel533

src/main/java/com/github/abel533/entity/BaseProvider.java

@@ -24,12 +24,14 @@
 
 package com.github.abel533.entity;
 
+import com.github.abel533.mapperhelper.EntityHelper;
 import com.github.abel533.mapperhelper.MapperTemplate;
 import org.apache.ibatis.jdbc.SQL;
 import org.apache.ibatis.reflection.MetaObject;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * 基础类
@@ -110,14 +112,29 @@ protected MetaObject getExample(Map<String, Object> params) {
         }
         //根据Example的结构，通过判断是否包含某些属性来判断条件是否为合法的example类型
         MetaObject example = MapperTemplate.forObject(result);
-        if(example.hasGetter("orderByClause")
-                &&example.hasGetter("oredCriteria")
-                &&example.hasGetter("distinct")){
+        if (example.hasGetter("orderByClause")
+                && example.hasGetter("oredCriteria")
+                && example.hasGetter("distinct")) {
             return example;
         }
         throw new IllegalArgumentException("Example参数不是合法的Mybatis Example对象!");
     }
 
+    /**
+     * 根据主键查询
+     *
+     * @param sql
+     * @param metaObject
+     * @param columns
+     * @param suffix
+     */
+    protected void applyWherePk(SQL sql, MetaObject metaObject, Set<EntityHelper.EntityColumn> columns, String suffix) {
+        for (EntityHelper.EntityColumn column : columns) {
+            notNullKeyProperty(column.getProperty(), metaObject.getValue(column.getProperty()));
+            sql.WHERE(column.getColumn() + "=#{" + (suffix != null ? suffix + "." : "") + column.getProperty() + "}");
+        }
+    }
+
     /**
      * Example条件
      */

src/main/java/com/github/abel533/entity/CommonProvider.java

@@ -158,12 +158,7 @@ public String selectByPrimaryKey(final Map<String, Object> params) {
                 notNullKeyProperty(column.getProperty(), entity);
                 WHERE(column.getColumn() + "=#{key}");
             } else {
-                MetaObject metaObject = MapperTemplate.forObject(entity);
-                for (EntityHelper.EntityColumn column : entityTable.getEntityClassPKColumns()) {
-                    Object value = metaObject.getValue(column.getProperty());
-                    notNullKeyProperty(column.getProperty(), value);
-                    WHERE(column.getColumn() + "=#{key." + column.getProperty() + "}");
-                }
+                applyWherePk(this, MapperTemplate.forObject(entity), entityTable.getEntityClassPKColumns(), "key");
             }
         }}.toString();
     }
@@ -176,7 +171,6 @@ public String selectByPrimaryKey(final Map<String, Object> params) {
      */
     public String insert(final Map<String, Object> params) {
         return new SQL() {{
-            Object entity = getEntity(params);
             Class<?> entityClass = getEntityClass(params);
             EntityHelper.EntityTable entityTable = EntityHelper.getEntityTable(entityClass);
             INSERT_INTO(entityTable.getName());
@@ -259,12 +253,7 @@ public String deleteByPrimaryKey(final Map<String, Object> params) {
                 notNullKeyProperty(column.getProperty(), entity);
                 WHERE(column.getColumn() + "=#{key}");
             } else {
-                MetaObject metaObject = MapperTemplate.forObject(entity);
-                for (EntityHelper.EntityColumn column : entityTable.getEntityClassPKColumns()) {
-                    Object value = metaObject.getValue(column.getProperty());
-                    notNullKeyProperty(column.getProperty(), value);
-                    WHERE(column.getColumn() + "=#{key." + column.getProperty() + "}");
-                }
+                applyWherePk(this, MapperTemplate.forObject(entity), entityTable.getEntityClassPKColumns(), "key");
             }
         }}.toString();
     }
@@ -288,17 +277,7 @@ public String updateByPrimaryKey(final Map<String, Object> params) {
                     SET(column.getColumn() + "=#{record." + column.getProperty() + "}");
                 }
             }
-            if (entityTable.getEntityClassPKColumns().size() == 1) {
-                EntityHelper.EntityColumn column = entityTable.getEntityClassPKColumns().iterator().next();
-                notNullKeyProperty(column.getProperty(), metaObject.getValue(column.getProperty()));
-                WHERE(column.getColumn() + "=#{record." + column.getProperty() + "}");
-            } else {
-                for (EntityHelper.EntityColumn column : entityTable.getEntityClassPKColumns()) {
-                    Object value = metaObject.getValue(column.getProperty());
-                    notNullKeyProperty(column.getProperty(), value);
-                    WHERE(column.getColumn() + "=#{record." + column.getProperty() + "}");
-                }
-            }
+            applyWherePk(this, metaObject, entityTable.getEntityClassPKColumns(), "record");
         }}.toString();
     }
 
@@ -322,16 +301,7 @@ public String updateByPrimaryKeySelective(final Map<String, Object> params) {
                     SET(column.getColumn() + "=#{record." + column.getProperty() + "}");
                 }
             }
-            if (entityTable.getEntityClassPKColumns().size() == 1) {
-                EntityHelper.EntityColumn column = entityTable.getEntityClassPKColumns().iterator().next();
-                notNullKeyProperty(column.getProperty(), metaObject.getValue(column.getProperty()));
-                WHERE(column.getColumn() + "=#{record." + column.getProperty() + "}");
-            } else {
-                for (EntityHelper.EntityColumn column : entityTable.getEntityClassPKColumns()) {
-                    notNullKeyProperty(column.getProperty(), metaObject.getValue(column.getProperty()));
-                    WHERE(column.getColumn() + "=#{record." + column.getProperty() + "}");
-                }
-            }
+            applyWherePk(this, metaObject, entityTable.getEntityClassPKColumns(), "record");
         }}.toString();
     }