From 640fe5c635a2f3f17abae2ff6c11fdd1b3ce9f40 Mon Sep 17 00:00:00 2001 From: GUO <1923636941@qq.com> Date: Sat, 18 May 2024 20:00:26 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BD=E8=89=B2=E4=B8=8D=E8=A6=81=E5=81=9Aai?= =?UTF-8?q?=E5=92=8C=E8=BD=A6=E8=BE=86=E7=9A=84=E6=95=B0=E6=8D=AE=E6=9D=83?= =?UTF-8?q?=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zhgd/mybatis/DataScopeHandler.java | 14 +++++++++++--- .../com/zhgd/xmgl/util/EnvironmentUtil.java | 17 +++++++++++++---- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/zhgd/mybatis/DataScopeHandler.java b/src/main/java/com/zhgd/mybatis/DataScopeHandler.java index c03e1367b..16dc5fab2 100644 --- a/src/main/java/com/zhgd/mybatis/DataScopeHandler.java +++ b/src/main/java/com/zhgd/mybatis/DataScopeHandler.java @@ -13,6 +13,7 @@ import com.zhgd.xmgl.modules.worker.service.impl.UserEnterpriseServiceImpl; import com.zhgd.xmgl.modules.xz.service.impl.XzSupplierQualificationApplyServiceImpl; import com.zhgd.xmgl.security.entity.UserInfo; import com.zhgd.xmgl.security.util.SecurityUtils; +import com.zhgd.xmgl.util.EnvironmentUtil; import lombok.extern.slf4j.Slf4j; import net.sf.jsqlparser.JSQLParserException; import net.sf.jsqlparser.expression.Alias; @@ -44,6 +45,9 @@ import java.util.stream.Collectors; @Slf4j public class DataScopeHandler implements DataPermissionHandler { + @Lazy + @Autowired + EnvironmentUtil environmentUtil; @Lazy @Autowired IAiAnalyseHardWareRecordService aiAnalyseHardWareRecordService; @@ -85,15 +89,17 @@ public class DataScopeHandler implements DataPermissionHandler { tables.put("xz_task_progress_content", "enterprise_id"); tables.put("xz_task_progress_alarm", "enterprise_id"); tables.put("xz_task_progress", "enterprise_id"); - tables.put("enterprise_info", "id"); tables.put("quality_inspection_record", "enterprise_id"); tables.put("worker_info_audit_record", "enterprise_id"); - tables.put("car_info", "enterprise_id"); tables.put("xz_material", "enterprise_id"); tables.put("inspect_task_record", "enterprise_id"); tables.put("xz_security_inspect_task_record", "enterprise_id"); tables.put("xz_security_quality_inspection_record", "enterprise_id"); tables.put("team_info", "enterprise_id"); + if (!environmentUtil.isBaise()) { + tables.put("car_info", "enterprise_id"); + tables.put("enterprise_info", "id"); + } return tables; } @@ -105,7 +111,9 @@ public class DataScopeHandler implements DataPermissionHandler { private HashMap getFieldAiTables() { HashMap tables = new HashMap<>(); - tables.put("ai_analyse_hard_ware_alarm_record", "hardware_id"); + if (!environmentUtil.isBaise()) { + tables.put("ai_analyse_hard_ware_alarm_record", "hardware_id"); + } return tables; } diff --git a/src/main/java/com/zhgd/xmgl/util/EnvironmentUtil.java b/src/main/java/com/zhgd/xmgl/util/EnvironmentUtil.java index 4285fec76..6b99783fd 100644 --- a/src/main/java/com/zhgd/xmgl/util/EnvironmentUtil.java +++ b/src/main/java/com/zhgd/xmgl/util/EnvironmentUtil.java @@ -17,15 +17,15 @@ public class EnvironmentUtil { */ private static String activeEnvironment; + public static String getActiveEnvironment() { + return activeEnvironment; + } + @Value("${active.environment.name}") public void setActiveEnvironment(String activeEnvironment) { EnvironmentUtil.activeEnvironment = activeEnvironment; } - public static String getActiveEnvironment() { - return activeEnvironment; - } - /** * 是否本地开发环境 * @@ -125,4 +125,13 @@ public class EnvironmentUtil { return Stream.of("gxlt-prod", "gxlt-dev").anyMatch(s -> s.equals(activeEnvironment)); } + /** + * 是否baise环境 + * + * @return + */ + public boolean isBaise() { + return Stream.of("baise").anyMatch(s -> s.equals(activeEnvironment)); + } + }