From 47def71da4efacc7a8678b255e902d706ea04f28 Mon Sep 17 00:00:00 2001
From: wanghao <wangh@mesnac.com>
Date: Wed, 28 May 2025 14:49:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-admin/src/main/resources/application-druid.yml       | 7 ++++---
 ruoyi-api/src/main/resources/mapper/BroadApiMapper.xml     | 6 +++++-
 .../main/java/com/ruoyi/framework/config/ShiroConfig.java  | 1 +
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index ab4598f..c4cd63f 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -6,10 +6,11 @@ spring:
         druid:
             # 主库数据源
             master:
-#                url: jdbc:mysql://119.45.202.115:3306/bg_wheel_chocks?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                url: jdbc:mysql://1.13.177.47:3306/bg_wheel_chocks?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://119.45.202.115:3306/bg_wheel_chocks?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#                url: jdbc:mysql://1.13.177.47:3306/bg_wheel_chocks?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: Haiwei123456
+                password: haiwei@123
+#                password: Haiwei123456
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
diff --git a/ruoyi-api/src/main/resources/mapper/BroadApiMapper.xml b/ruoyi-api/src/main/resources/mapper/BroadApiMapper.xml
index b38b8c2..5a86514 100644
--- a/ruoyi-api/src/main/resources/mapper/BroadApiMapper.xml
+++ b/ruoyi-api/src/main/resources/mapper/BroadApiMapper.xml
@@ -40,7 +40,11 @@
 
     </resultMap>
     <select id="getDevice" resultMap="DeviceResult">
-        select  device_code, device_name, use_state, device_state, location_name  from device_base_info where location_name=#{storeName}
+        select device_code, device_name, use_state, device_state, location.air_location as location_name
+        from device_base_info info
+                 left join device_base_location location on info.location_name=location.rfid_code
+
+        where  location.air_location =#{storeName}
 
     </select>
 
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java
index de56994..9ed89c4 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java
@@ -289,6 +289,7 @@ public class ShiroConfig
         filterChainDefinitionMap.put("/js/**", "anon");
         filterChainDefinitionMap.put("/ruoyi/**", "anon");
         filterChainDefinitionMap.put("/api/**", "anon");
+        filterChainDefinitionMap.put("/manage/model", "anon");
         filterChainDefinitionMap.put("/captcha/captchaImage**", "anon");
         // 退出 logout地址，shiro去清除session
         filterChainDefinitionMap.put("/logout", "logout");