XW-AIOT/aiot-platform-cloud
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(video): Controller 下沉到 controller/admin 包对齐框架 /admin-api 前缀

Browse Source 
- 原先散落在 gb28181/controller/、streamProxy/controller/、aiot/controller/、
  vmanager/**/、streamPush/controller/ 下的 Controller 统一移到各自
  controller/admin/ 子包，对齐框架 WebProperties 的自动前缀规则
  （根 CLAUDE.md「Controller 路径规范」：admin 包自动拼 /admin-api）。
- SecurityConfiguration 的 permitAll 路径同步补 /admin-api 前缀，
  覆盖 /video/device/query/snap/** 与 /video/sse/** / /video/emit，
  避免路径匹配不上导致匿名请求被拦截。
- 本次仅变更 package 声明与安全路径，controller 内部逻辑保持不变。
This commit is contained in:
lzh
2026-04-23 15:00:57 +08:00
parent 54250f2f5a
commit 0526322fa8
34 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/AiAlertController.java → viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/admin/AiAlertController.java
View File

@@ -1,4 +1,4 @@
package com.viewsh.module.video.aiot.controller;
package com.viewsh.module.video.aiot.controller.admin;
import com.alibaba.fastjson2.JSON;
import com.viewsh.module.video.aiot.bean.AiAlert;

2
viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/AiAlgoTemplateController.java → viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/admin/AiAlgoTemplateController.java
View File

@@ -1,4 +1,4 @@
package com.viewsh.module.video.aiot.controller;
package com.viewsh.module.video.aiot.controller.admin;
import com.viewsh.module.video.aiot.bean.AiAlgoTemplate;
import com.viewsh.module.video.aiot.service.IAiAlgoTemplateService;

2
viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/AiAlgorithmController.java → viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/admin/AiAlgorithmController.java
View File

@@ -1,4 +1,4 @@
package com.viewsh.module.video.aiot.controller;
package com.viewsh.module.video.aiot.controller.admin;
import com.viewsh.module.video.aiot.bean.AiAlgorithm;
import com.viewsh.module.video.aiot.service.IAiAlgorithmService;

2
viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/AiCameraController.java → viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/admin/AiCameraController.java
View File

@@ -1,4 +1,4 @@
package com.viewsh.module.video.aiot.controller;
package com.viewsh.module.video.aiot.controller.admin;
import com.viewsh.module.video.streamProxy.bean.StreamProxy;
import com.viewsh.module.video.streamProxy.dao.StreamProxyMapper;

2
viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/AiConfigController.java → viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/admin/AiConfigController.java
View File

@@ -1,4 +1,4 @@
package com.viewsh.module.video.aiot.controller;
package com.viewsh.module.video.aiot.controller.admin;
import com.viewsh.module.video.aiot.bean.AiConfigSnapshot;
import com.viewsh.module.video.aiot.bean.AiEdgeDevice;

2
viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/AiConfigLogController.java → viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/admin/AiConfigLogController.java
View File

@@ -1,4 +1,4 @@
package com.viewsh.module.video.aiot.controller;
package com.viewsh.module.video.aiot.controller.admin;
import com.viewsh.module.video.aiot.bean.AiConfigLog;
import com.viewsh.module.video.aiot.service.IAiConfigLogService;

2
viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/AiEdgeDeviceController.java → viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/admin/AiEdgeDeviceController.java
View File

@@ -1,4 +1,4 @@
package com.viewsh.module.video.aiot.controller;
package com.viewsh.module.video.aiot.controller.admin;
import com.viewsh.module.video.aiot.bean.AiEdgeDevice;
import com.viewsh.module.video.aiot.service.IAiEdgeDeviceService;

2
viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/AiRoiController.java → viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/admin/AiRoiController.java
View File

@@ -1,4 +1,4 @@
package com.viewsh.module.video.aiot.controller;
package com.viewsh.module.video.aiot.controller.admin;
import com.viewsh.module.video.aiot.bean.AiRoi;
import com.viewsh.module.video.aiot.bean.AiRoiAlgoBind;

6
viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/framework/security/config/SecurityConfiguration.java
View File

@@ -37,11 +37,11 @@ public class SecurityConfiguration {
registry.requestMatchers("/index/hook/**").permitAll();
// 设备快照公开访问
registry.requestMatchers("/video/device/query/snap/**").permitAll();
registry.requestMatchers("/admin-api/video/device/query/snap/**").permitAll();
// SSE 推送（媒体事件流，可能由前端直接订阅）
registry.requestMatchers("/video/sse/**").permitAll()
.requestMatchers("/video/emit").permitAll();
registry.requestMatchers("/admin-api/video/sse/**").permitAll()
.requestMatchers("/admin-api/video/emit").permitAll();
}
};

2
viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/AlarmController.java → viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/AlarmController.java
View File

@@ -1,4 +1,4 @@
package com.viewsh.module.video.gb28181.controller;
package com.viewsh.module.video.gb28181.controller.admin;
import com.viewsh.module.video.framework.exception.ControllerException;
import com.viewsh.module.video.gb28181.bean.Device;

2
viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/ChannelController.java → viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/ChannelController.java
View File

@@ -1,4 +1,4 @@
package com.viewsh.module.video.gb28181.controller;
package com.viewsh.module.video.gb28181.controller.admin;
import com.viewsh.module.video.common.StreamInfo;
import com.viewsh.module.video.framework.config.UserSetting;

2
viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/ChannelFrontEndController.java → viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/ChannelFrontEndController.java
View File

@@ -1,4 +1,4 @@
package com.viewsh.module.video.gb28181.controller;
package com.viewsh.module.video.gb28181.controller.admin;
import com.viewsh.module.video.framework.exception.ControllerException;
import com.viewsh.module.video.gb28181.bean.*;

2
viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/DeviceConfig.java → viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/DeviceConfig.java
View File

@@ -5,7 +5,7 @@
* @date 2021年2月2日
*/
package com.viewsh.module.video.gb28181.controller;
package com.viewsh.module.video.gb28181.controller.admin;
import com.viewsh.module.video.gb28181.bean.BasicParam;
import com.viewsh.module.video.gb28181.bean.Device;

