Update BizId to support any type

starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/annotation/BizId.java

 package com.schbrain.framework.autoconfigure.mybatis.annotation;
 
+import com.schbrain.framework.autoconfigure.mybatis.biz.BizIdColumnField;
 import com.schbrain.framework.autoconfigure.mybatis.biz.BizIdType;
 
 import java.lang.annotation.*;
@@ -16,7 +17,7 @@ public @interface BizId {
     /**
      * 逻辑主键列名,为空时取字段名
      *
-     * @see com.schbrain.framework.autoconfigure.mybatis.core.BizIdColumnField
+     * @see BizIdColumnField
      */
     String value() default "";
 
@@ -25,4 +26,4 @@ public @interface BizId {
      */
     BizIdType type() default BizIdType.ID_WORKER;
 
-}
+}
\ No newline at end of file

starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/base/BaseService.java

@@ -29,31 +29,31 @@ public interface BaseService<T extends BaseEntity> extends IService<T> {
     /**
      * 根据业务主键获取记录
      */
-    T getByBizId(String bizId);
+    T getByBizId(Object bizId);
 
     /**
      * 根据业务主键获取记录
      *
      * @param throwIfNotFound 未获取到记录时是否抛异常
      */
-    T getByBizId(String bizId, boolean throwIfNotFound);
+    T getByBizId(Object bizId, boolean throwIfNotFound);
 
     /**
      * 根据业务主键获取记录
      *
      * @param notFoundSupplier 未获取到记录时是否抛异常
      */
-    T getByBizId(String bizId, Supplier<? extends RuntimeException> notFoundSupplier);
+    T getByBizId(Object bizId, Supplier<? extends RuntimeException> notFoundSupplier);
 
     /**
      * 根据业务主键获取
      */
-    List<T> listByBizIds(Collection<String> bizIds);
+    <K> List<T> listByBizIds(Collection<K> bizIds);
 
     /**
      * 根据业务主键获取
      */
-    Map<String, T> getMapByBizIds(Collection<String> bizIds);
+    <K> Map<K, T> getMapByBizIds(Collection<K> bizIds);
 
     /**
      * 根据 id 更新,null 会被更新为 null
@@ -70,4 +70,4 @@ public interface BaseService<T extends BaseEntity> extends IService<T> {
      */
     boolean updateBatchByIdsWithNull(Collection<T> entityList, int batchSize);
 
-}
+}
\ No newline at end of file

starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/base/BaseServiceImpl.java

@@ -8,8 +8,8 @@ import com.schbrain.common.exception.BaseException;
 import com.schbrain.common.util.StreamUtils;
 import com.schbrain.common.util.support.ValidateSupport;
 import com.schbrain.framework.autoconfigure.mybatis.annotation.BizId;
+import com.schbrain.framework.autoconfigure.mybatis.biz.BizIdColumnField;
 import com.schbrain.framework.autoconfigure.mybatis.biz.BizIdHelper;
-import com.schbrain.framework.autoconfigure.mybatis.core.BizIdColumnField;
 import com.schbrain.framework.autoconfigure.mybatis.exception.NoSuchRecordException;
 import org.apache.ibatis.binding.MapperMethod.ParamMap;
 import org.springframework.beans.factory.InitializingBean;
@@ -60,12 +60,12 @@ public class BaseServiceImpl<M extends BaseMapper<T>, T extends BaseEntity> exte
     }
 
     @Override
