修改 查询接口

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://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://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:
                 # 从数据源开关/默认关闭

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>
 

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");