diff --git a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/AiAlertController.java b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/admin/AiAlertController.java similarity index 99% rename from viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/AiAlertController.java rename to viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/admin/AiAlertController.java index 255a412c..50d28ca4 100644 --- a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/AiAlertController.java +++ b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/admin/AiAlertController.java @@ -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; diff --git a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/AiAlgoTemplateController.java b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/admin/AiAlgoTemplateController.java similarity index 96% rename from viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/AiAlgoTemplateController.java rename to viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/admin/AiAlgoTemplateController.java index 44a73615..cadeb30d 100644 --- a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/AiAlgoTemplateController.java +++ b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/admin/AiAlgoTemplateController.java @@ -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; diff --git a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/AiAlgorithmController.java b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/admin/AiAlgorithmController.java similarity index 95% rename from viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/AiAlgorithmController.java rename to viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/admin/AiAlgorithmController.java index 78dd5769..509705fa 100644 --- a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/AiAlgorithmController.java +++ b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/admin/AiAlgorithmController.java @@ -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; diff --git a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/AiCameraController.java b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/admin/AiCameraController.java similarity index 97% rename from viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/AiCameraController.java rename to viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/admin/AiCameraController.java index 733de76e..1a63e869 100644 --- a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/AiCameraController.java +++ b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/admin/AiCameraController.java @@ -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; diff --git a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/AiConfigController.java b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/admin/AiConfigController.java similarity index 99% rename from viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/AiConfigController.java rename to viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/admin/AiConfigController.java index e3a35db5..88684aea 100644 --- a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/AiConfigController.java +++ b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/admin/AiConfigController.java @@ -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; diff --git a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/AiConfigLogController.java b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/admin/AiConfigLogController.java similarity index 95% rename from viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/AiConfigLogController.java rename to viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/admin/AiConfigLogController.java index 5e5a6da1..ec2b7b1f 100644 --- a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/AiConfigLogController.java +++ b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/admin/AiConfigLogController.java @@ -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; diff --git a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/AiEdgeDeviceController.java b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/admin/AiEdgeDeviceController.java similarity index 98% rename from viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/AiEdgeDeviceController.java rename to viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/admin/AiEdgeDeviceController.java index 8635d6bf..b3d63177 100644 --- a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/AiEdgeDeviceController.java +++ b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/admin/AiEdgeDeviceController.java @@ -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; diff --git a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/AiRoiController.java b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/admin/AiRoiController.java similarity index 99% rename from viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/AiRoiController.java rename to viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/admin/AiRoiController.java index 64b26fd4..6016d5b6 100644 --- a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/AiRoiController.java +++ b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/aiot/controller/admin/AiRoiController.java @@ -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; diff --git a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/framework/security/config/SecurityConfiguration.java b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/framework/security/config/SecurityConfiguration.java index 699c9d64..36d2698f 100644 --- a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/framework/security/config/SecurityConfiguration.java +++ b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/framework/security/config/SecurityConfiguration.java @@ -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(); } }; diff --git a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/AlarmController.java b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/AlarmController.java similarity index 99% rename from viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/AlarmController.java rename to viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/AlarmController.java index c84d1c3d..87488152 100644 --- a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/AlarmController.java +++ b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/AlarmController.java @@ -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; diff --git a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/ChannelController.java b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/ChannelController.java similarity index 99% rename from viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/ChannelController.java rename to viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/ChannelController.java index 75903e5d..9fd274dd 100644 --- a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/ChannelController.java +++ b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/ChannelController.java @@ -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; diff --git a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/ChannelFrontEndController.java b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/ChannelFrontEndController.java similarity index 99% rename from viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/ChannelFrontEndController.java rename to viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/ChannelFrontEndController.java index 0c586d45..0553bba9 100644 --- a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/ChannelFrontEndController.java +++ b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/ChannelFrontEndController.java @@ -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.*; diff --git a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/DeviceConfig.java b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/DeviceConfig.java similarity index 98% rename from viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/DeviceConfig.java rename to viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/DeviceConfig.java index af8a808c..539559b5 100644 --- a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/DeviceConfig.java +++ b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/DeviceConfig.java @@ -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; diff --git a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/DeviceControl.java b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/DeviceControl.java similarity index 99% rename from viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/DeviceControl.java rename to viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/DeviceControl.java index b335fb6d..6eddd8ab 100644 --- a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/DeviceControl.java +++ b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/DeviceControl.java @@ -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; diff --git a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/DeviceQuery.java b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/DeviceQuery.java similarity index 99% rename from viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/DeviceQuery.java rename to viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/DeviceQuery.java index f5c29444..5770991a 100644 --- a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/DeviceQuery.java +++ b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/DeviceQuery.java @@ -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; diff --git a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/GBRecordController.java b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/GBRecordController.java similarity index 99% rename from viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/GBRecordController.java rename to viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/GBRecordController.java index b97fd903..a971fe47 100644 --- a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/GBRecordController.java +++ b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/GBRecordController.java @@ -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; diff --git a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/GroupController.java b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/GroupController.java similarity index 98% rename from viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/GroupController.java rename to viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/GroupController.java index a57bc1ec..f0f1bc56 100644 --- a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/GroupController.java +++ b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/GroupController.java @@ -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; diff --git a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/MediaController.java b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/MediaController.java similarity index 99% rename from viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/MediaController.java rename to viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/MediaController.java index c6afca20..fcbb1078 100644 --- a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/MediaController.java +++ b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/MediaController.java @@ -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; diff --git a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/MobilePositionController.java b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/MobilePositionController.java similarity index 99% rename from viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/MobilePositionController.java rename to viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/MobilePositionController.java index ed6dc2e2..5fc3e3b7 100644 --- a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/MobilePositionController.java +++ b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/MobilePositionController.java @@ -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; diff --git a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/PlatformController.java b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/PlatformController.java similarity index 99% rename from viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/PlatformController.java rename to viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/PlatformController.java index ccd32e49..d52d3e9a 100644 --- a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/PlatformController.java +++ b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/PlatformController.java @@ -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; diff --git a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/PlayController.java b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/PlayController.java similarity index 99% rename from viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/PlayController.java rename to viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/PlayController.java index dbf87b91..1f97d268 100644 --- a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/PlayController.java +++ b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/PlayController.java @@ -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; diff --git a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/PlaybackController.java b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/PlaybackController.java similarity index 99% rename from viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/PlaybackController.java rename to viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/PlaybackController.java index ced2954f..a9a0413d 100644 --- a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/PlaybackController.java +++ b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/PlaybackController.java @@ -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; diff --git a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/PtzController.java b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/PtzController.java similarity index 99% rename from viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/PtzController.java rename to viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/PtzController.java index 79e378a0..c582fcf9 100644 --- a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/PtzController.java +++ b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/PtzController.java @@ -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; diff --git a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/RegionController.java b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/RegionController.java similarity index 98% rename from viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/RegionController.java rename to viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/RegionController.java index 9e32b409..eb127c30 100644 --- a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/RegionController.java +++ b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/RegionController.java @@ -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; diff --git a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/SseController.java b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/SseController.java similarity index 95% rename from viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/SseController.java rename to viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/SseController.java index 8d15346e..6cd3a6c9 100644 --- a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/SseController.java +++ b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/controller/admin/SseController.java @@ -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; diff --git a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/streamProxy/controller/StreamProxyController.java b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/streamProxy/controller/admin/StreamProxyController.java similarity index 99% rename from viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/streamProxy/controller/StreamProxyController.java rename to viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/streamProxy/controller/admin/StreamProxyController.java index cb1ad86b..4665f2cd 100644 --- a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/streamProxy/controller/StreamProxyController.java +++ b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/streamProxy/controller/admin/StreamProxyController.java @@ -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; diff --git a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/streamPush/controller/StreamPushController.java b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/streamPush/controller/admin/StreamPushController.java similarity index 99% rename from viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/streamPush/controller/StreamPushController.java rename to viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/streamPush/controller/admin/StreamPushController.java index a0caf319..e2defd3f 100644 --- a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/streamPush/controller/StreamPushController.java +++ b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/streamPush/controller/admin/StreamPushController.java @@ -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; diff --git a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/vmanager/cloudRecord/CloudRecordController.java b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/vmanager/cloudRecord/controller/admin/CloudRecordController.java similarity index 99% rename from viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/vmanager/cloudRecord/CloudRecordController.java rename to viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/vmanager/cloudRecord/controller/admin/CloudRecordController.java index 22f4a3d7..df7caa4b 100644 --- a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/vmanager/cloudRecord/CloudRecordController.java +++ b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/vmanager/cloudRecord/controller/admin/CloudRecordController.java @@ -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; diff --git a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/vmanager/TestController.java b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/vmanager/controller/admin/TestController.java similarity index 98% rename from viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/vmanager/TestController.java rename to viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/vmanager/controller/admin/TestController.java index ec952494..877ac264 100644 --- a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/vmanager/TestController.java +++ b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/vmanager/controller/admin/TestController.java @@ -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; diff --git a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/vmanager/log/LogController.java b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/vmanager/log/controller/admin/LogController.java similarity index 97% rename from viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/vmanager/log/LogController.java rename to viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/vmanager/log/controller/admin/LogController.java index ad233f92..05c5b09f 100644 --- a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/vmanager/log/LogController.java +++ b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/vmanager/log/controller/admin/LogController.java @@ -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; diff --git a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/vmanager/ps/PsController.java b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/vmanager/ps/controller/admin/PsController.java similarity index 99% rename from viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/vmanager/ps/PsController.java rename to viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/vmanager/ps/controller/admin/PsController.java index 58abe5ef..8865ec9c 100644 --- a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/vmanager/ps/PsController.java +++ b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/vmanager/ps/controller/admin/PsController.java @@ -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; diff --git a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/vmanager/recordPlan/RecordPlanController.java b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/vmanager/recordPlan/controller/admin/RecordPlanController.java similarity index 98% rename from viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/vmanager/recordPlan/RecordPlanController.java rename to viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/vmanager/recordPlan/controller/admin/RecordPlanController.java index 1b863c73..8c5467e3 100644 --- a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/vmanager/recordPlan/RecordPlanController.java +++ b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/vmanager/recordPlan/controller/admin/RecordPlanController.java @@ -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; diff --git a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/vmanager/rtp/RtpController.java b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/vmanager/rtp/controller/admin/RtpController.java similarity index 99% rename from viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/vmanager/rtp/RtpController.java rename to viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/vmanager/rtp/controller/admin/RtpController.java index ff45773b..0c1c872e 100644 --- a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/vmanager/rtp/RtpController.java +++ b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/vmanager/rtp/controller/admin/RtpController.java @@ -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; diff --git a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/vmanager/server/ServerController.java b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/vmanager/server/controller/admin/ServerController.java similarity index 99% rename from viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/vmanager/server/ServerController.java rename to viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/vmanager/server/controller/admin/ServerController.java index 9a1c862d..a946d1cc 100644 --- a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/vmanager/server/ServerController.java +++ b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/vmanager/server/controller/admin/ServerController.java @@ -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;