2
viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/DeviceControl.java → viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/DeviceControl.java
View File

@@ -5,7 +5,7 @@
* @date 2021年2月1日
*/
package com.viewsh.module.video.gb28181.controller;
package com.viewsh.module.video.gb28181.controller.admin;
import com.viewsh.module.video.gb28181.bean.Device;
import com.viewsh.module.video.gb28181.service.IDeviceService;

2
viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/DeviceQuery.java → viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/DeviceQuery.java
View File

@@ -1,4 +1,4 @@
package com.viewsh.module.video.gb28181.controller;
package com.viewsh.module.video.gb28181.controller.admin;
import com.alibaba.fastjson2.JSONObject;
import com.viewsh.module.video.framework.config.DynamicTask;

2
viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/GBRecordController.java → viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/GBRecordController.java
View File

@@ -1,4 +1,4 @@
package com.viewsh.module.video.gb28181.controller;
package com.viewsh.module.video.gb28181.controller.admin;
import com.viewsh.module.video.common.InviteSessionType;
import com.viewsh.module.video.common.StreamInfo;

2
viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/GroupController.java → viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/GroupController.java
View File

@@ -1,4 +1,4 @@
package com.viewsh.module.video.gb28181.controller;
package com.viewsh.module.video.gb28181.controller.admin;
import com.viewsh.module.video.framework.exception.ControllerException;
import com.viewsh.module.video.gb28181.bean.Group;

2
viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/MediaController.java → viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/MediaController.java
View File

@@ -1,4 +1,4 @@
package com.viewsh.module.video.gb28181.controller;
package com.viewsh.module.video.gb28181.controller.admin;
import com.viewsh.module.video.common.StreamInfo;
import com.viewsh.module.video.framework.exception.ControllerException;

2
viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/MobilePositionController.java → viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/MobilePositionController.java
View File

@@ -1,4 +1,4 @@
package com.viewsh.module.video.gb28181.controller;
package com.viewsh.module.video.gb28181.controller.admin;
import com.viewsh.module.video.framework.exception.ControllerException;
import com.viewsh.module.video.gb28181.bean.Device;

2
viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/PlatformController.java → viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/PlatformController.java
View File

@@ -1,4 +1,4 @@
package com.viewsh.module.video.gb28181.controller;
package com.viewsh.module.video.gb28181.controller.admin;
import com.alibaba.fastjson2.JSONObject;
import com.viewsh.module.video.framework.sip.SipConfig;

2
viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/PlayController.java → viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/PlayController.java
View File

@@ -1,4 +1,4 @@
package com.viewsh.module.video.gb28181.controller;
package com.viewsh.module.video.gb28181.controller.admin;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;

2
viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/PlaybackController.java → viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/PlaybackController.java
View File

@@ -1,4 +1,4 @@
package com.viewsh.module.video.gb28181.controller;
package com.viewsh.module.video.gb28181.controller.admin;
import com.viewsh.module.video.common.InviteSessionType;
import com.viewsh.module.video.common.StreamInfo;