-    public T getByBizId(String bizId) {
+    public T getByBizId(Object bizId) {
         return getByBizId(bizId, false);
     }
 
     @Override
-    public T getByBizId(String bizId, boolean throwIfNotFound) {
+    public T getByBizId(Object bizId, boolean throwIfNotFound) {
         Supplier<? extends RuntimeException> notFoundSupplier = null;
         if (throwIfNotFound) {
             notFoundSupplier = () -> new NoSuchRecordException(entityClass);
@@ -74,7 +74,7 @@ public class BaseServiceImpl<M extends BaseMapper<T>, T extends BaseEntity> exte
     }
 
     @Override
-    public T getByBizId(String bizId, Supplier<? extends RuntimeException> notFoundSupplier) {
+    public T getByBizId(Object bizId, Supplier<? extends RuntimeException> notFoundSupplier) {
         assertBidColumnFieldExist();
         T entity = query().eq(bizIdColumnField.getColumnName(), bizId).one();
         if (entity == null && notFoundSupplier != null) {
@@ -84,7 +84,7 @@ public class BaseServiceImpl<M extends BaseMapper<T>, T extends BaseEntity> exte
     }
 
     @Override
-    public List<T> listByBizIds(Collection<String> bizIds) {
+    public <K> List<T> listByBizIds(Collection<K> bizIds) {
         assertBidColumnFieldExist();
         if (isEmpty(bizIds)) {
             return Collections.emptyList();
@@ -93,7 +93,7 @@ public class BaseServiceImpl<M extends BaseMapper<T>, T extends BaseEntity> exte
     }
 
     @Override
-    public Map<String, T> getMapByBizIds(Collection<String> bizIds) {
+    public <K> Map<K, T> getMapByBizIds(Collection<K> bizIds) {
         assertBidColumnFieldExist();
         if (isEmpty(bizIds)) {
             return Collections.emptyMap();
@@ -129,9 +129,6 @@ public class BaseServiceImpl<M extends BaseMapper<T>, T extends BaseEntity> exte
             if (this.bizIdColumnField != null) {
                 throw new BaseException(String.format("@BizId can't more than one in Class: \"%s\"", entityClass.getName()));
             }
-            if (bizId.getType() != String.class) {
-                throw new BaseException("@BizId only support String field");
-            }
             this.bizIdColumnField = new BizIdColumnField(entityClass, bizId);
             BizIdHelper.putBizColumnField(entityClass, bizIdColumnField);
         }, field -> field.isAnnotationPresent(BizId.class));
@@ -147,4 +144,4 @@ public class BaseServiceImpl<M extends BaseMapper<T>, T extends BaseEntity> exte
         return mapperClass.getName() + StringPool.DOT + "alwaysUpdateSomeColumnById";
     }
 
-}
+}
\ No newline at end of file

starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/core/BizIdColumnField.java → starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/biz/BizIdColumnField.java

-package com.schbrain.framework.autoconfigure.mybatis.core;
+package com.schbrain.framework.autoconfigure.mybatis.biz;
 
 import com.schbrain.common.exception.BaseException;
 import com.schbrain.framework.autoconfigure.mybatis.annotation.BizId;
-import com.schbrain.framework.autoconfigure.mybatis.biz.BizIdHelper;
 import lombok.Data;
 
 import java.lang.invoke.MethodHandle;
@@ -29,22 +28,25 @@ public class BizIdColumnField {
         this.annotation = bizIdField.getAnnotation(BizId.class);
         this.columnName = BizIdHelper.getColumnName(entityClass, bizIdField, this.annotation);
         try {
-            this.bizIdFieldGetterMethodHandle = privateLookupIn(entityClass, lookup()).findGetter(entityClass, bizIdField.getName(), String.class);
-            this.bizIdFieldSetterMethodHandle = privateLookupIn(entityClass, lookup()).findSetter(entityClass, bizIdField.getName(), String.class);
+            Class<?> fieldType = bizIdField.getType();
+            Lookup lookup = privateLookupIn(entityClass, lookup());
+            this.bizIdFieldGetterMethodHandle = lookup.findGetter(entityClass, bizIdField.getName(), fieldType);
+            this.bizIdFieldSetterMethodHandle = lookup.findSetter(entityClass, bizIdField.getName(), fieldType);
         } catch (NoSuchFieldException | IllegalAccessException e) {
             throw new BaseException(e.getMessage(), e);
         }
     }
 
-    public <T> String getValue(T entity) {
+    @SuppressWarnings("unchecked")
+    public <V, T> V getValue(T entity) {
         try {
-            return (String) bizIdFieldGetterMethodHandle.invoke(entity);
+            return (V) bizIdFieldGetterMethodHandle.invoke(entity);
         } catch (Throwable e) {
             throw new BaseException(e.getMessage(), e);
         }
     }
 
-    public <T> void setValue(T entity, String value) {
+    public <V, T> void setValue(T entity, V value) {
         try {
             bizIdFieldSetterMethodHandle.invoke(entity, value);
         } catch (Throwable e) {
@@ -52,4 +54,4 @@ public class BizIdColumnField {
         }
     }
 
-}
+}
\ No newline at end of file

starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/biz/BizIdHelper.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.schbrain.framework.autoconfigure.mybatis.annotation.BizId;
-import com.schbrain.framework.autoconfigure.mybatis.core.BizIdColumnField;
 import org.apache.ibatis.session.Configuration;
 
 import java.lang.reflect.Field;
@@ -45,4 +44,4 @@ public class BizIdHelper {
         return bizIdField.getName();
     }
 
-}
+}
\ No newline at end of file

starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/biz/BizIdInjectInterceptor.java

 package com.schbrain.framework.autoconfigure.mybatis.biz;
 
 import com.baomidou.mybatisplus.extension.plugins.inner.InnerInterceptor;
-import com.schbrain.framework.autoconfigure.mybatis.core.BizIdColumnField;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.executor.Executor;
 import org.apache.ibatis.mapping.MappedStatement;
 import org.apache.ibatis.mapping.SqlCommandType;
@@ -32,11 +30,11 @@ public class BizIdInjectInterceptor implements InnerInterceptor {
             return;
         }
         if (bizIdType == BizIdType.ID_WORKER) {
-            String bizIdValue = bizColumnField.getValue(entity);
-            if (StringUtils.isBlank(bizIdValue)) {
+            Object bizIdValue = bizColumnField.getValue(entity);
+            if (bizIdValue == null) {
                 bizColumnField.setValue(entity, bizIdType.generateBizId(entity));
             }
         }
     }
 
-}
+}
\ No newline at end of file

starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/biz/BizIdType.java

@@ -28,8 +28,8 @@ public enum BizIdType {
     /**
      * 生成 bizId 的值
      */
-    public String generateBizId(Object entity) {
+    public Object generateBizId(Object entity) {
         return generator.generate(entity);
     }
 
-}
+}
\ No newline at end of file

starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/constraint/DefaultTableConstraintChecker.java

 package com.schbrain.framework.autoconfigure.mybatis.constraint;
 
 import com.mysql.cj.MysqlType;
+import com.schbrain.framework.autoconfigure.mybatis.biz.BizIdColumnField;
 import com.schbrain.framework.autoconfigure.mybatis.biz.BizIdHelper;
-import com.schbrain.framework.autoconfigure.mybatis.core.BizIdColumnField;
 import com.schbrain.framework.autoconfigure.mybatis.exception.TableConstraintException;
 
 import static com.schbrain.framework.autoconfigure.mybatis.constant.MybatisConstants.*;
@@ -141,4 +141,4 @@ public class DefaultTableConstraintChecker implements TableConstraintChecker {
         table.addError(new TableConstraintException(table.getTableName(), columnName, errorMsg));
     }
 
-}
+}
\ No newline at end of file