mp整理

bladex-tool/blade-starter-mybatis/src/main/java/org/springblade/core/mp/config/BladeMetaObjectHandler.java

@@ -25,34 +25,32 @@ import org.springblade.core.tool.utils.ObjectUtil;
  * mybatisplus自定义填充
  *
  * <p>
- *     updateUser 张利杰
- *     updateTime 2022-06-23
- *     content	插入时，自动添加逻辑删除字段和乐观锁版本号
- *     注： 需要加上注解 @TableField(fill = FieldFill.INSERT)
+ * updateUser 张利杰
+ * updateTime 2022-06-23
+ * content	插入时，自动添加逻辑删除字段和乐观锁版本号
+ * 注： 需要加上注解 @TableField(fill = FieldFill.INSERT)
  * </p>
- *
- * @author Chill
  */
 @Slf4j
 public class BladeMetaObjectHandler implements MetaObjectHandler {
 
-	private static final String DEL_FLAG = "delFlag";
+    private static final String DEL_FLAG = "delFlag";
 
-	private static final String VERSION_FLAG = "version";
+    private static final String VERSION_FLAG = "version";
 
-	@Override
-	public void insertFill(MetaObject metaObject) {
-		if (ObjectUtil.isNotEmpty(metaObject.hasSetter(VERSION_FLAG))) {
-			setFieldValByName(VERSION_FLAG, 0, metaObject);
-		}
-		if (ObjectUtil.isNotEmpty(metaObject.hasSetter(DEL_FLAG))) {
-			setFieldValByName(DEL_FLAG, 0, metaObject);
-		}
-	}
+    @Override
+    public void insertFill(MetaObject metaObject) {
+        if (ObjectUtil.isNotEmpty(metaObject.hasSetter(VERSION_FLAG))) {
+            setFieldValByName(VERSION_FLAG, 0, metaObject);
+        }
+        if (ObjectUtil.isNotEmpty(metaObject.hasSetter(DEL_FLAG))) {
+            setFieldValByName(DEL_FLAG, 0, metaObject);
+        }
+    }
 
-	@Override
-	public void updateFill(MetaObject metaObject) {
+    @Override
+    public void updateFill(MetaObject metaObject) {
 
-	}
+    }
 
 }

bladex-tool/blade-starter-mybatis/src/main/java/org/springblade/core/mp/config/MybatisPlusConfiguration.java

@@ -106,7 +106,10 @@ public class MybatisPlusConfiguration implements WebMvcConfigurer {
         paginationInterceptor.setOverflow(mybatisPlusProperties.getOverflow());
         paginationInterceptor.setOptimizeJoin(mybatisPlusProperties.getOptimizeJoin());
         interceptor.addInnerInterceptor(paginationInterceptor);
+
+        // 乐观锁插件
         interceptor.addInnerInterceptor(new OptimisticLockerInnerInterceptor());
+
         return interceptor;
     }
 

hx-service/iot-production/src/main/java/com/fjhx/config/MybatisConfig.java

@@ -1,7 +1,5 @@
 package com.fjhx.config;
 
-import com.baomidou.mybatisplus.autoconfigure.ConfigurationCustomizer;
-import com.baomidou.mybatisplus.extension.MybatisMapWrapperFactory;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.handler.TenantLineHandler;
 import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor;
@@ -11,10 +9,20 @@ import org.springblade.core.secure.utils.AuthUtil;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
+import java.util.Arrays;
+import java.util.List;
+
 @Configuration
 public class MybatisConfig {
 
     /**
+     * 排除表集合
+     */
+    private static final List<String> excludeTableName = Arrays.asList(
+            "amqp_data"
+    );
+
+    /**
      * 租户插件
      */
     @Bean
@@ -30,11 +38,7 @@ public class MybatisConfig {
 
             @Override
             public boolean ignoreTable(String tableName) {
-                if ("amqp_data".equals(tableName)) {
-                    return true;
-                }
-
-                return false;
+                return excludeTableName.contains(tableName);
             }
 
         }));
@@ -42,12 +46,4 @@ public class MybatisConfig {
         return interceptor;
     }
 
-    /**
-     * map返回查询结果时，自动转驼峰
-     */
-    @Bean
-    public ConfigurationCustomizer configurationCustomizer() {
-        return i -> i.setObjectWrapperFactory(new MybatisMapWrapperFactory());
-    }
-
 }