2
viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/PtzController.java → viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/PtzController.java
View File

@@ -1,4 +1,4 @@
package com.viewsh.module.video.gb28181.controller;
package com.viewsh.module.video.gb28181.controller.admin;
import com.viewsh.module.video.framework.exception.ControllerException;

2
viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/RegionController.java → viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/RegionController.java
View File

@@ -1,4 +1,4 @@
package com.viewsh.module.video.gb28181.controller;
package com.viewsh.module.video.gb28181.controller.admin;
import com.viewsh.module.video.framework.exception.ControllerException;
import com.viewsh.module.video.gb28181.bean.Region;

2
viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/SseController.java → viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/SseController.java
View File

@@ -1,4 +1,4 @@
package com.viewsh.module.video.gb28181.controller;
package com.viewsh.module.video.gb28181.controller.admin;
import com.viewsh.module.video.gb28181.session.SseSessionManager;
import io.swagger.v3.oas.annotations.tags.Tag;

2
viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/streamProxy/controller/StreamProxyController.java → viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/streamProxy/controller/admin/StreamProxyController.java
View File

@@ -1,4 +1,4 @@
package com.viewsh.module.video.streamProxy.controller;
package com.viewsh.module.video.streamProxy.controller.admin;
import com.alibaba.fastjson2.JSONObject;
import com.viewsh.module.video.common.StreamInfo;

2
viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/streamPush/controller/StreamPushController.java → viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/streamPush/controller/admin/StreamPushController.java
View File

@@ -1,4 +1,4 @@
package com.viewsh.module.video.streamPush.controller;
package com.viewsh.module.video.streamPush.controller.admin;
import cn.idev.excel.EasyExcel;
import cn.idev.excel.ExcelReader;

2
viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/vmanager/cloudRecord/CloudRecordController.java → viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/vmanager/cloudRecord/controller/admin/CloudRecordController.java
View File

@@ -1,4 +1,4 @@
package com.viewsh.module.video.vmanager.cloudRecord;
package com.viewsh.module.video.vmanager.cloudRecord.controller.admin;
import com.alibaba.fastjson2.JSONArray;
import com.viewsh.module.video.common.StreamInfo;

2
viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/vmanager/TestController.java → viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/vmanager/controller/admin/TestController.java
View File

@@ -1,4 +1,4 @@
package com.viewsh.module.video.vmanager;
package com.viewsh.module.video.vmanager.controller.admin;
import com.viewsh.module.video.common.InviteInfo;
import com.viewsh.module.video.common.InviteSessionType;

2
viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/vmanager/log/LogController.java → viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/vmanager/log/controller/admin/LogController.java
View File

@@ -1,4 +1,4 @@
package com.viewsh.module.video.vmanager.log;
package com.viewsh.module.video.vmanager.log.controller.admin;
import com.viewsh.module.video.framework.exception.ControllerException;
import com.viewsh.module.video.service.ILogService;

2
viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/vmanager/ps/PsController.java → viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/vmanager/ps/controller/admin/PsController.java
View File

@@ -1,4 +1,4 @@
package com.viewsh.module.video.vmanager.ps;
package com.viewsh.module.video.vmanager.ps.controller.admin;
import com.viewsh.module.video.common.VideoManagerConstants;
import com.viewsh.module.video.framework.config.DynamicTask;

2
viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/vmanager/recordPlan/RecordPlanController.java → viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/vmanager/recordPlan/controller/admin/RecordPlanController.java
View File

@@ -1,4 +1,4 @@
package com.viewsh.module.video.vmanager.recordPlan;
package com.viewsh.module.video.vmanager.recordPlan.controller.admin;
import com.viewsh.module.video.framework.exception.ControllerException;
import com.viewsh.module.video.gb28181.bean.CommonGBChannel;

2
viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/vmanager/rtp/RtpController.java → viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/vmanager/rtp/controller/admin/RtpController.java
View File

@@ -1,4 +1,4 @@
package com.viewsh.module.video.vmanager.rtp;
package com.viewsh.module.video.vmanager.rtp.controller.admin;
import com.viewsh.module.video.common.VideoManagerConstants;
import com.viewsh.module.video.framework.config.DynamicTask;

2
viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/vmanager/server/ServerController.java → viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/vmanager/server/controller/admin/ServerController.java
View File

@@ -1,4 +1,4 @@
package com.viewsh.module.video.vmanager.server;
package com.viewsh.module.video.vmanager.server.controller.admin;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;