From 0f69561e397093b5165c4aac58530721d5c62178 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 25 十一月 2024 11:03:16 +0800
Subject: [PATCH] #led
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/config/MybatisPlusConfig.java | 84 +++++++++++++++++++++++++++++++++---------
1 files changed, 66 insertions(+), 18 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/config/MybatisPlusConfig.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/config/MybatisPlusConfig.java
index cbe345a..ad54661 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/config/MybatisPlusConfig.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/config/MybatisPlusConfig.java
@@ -1,10 +1,11 @@
package com.zy.asrs.wcs.common.config;
+import com.baomidou.mybatisplus.autoconfigure.ConfigurationCustomizer;
import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
import com.baomidou.mybatisplus.extension.plugins.handler.TenantLineHandler;
import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor;
-import com.zy.asrs.wcs.sys.entity.User;
+import com.zy.asrs.wcs.system.entity.User;
import net.sf.jsqlparser.expression.Expression;
import net.sf.jsqlparser.expression.LongValue;
import net.sf.jsqlparser.expression.NullValue;
@@ -27,9 +28,7 @@
@Bean
public MybatisPlusInterceptor mybatisPlusInterceptor() {
MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
-
- TenantLineHandler tenantLineHandler = new TenantLineHandler() {
-
+ interceptor.addInnerInterceptor(new TenantLineInnerInterceptor(new TenantLineHandler() {
@Override
public Expression getTenantId() {
return getLoginUserTenantId();
@@ -40,24 +39,73 @@
return "host_id";
}
+ // 杩欐槸 default 鏂规硶,榛樿杩斿洖 false 琛ㄧず鎵�鏈夎〃閮介渶瑕佹嫾澶氱鎴锋潯浠�
@Override
public boolean ignoreTable(String tableName) {
- return Arrays.asList(
- "sys_host",
- "sys_user_role",
- "sys_role_menu"
- ).contains(tableName);
+ if (getTenantId() == null) {
+ return true;
+ }else {
+ return Arrays.asList(
+ "sys_host",
+ "sys_user_role",
+ "sys_role_menu",
+ "wcs_bas_shuttle_err",
+ "wcs_bas_lift_err"
+ ).contains(tableName);
+ }
}
-
- };
- TenantLineInnerInterceptor tenantLineInnerInterceptor = new TenantLineInnerInterceptor(tenantLineHandler);
- interceptor.addInnerInterceptor(tenantLineInnerInterceptor);
-
- PaginationInnerInterceptor paginationInnerInterceptor = new PaginationInnerInterceptor();
- interceptor.addInnerInterceptor(paginationInnerInterceptor);
-
+ }));
+ // 濡傛灉鐢ㄤ簡鍒嗛〉鎻掍欢娉ㄦ剰鍏� add TenantLineInnerInterceptor 鍐� add PaginationInnerInterceptor
+ // 鐢ㄤ簡鍒嗛〉鎻掍欢蹇呴』璁剧疆 MybatisConfiguration#useDeprecatedExecutor = false
+ interceptor.addInnerInterceptor(new PaginationInnerInterceptor());
return interceptor;
}
+
+ @Bean
+ public ConfigurationCustomizer configurationCustomizer() {
+ return configuration -> configuration.setUseDeprecatedExecutor(false);
+ }
+
+// @Bean
+// public MybatisPlusInterceptor mybatisPlusInterceptor() {
+// MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+//
+// TenantLineHandler tenantLineHandler = new TenantLineHandler() {
+//
+// @Override
+// public Expression getTenantId() {
+// return getLoginUserTenantId();
+// }
+//
+// @Override
+// public String getTenantIdColumn() {
+// return "host_id";
+// }
+//
+// @Override
+// public boolean ignoreTable(String tableName) {
+// if (getTenantId() == null) {
+// return true;
+// }else {
+// return Arrays.asList(
+// "sys_host",
+// "sys_user_role",
+// "sys_role_menu",
+// "wcs_bas_shuttle_err",
+// "wcs_bas_lift_err"
+// ).contains(tableName);
+// }
+// }
+//
+// };
+// TenantLineInnerInterceptor tenantLineInnerInterceptor = new TenantLineInnerInterceptor(tenantLineHandler);
+// interceptor.addInnerInterceptor(tenantLineInnerInterceptor);
+//
+// PaginationInnerInterceptor paginationInnerInterceptor = new PaginationInnerInterceptor();
+// interceptor.addInnerInterceptor(paginationInnerInterceptor);
+//
+// return interceptor;
+// }
/**
* 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛鐨勭鎴穒d
@@ -76,7 +124,7 @@
} catch (Exception e) {
System.out.println(e.getMessage());
}
- return new NullValue();
+ return null;
}
}
--
Gitblit v1.9.1