LIVE_YE 5 months ago
parent
commit
76cceca16e

+ 19 - 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/camera/CameraController.java

@@ -62,7 +62,7 @@ public class CameraController extends BaseController {
 
 
     /**
-     * 获取设备视频地址
+     * 获取设备视频地址(放开)
      */
     @PreAuthorize("@ss.hasPermi('system:camera:video')")
     @GetMapping("/video/{cameraIndexCode}")
@@ -70,6 +70,24 @@ public class CameraController extends BaseController {
         return cameraService.video(cameraIndexCode);
     }
 
+
+    /**
+     * 查询安防设备列表(放开)
+     */
+    @GetMapping("/open/list")
+    public AjaxResult listOpen(CameraInfoVo cameraInfoVo) {
+        return cameraService.selectCameraList(cameraInfoVo);
+    }
+
+
+    /**
+     * 获取设备视频地址(放开)
+     */
+    @GetMapping("/open/video/{cameraIndexCode}")
+    public AjaxResult videoOpen(@PathVariable String cameraIndexCode) {
+        return cameraService.video(cameraIndexCode);
+    }
+
     /**
      * 设备关闭
      */

+ 2 - 2
ruoyi-admin/src/main/resources/application.yml

@@ -19,8 +19,8 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
-    active: druid
-#    active: prod
+    #active: druid
+    active: prod
   # 文件上传
   servlet:
     multipart:

+ 1 - 0
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -112,6 +112,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 .authorizeRequests()
                 // 对于登录login 注册register 验证码captchaImage 允许匿名访问
                 .antMatchers("/login", "/register", "/captchaImage","/camera/yzm/openDz","/sendSms/sendRegisterSms").permitAll()
+                .antMatchers("/camera/open/video/**","/camera/open/list").permitAll()
                 // 静态资源,可匿名访问
                 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
                 .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**","/system/app/new").permitAll()