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

feat(video): Phase 5-9 编译修复、Controller 路径、数据库 SQL

Browse Source 
Phase 5: 全局编译修复 — Security 引用清理、JT1078 引用移除
         PageInfo shim 兼容类（后续迁移到 PageResult）
         web/custom 和 web/gb28181 补充迁移
Phase 6: SecurityConfiguration 更新放行 Hook/SSE 路径
Phase 7: 32 个 Controller 路径 /api/ → /video/
Phase 8: aiot-video 数据库 SQL（25 张表，含多租户 tenant_id + 逻辑删除 deleted）
Phase 9: mvn compile BUILD SUCCESS

Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
lzh
2026-04-06 00:57:44 +08:00
parent d2c82d52c9
commit a604471e6f
69 changed files with 1879 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
viewsh-module-video/viewsh-module-video-server/pom.xml
View File

@@ -177,6 +177,30 @@
<groupId>com.qcloud</groupId>
<artifactId>cos_api</artifactId>
</dependency>
<!-- MVT 矢量瓦片库（GbChannelService 使用）
NOTE: no.ecc.vectortile:java-vector-tile:1.4.1 is not available in configured repos.
A stub no/ecc/vectortile/VectorTileEncoder.java has been added to the source tree.
TODO: Either install the jar in a local Maven repo or replace with mapbox-vector-tile.
-->
<!-- OkHttp 日志拦截器 -->
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>logging-interceptor</artifactId>
</dependency>
<!-- WebSocket（支持 JSR-356 @ServerEndpoint，WVP LogChannel 使用） -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-websocket</artifactId>
</dependency>
<!-- 系统硬件信息（OSHI，ServerController / SystemInfoUtils 使用） -->
<dependency>
<groupId>com.github.oshi</groupId>
<artifactId>oshi-core</artifactId>
</dependency>
</dependencies>
<build>

25
viewsh-module-video/viewsh-module-video-server/src/main/java/com/github/pagehelper/PageHelper.java Normal file
View File

@@ -0,0 +1,25 @@
package com.github.pagehelper;
/**
* PageHelper compatibility shim for WVP migration.
* startPage() is a no-op — actual pagination needs to be replaced with MyBatis Plus.
* TODO: Phase 5.7 - migrate all usages to MyBatis Plus selectPage()
*/
public class PageHelper {
private PageHelper() {}
/**
* No-op stub. TODO: Replace with MyBatis Plus pagination.
*/
public static void startPage(int pageNum, int pageSize) {
// no-op stub for compilation
}
/**
* No-op stub. TODO: Replace with MyBatis Plus pagination.
*/
public static void startPage(int pageNum, int pageSize, String orderBy) {
// no-op stub for compilation
}
}

105
viewsh-module-video/viewsh-module-video-server/src/main/java/com/github/pagehelper/PageInfo.java Normal file
View File

@@ -0,0 +1,105 @@
package com.github.pagehelper;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
/**
* PageHelper compatibility shim for WVP migration.
* Wraps the basic pagination data needed by the migrated code.
* TODO: Phase 5.7 - migrate to viewsh PageResult<T> properly
*/
public class PageInfo<T> implements Serializable {
private long total;
private List<T> list;
private int pageNum;
private int pageSize;
private int pages;
private int startRow;
private int endRow;
private int size;
private int prePage;
private int nextPage;
private boolean isFirstPage;
private boolean isLastPage;
private boolean hasPreviousPage;
private boolean hasNextPage;
private int navigatePages = 8;
private int[] navigatepageNums = new int[0];
private int navigateFirstPage;
private int navigateLastPage;
public PageInfo() {
this.list = new ArrayList<>();
}
public PageInfo(List<T> list) {
this.list = list != null ? list : new ArrayList<>();
this.total = this.list.size();
this.size = this.list.size();
this.pageSize = this.list.size();
this.pageNum = 1;
this.pages = 1;
}
public PageInfo(List<T> list, long total) {
this.list = list != null ? list : new ArrayList<>();
this.total = total;
this.size = this.list.size();
}
public long getTotal() { return total; }
public void setTotal(long total) { this.total = total; }
public List<T> getList() { return list; }
public void setList(List<T> list) { this.list = list; }
public int getPageNum() { return pageNum; }
public void setPageNum(int pageNum) { this.pageNum = pageNum; }
public int getPageSize() { return pageSize; }
public void setPageSize(int pageSize) { this.pageSize = pageSize; }
public int getPages() { return pages; }
public void setPages(int pages) { this.pages = pages; }
public int getStartRow() { return startRow; }
public void setStartRow(int startRow) { this.startRow = startRow; }
public int getEndRow() { return endRow; }
public void setEndRow(int endRow) { this.endRow = endRow; }
public int getSize() { return size; }
public void setSize(int size) { this.size = size; }
public int getPrePage() { return prePage; }
public void setPrePage(int prePage) { this.prePage = prePage; }
public int getNextPage() { return nextPage; }
public void setNextPage(int nextPage) { this.nextPage = nextPage; }
public boolean isIsFirstPage() { return isFirstPage; }
public void setIsFirstPage(boolean isFirstPage) { this.isFirstPage = isFirstPage; }
public boolean isIsLastPage() { return isLastPage; }
public void setIsLastPage(boolean isLastPage) { this.isLastPage = isLastPage; }
public boolean isHasPreviousPage() { return hasPreviousPage; }
public void setHasPreviousPage(boolean hasPreviousPage) { this.hasPreviousPage = hasPreviousPage; }
public boolean isHasNextPage() { return hasNextPage; }
public void setHasNextPage(boolean hasNextPage) { this.hasNextPage = hasNextPage; }
public int getNavigatePages() { return navigatePages; }
public void setNavigatePages(int navigatePages) { this.navigatePages = navigatePages; }
public int[] getNavigatepageNums() { return navigatepageNums; }
public void setNavigatepageNums(int[] navigatepageNums) { this.navigatepageNums = navigatepageNums; }
public int getNavigateFirstPage() { return navigateFirstPage; }
public void setNavigateFirstPage(int navigateFirstPage) { this.navigateFirstPage = navigateFirstPage; }
public int getNavigateLastPage() { return navigateLastPage; }
public void setNavigateLastPage(int navigateLastPage) { this.navigateLastPage = navigateLastPage; }
}

18
viewsh-module-video/viewsh-module-video-server/src/main/java/com/github/pagehelper/util/StringUtil.java Normal file
View File

@@ -0,0 +1,18 @@
package com.github.pagehelper.util;
/**
* PageHelper StringUtil compatibility shim.
* TODO: Replace usages with Hutool StrUtil or StringUtils
*/
public class StringUtil {
private StringUtil() {}
public static boolean isEmpty(String str) {
return str == null || str.isEmpty();
}
public static boolean isNotEmpty(String str) {
return !isEmpty(str);
}
}

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

@@ -18,7 +18,7 @@ import java.util.Map;
@Slf4j
@RestController
@RequestMapping("/api/ai/alert")
@RequestMapping("/video/ai/alert")
@Tag(name = "AI-告警管理")
public class AiAlertController {

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

@@ -13,7 +13,7 @@ import java.util.List;
@Slf4j
@RestController
@RequestMapping("/api/ai/template")
@RequestMapping("/video/ai/template")
@Tag(name = "AI-算法参数模板")
public class AiAlgoTemplateController {

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

@@ -12,7 +12,7 @@ import java.util.List;
@Slf4j
@RestController
@RequestMapping("/api/ai/algorithm")
@RequestMapping("/video/ai/algorithm")
@Tag(name = "AI-算法管理")
public class AiAlgorithmController {

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

@@ -20,7 +20,7 @@ import java.util.stream.Collectors;
*/
@Slf4j
@RestController
@RequestMapping("/api/ai/camera")
@RequestMapping("/video/ai/camera")
@Tag(name = "AI-摄像头管理")
public class AiCameraController {

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

@@ -20,7 +20,7 @@ import java.util.Map;
@Slf4j
@RestController
@RequestMapping("/api/ai/config")
@RequestMapping("/video/ai/config")
@Tag(name = "AI-配置推送与版本管理")
public class AiConfigController {

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

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.*;
@Slf4j
@RestController
@RequestMapping("/api/ai/log")
@RequestMapping("/video/ai/log")
@Tag(name = "AI-变更日志")
public class AiConfigLogController {

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

@@ -15,7 +15,7 @@ import java.util.Map;
@Slf4j
@RestController
@RequestMapping("/api/ai/device")
@RequestMapping("/video/ai/device")
@Tag(name = "AI-边缘设备管理")
public class AiEdgeDeviceController {

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

@@ -23,7 +23,7 @@ import java.util.Map;
@Slf4j
@RestController
@RequestMapping("/api/ai/roi")
@RequestMapping("/video/ai/roi")
@Tag(name = "AI-ROI区域管理")
public class AiRoiController {

22
viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/conf/security/JwtUtils.java Normal file
View File

@@ -0,0 +1,22 @@
package com.viewsh.module.video.conf.security;
/**
* JWT utility stub — WVP authentication removed, replaced by viewsh Security framework.
* This class exists only to satisfy unused imports and annotation references in migrated controllers.
* TODO: Phase 6 - remove all references to this class from controllers
*
* @deprecated Use viewsh SecurityFrameworkUtils instead
*/
@Deprecated
public class JwtUtils {
/**
* HTTP header name for JWT token — used in Swagger @SecurityRequirement annotations.
* TODO: Phase 6 - replace with viewsh security header name
*/
public static final String HEADER = "Authorization";
private JwtUtils() {
// utility stub, not instantiable
}
}

26
viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/conf/security/SecurityUtils.java Normal file
View File

@@ -0,0 +1,26 @@
package com.viewsh.module.video.conf.security;
import com.viewsh.module.video.conf.security.dto.LoginUser;
/**
* WVP SecurityUtils stub — replaced by viewsh Security framework.
* TODO: Phase 6 - replace usages with viewsh SecurityFrameworkUtils
*
* @deprecated Use viewsh SecurityFrameworkUtils instead
*/
@Deprecated
public class SecurityUtils {
private SecurityUtils() {
// utility stub
}
/**
* Get current login user info.
* TODO: Phase 6 - implement using viewsh SecurityFrameworkUtils.getLoginUser()
*/
public static LoginUser getUserInfo() {
// Stub: always returns null (anonymous user) until Phase 6 auth integration
return null;
}
}

30
viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/conf/security/dto/LoginUser.java Normal file
View File

@@ -0,0 +1,30 @@
package com.viewsh.module.video.conf.security.dto;
/**
* WVP LoginUser stub — replaced by viewsh Security framework.
* TODO: Phase 6 - replace usages with viewsh LoginUser
*
* @deprecated Use viewsh SecurityFrameworkUtils instead
*/
@Deprecated
public class LoginUser {
private Long id;
private String username;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getUsername() {
return username;
}
public void setUsername(String username) {
this.username = username;
}
}

34
viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/framework/redis/RedisTemplateConfig.java
View File

@@ -1,17 +1,21 @@
package com.viewsh.module.video.framework.redis;
import com.alibaba.fastjson2.support.spring.data.redis.GenericFastJsonRedisSerializer;
import com.viewsh.module.video.gb28181.bean.MobilePosition;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.redis.connection.RedisConnectionFactory;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
import org.springframework.data.redis.serializer.StringRedisSerializer;
/**
* Video 模块专用 RedisTemplate 配置（使用 FastJSON2 序列化）
* Video 模块专用 RedisTemplate 配置
* 独立 Bean 名称，避免覆盖框架的 Jackson 版本 RedisTemplate
*
* NOTE: Original WVP used FastJSON2 (GenericFastJsonRedisSerializer from fastjson2-extension-spring6).
* Temporarily using GenericJackson2JsonRedisSerializer as fallback until
* fastjson2-extension-spring6 is available in the local Maven repository.
* TODO: Switch back to GenericFastJsonRedisSerializer once the dependency is resolved.
*/
@Configuration
public class RedisTemplateConfig {
@@ -19,13 +23,11 @@ public class RedisTemplateConfig {
@Bean("videoRedisTemplate")
public RedisTemplate<Object, Object> videoRedisTemplate(RedisConnectionFactory redisConnectionFactory) {
RedisTemplate<Object, Object> redisTemplate = new RedisTemplate<>();
// 使用 FastJSON2 序列化（WVP 内部专用）
GenericFastJsonRedisSerializer fastJsonRedisSerializer = new GenericFastJsonRedisSerializer();
// value 值的序列化采用 fastJsonRedisSerializer
redisTemplate.setValueSerializer(fastJsonRedisSerializer);
redisTemplate.setHashValueSerializer(fastJsonRedisSerializer);
// key 的序列化采用 StringRedisSerializer
// Using Jackson serializer as fallback (WVP originally used FastJSON2)
GenericJackson2JsonRedisSerializer jacksonSerializer = new GenericJackson2JsonRedisSerializer();
redisTemplate.setValueSerializer(jacksonSerializer);
redisTemplate.setHashValueSerializer(jacksonSerializer);
// key serializer
redisTemplate.setKeySerializer(new StringRedisSerializer());
redisTemplate.setHashKeySerializer(new StringRedisSerializer());
redisTemplate.setConnectionFactory(redisConnectionFactory);
@@ -33,14 +35,12 @@ public class RedisTemplateConfig {
}
@Bean("videoRedisTemplateForMobilePosition")
public RedisTemplate<String, MobilePosition> videoRedisTemplateForMobilePosition(RedisConnectionFactory redisConnectionFactory) {
public RedisTemplate<String, MobilePosition> videoRedisTemplateForMobilePosition(
RedisConnectionFactory redisConnectionFactory) {
RedisTemplate<String, MobilePosition> redisTemplate = new RedisTemplate<>();
// 使用 FastJSON2 序列化
GenericFastJsonRedisSerializer fastJsonRedisSerializer = new GenericFastJsonRedisSerializer();
redisTemplate.setValueSerializer(fastJsonRedisSerializer);
redisTemplate.setHashValueSerializer(fastJsonRedisSerializer);
// key 的序列化采用 StringRedisSerializer
GenericJackson2JsonRedisSerializer jacksonSerializer = new GenericJackson2JsonRedisSerializer();
redisTemplate.setValueSerializer(jacksonSerializer);
redisTemplate.setHashValueSerializer(jacksonSerializer);
redisTemplate.setKeySerializer(new StringRedisSerializer());
redisTemplate.setHashKeySerializer(new StringRedisSerializer());
redisTemplate.setConnectionFactory(redisConnectionFactory);

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

@@ -31,6 +31,17 @@ public class SecurityConfiguration {
registry.requestMatchers("/druid/**").anonymous();
// RPC 服务的安全配置
registry.requestMatchers(ApiConstants.PREFIX + "/**").permitAll();
// WVP ZLMediaKit Hook 回调（ZLM → WVP，无用户认证）
// HC-04: ZLM Hook 路径必须保留，ZLM 配置的回调地址
registry.requestMatchers("/index/hook/**").permitAll();
// 设备快照公开访问
registry.requestMatchers("/video/device/query/snap/**").permitAll();
// SSE 推送（媒体事件流，可能由前端直接订阅）
registry.requestMatchers("/video/sse/**").permitAll()
.requestMatchers("/video/emit").permitAll();
}
};

19
viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/framework/websocket/WebSocketConfig.java
View File

@@ -1,19 +1,14 @@
package com.viewsh.module.video.framework.websocket;
import com.viewsh.module.video.framework.webLog.LogChannel;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.socket.server.standard.ServerEndpointExporter;
/**
* WebSocket configuration.
* In Spring Boot 3 / Spring 6, ServerEndpointExporter was removed.
* JSR-356 @ServerEndpoint beans are auto-detected by embedded Tomcat.
* No explicit bean registration is needed.
*/
@Configuration
public class WebSocketConfig {
@Bean
public ServerEndpointExporter serverEndpointExporter(){
ServerEndpointExporter endpointExporter = new ServerEndpointExporter();
endpointExporter.setAnnotatedEndpointClasses(LogChannel.class);
return endpointExporter;
}
// No-op: Spring Boot 3 auto-registers @ServerEndpoint beans
}

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

@@ -31,7 +31,7 @@ import java.util.List;
@Tag(name = "报警信息管理")
@Slf4j
@RestController
@RequestMapping("/api/alarm")
@RequestMapping("/video/alarm")
public class AlarmController {
@Autowired

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

@@ -45,7 +45,7 @@ import java.util.concurrent.TimeUnit;
@Tag(name = "全局通道管理")
@RestController
@Slf4j
@RequestMapping(value = "/api/common/channel")
@RequestMapping(value = "/video/common/channel")
public class ChannelController {
@Autowired

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

@@ -26,7 +26,7 @@ import java.util.List;
@Tag(name = "全局通道前端控制")
@RestController
@Slf4j
@RequestMapping(value = "/api/common/channel/front-end")
@RequestMapping(value = "/video/common/channel/front-end")
public class ChannelFrontEndController {
@Autowired

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

@@ -26,7 +26,7 @@ import org.springframework.web.context.request.async.DeferredResult;
@Slf4j
@Tag(name = "国标设备配置")
@RestController
@RequestMapping("/api/device/config")
@RequestMapping("/video/device/config")
public class DeviceConfig {
@Autowired

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

@@ -25,7 +25,7 @@ import org.springframework.web.context.request.async.DeferredResult;
@Tag(name = "国标设备控制")
@Slf4j
@RestController
@RequestMapping("/api/device/control")
@RequestMapping("/video/device/control")
public class DeviceControl {
@Autowired

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

@@ -42,7 +42,7 @@ import java.nio.file.Files;
@SuppressWarnings("rawtypes")
@Slf4j
@RestController
@RequestMapping("/api/device/query")
@RequestMapping("/video/device/query")
public class DeviceQuery {
@Autowired

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

@@ -38,7 +38,7 @@ import java.util.concurrent.TimeUnit;
@Tag(name = "国标录像")
@Slf4j
@RestController
@RequestMapping("/api/gb_record")
@RequestMapping("/video/gb_record")
public class GBRecordController {
@Autowired

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

@@ -20,7 +20,7 @@ import java.util.List;
@Slf4j
@Tag(name = "分组管理")
@RestController
@RequestMapping("/api/group")
@RequestMapping("/video/group")
public class GroupController {
@Autowired

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

@@ -32,7 +32,7 @@ import java.net.URL;
@Tag(name = "媒体流相关")
@RestController
@Slf4j
@RequestMapping(value = "/api/media")
@RequestMapping(value = "/video/media")
public class MediaController {
@Autowired

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

@@ -32,7 +32,7 @@ import java.util.UUID;
@Tag(name = "位置信息管理")
@Slf4j
@RestController
@RequestMapping("/api/position")
@RequestMapping("/video/position")
public class MobilePositionController {
@Autowired

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

@@ -30,7 +30,7 @@ import org.springframework.web.bind.annotation.*;
@Tag(name = "级联平台管理")
@Slf4j
@RestController
@RequestMapping("/api/platform")
@RequestMapping("/video/platform")
public class PlatformController {
@Autowired

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

@@ -50,7 +50,7 @@ import java.util.UUID;
@Tag(name = "国标设备点播")
@Slf4j
@RestController
@RequestMapping("/api/play")
@RequestMapping("/video/play")
public class PlayController {
@Autowired

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

@@ -47,7 +47,7 @@ import java.util.UUID;
@Tag(name = "视频回放")
@Slf4j
@RestController
@RequestMapping("/api/playback")
@RequestMapping("/video/playback")
public class PlaybackController {
@Autowired

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

@@ -26,7 +26,7 @@ import org.springframework.web.context.request.async.DeferredResult;
@Tag(name = "前端设备控制")
@Slf4j
@RestController
@RequestMapping("/api/front-end")
@RequestMapping("/video/front-end")
public class PtzController {
@Autowired

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

@@ -20,7 +20,7 @@ import java.util.List;
@Tag(name = "区域管理")
@RestController
@RequestMapping("/api/region")
@RequestMapping("/video/region")
public class RegionController {
private final static Logger logger = LoggerFactory.getLogger(RegionController.class);

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

@@ -22,7 +22,7 @@ import java.io.IOException;
*/
@Tag(name = "SSE 推送")
@RestController
@RequestMapping("/api")
@RequestMapping("/video")
public class SseController {
@Resource

10
viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/jt1078/bean/JTMediaStreamType.java Normal file
View File

@@ -0,0 +1,10 @@
package com.viewsh.module.video.jt1078.bean;
/**
* JT1078 media stream type.
* JT1078 module is not migrated in this phase — stub only.
* TODO: Phase N - migrate JT1078 module
*/
public enum JTMediaStreamType {
PLAY, PLAYBACK, TALK
}

22
viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/jt1078/config/JT1078Config.java Normal file
View File

@@ -0,0 +1,22 @@
package com.viewsh.module.video.jt1078.config;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
/**
* JT1078 configuration stub.
* JT1078 module is not migrated in this phase.
* TODO: Phase N - migrate JT1078 module
*/
@Component
@Data
@ConfigurationProperties(prefix = "jt1078", ignoreInvalidFields = true)
@Order(3)
public class JT1078Config {
private Integer port;
private String password;
}

17
viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/jt1078/service/Ijt1078PlayService.java Normal file
View File

@@ -0,0 +1,17 @@
package com.viewsh.module.video.jt1078.service;
import com.viewsh.module.video.jt1078.bean.JTMediaStreamType;
/**
* JT1078 play service interface stub.
* JT1078 module is not migrated in this phase.
* TODO: Phase N - migrate JT1078 module
*/
public interface Ijt1078PlayService {
JTMediaStreamType checkStreamFromJt(String stream);
void stopPlay(String phoneNumber, Integer channelId);
void stopPlayback(String phoneNumber, Integer channelId);
}

13
viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/jt1078/service/Ijt1078Service.java Normal file
View File

@@ -0,0 +1,13 @@
package com.viewsh.module.video.jt1078.service;
import com.viewsh.module.video.jt1078.bean.JTMediaStreamType;
/**
* JT1078 service interface stub.
* JT1078 module is not migrated in this phase.
* TODO: Phase N - migrate JT1078 module
*/
public interface Ijt1078Service {
JTMediaStreamType checkStreamFromJt(String stream);
}

44
viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/media/abl/bean/hook/OnRecordProgressABLHookParam.java
View File

@@ -1,40 +1,12 @@
package com.viewsh.module.video.media.abl.bean.hook;
public class OnRecordProgressABLHookParam extends OnRecordMp4ABLHookParam{
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
public class OnRecordProgressABLHookParam extends OnRecordMp4ABLHookParam {
private Integer currentFileDuration;
private Integer TotalVideoDuration;
private String startTime;
private String endTime;
public Integer getCurrentFileDuration() {
return currentFileDuration;
}
public void setCurrentFileDuration(Integer currentFileDuration) {
this.currentFileDuration = currentFileDuration;
}
public Integer getTotalVideoDuration() {
return TotalVideoDuration;
}
public void setTotalVideoDuration(Integer totalVideoDuration) {
TotalVideoDuration = totalVideoDuration;
}
public String getStartTime() {
return startTime;
}
public void setStartTime(String startTime) {
this.startTime = startTime;
}
public String getEndTime() {
return endTime;
}
public void setEndTime(String endTime) {
this.endTime = endTime;
}
private Integer totalVideoDuration;
// startTime and endTime are inherited from OnRecordMp4ABLHookParam (with chain setters)
}

28
viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/storager/dao/RoleMapper.java Normal file
View File

@@ -0,0 +1,28 @@
package com.viewsh.module.video.storager.dao;
import com.viewsh.module.video.storager.dao.dto.Role;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* WVP RoleMapper stub. Role management is provided by viewsh-module-system.
* TODO: Phase 6 - remove all WVP role management code
*
* @deprecated
*/
@Mapper
@Deprecated
public interface RoleMapper {
Role selectById(@Param("id") int id);
List<Role> selectAll();
int add(Role role);
int update(Role role);
int delete(@Param("id") int id);
}

38
viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/storager/dao/UserApiKeyMapper.java Normal file
View File

@@ -0,0 +1,38 @@
package com.viewsh.module.video.storager.dao;
import com.viewsh.module.video.storager.dao.dto.UserApiKey;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* WVP UserApiKeyMapper stub. API Key management is provided by viewsh-module-system.
* TODO: Phase 6 - remove all WVP API key management code
*
* @deprecated
*/
@Mapper
@Deprecated
public interface UserApiKeyMapper {
int add(UserApiKey userApiKey);
boolean isApiKeyExists(@Param("apiKey") String apiKey);
List<UserApiKey> getUserApiKeys();
int enable(@Param("id") Integer id);
int disable(@Param("id") Integer id);
int remark(@Param("id") Integer id, @Param("remark") String remark);
int delete(@Param("id") Integer id);
UserApiKey selectById(@Param("id") Integer id);
int apiKey(@Param("id") Integer id, @Param("apiKey") String apiKey);
int reset(@Param("id") Integer id, @Param("apiKey") String apiKey);
}

36
viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/storager/dao/UserMapper.java Normal file
View File

@@ -0,0 +1,36 @@
package com.viewsh.module.video.storager.dao;
import com.viewsh.module.video.storager.dao.dto.User;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* WVP UserMapper stub. User management is provided by viewsh-module-system.
* TODO: Phase 6 - remove all WVP user management code
*
* @deprecated
*/
@Mapper
@Deprecated
public interface UserMapper {
User select(@Param("username") String username, @Param("password") String password);
User selectById(@Param("id") int id);
User getUserByUsername(@Param("username") String username);
List<User> selectAll();
List<User> getUsers();
int add(User user);
int update(User user);
int delete(@Param("id") int id);
int changePushKey(@Param("id") int id, @Param("pushKey") String pushKey);
}

19
viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/storager/dao/dto/Role.java Normal file
View File

@@ -0,0 +1,19 @@
package com.viewsh.module.video.storager.dao.dto;
import lombok.Data;
/**
* WVP Role DTO stub. Role management is provided by viewsh-module-system.
* This class exists to satisfy compilation of legacy code.
* TODO: Phase 6 - remove all WVP user/role management code, use viewsh role model
*
* @deprecated Use viewsh-module-system role management instead
*/
@Data
@Deprecated
public class Role {
private int id;
private String roleName;
}

22
viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/storager/dao/dto/User.java Normal file
View File

@@ -0,0 +1,22 @@
package com.viewsh.module.video.storager.dao.dto;
import lombok.Data;
/**
* WVP User DTO stub. User management is provided by viewsh-module-system.
* This class exists to satisfy compilation of legacy code.
* TODO: Phase 6 - remove all WVP user management code, use viewsh user model
*
* @deprecated Use viewsh-module-system user management instead
*/
@Data
@Deprecated
public class User {
private int id;
private String username;
private String password;
private String pushKey;
private int roleId;
}

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

@@ -39,7 +39,7 @@ import java.util.Map;
@Tag(name = "拉流代理", description = "")
@RestController
@Slf4j
@RequestMapping(value = "/api/proxy")
@RequestMapping(value = "/video/proxy")
public class StreamProxyController {
@Autowired

2
viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/streamPush/bean/StreamPushExcelDto.java
View File

@@ -1,6 +1,6 @@
package com.viewsh.module.video.streamPush.bean;
import com.alibaba.excel.annotation.ExcelProperty;
import cn.idev.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

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

@@ -1,9 +1,9 @@
package com.viewsh.module.video.streamPush.controller;
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.ExcelReader;
import com.alibaba.excel.exception.ExcelDataConvertException;
import com.alibaba.excel.read.metadata.ReadSheet;
import cn.idev.excel.EasyExcel;
import cn.idev.excel.ExcelReader;
import cn.idev.excel.exception.ExcelDataConvertException;
import cn.idev.excel.read.metadata.ReadSheet;
import com.viewsh.module.video.common.enums.ChannelDataType;
import com.viewsh.module.video.framework.config.UserSetting;
import com.viewsh.module.video.framework.exception.ControllerException;
@@ -49,7 +49,7 @@ import java.util.UUID;
@Tag(name = "推流信息管理")
@RestController
@Slf4j
@RequestMapping(value = "/api/push")
@RequestMapping(value = "/video/push")
public class StreamPushController {
@Autowired

4
viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/streamPush/enent/StreamPushUploadFileHandler.java
View File

@@ -1,7 +1,7 @@
package com.viewsh.module.video.streamPush.enent;
import com.alibaba.excel.context.AnalysisContext;
import com.alibaba.excel.event.AnalysisEventListener;
import cn.idev.excel.context.AnalysisContext;
import cn.idev.excel.event.AnalysisEventListener;
import com.viewsh.module.video.streamPush.bean.StreamPush;
import com.viewsh.module.video.streamPush.bean.StreamPushExcelDto;
import com.viewsh.module.video.streamPush.service.IStreamPushService;

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

@@ -19,7 +19,7 @@ import java.util.List;
import java.util.Map;
@RestController
@RequestMapping("/api/test")
@RequestMapping("/video/test")
public class TestController {
@Autowired

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

@@ -47,7 +47,7 @@ import java.util.zip.ZipOutputStream;
@Tag(name = "云端录像接口")
@Slf4j
@RestController
@RequestMapping("/api/cloud/record")
@RequestMapping("/video/cloud/record")
public class CloudRecordController {

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

@@ -28,7 +28,7 @@ import java.util.List;
@Tag(name = "日志文件查询接口")
@Slf4j
@RestController
@RequestMapping("/api/log")
@RequestMapping("/video/log")
public class LogController {
@Autowired

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

@@ -37,7 +37,7 @@ import java.util.concurrent.TimeUnit;
@Tag(name = "第三方PS服务对接")
@Slf4j
@RestController
@RequestMapping("/api/ps")
@RequestMapping("/video/ps")
public class PsController {
@Autowired

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

@@ -25,7 +25,7 @@ import java.util.List;
@Tag(name = "录制计划")
@Slf4j
@RestController
@RequestMapping("/api/record/plan")
@RequestMapping("/video/record/plan")
public class RecordPlanController {
@Autowired

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

@@ -38,7 +38,7 @@ import java.util.concurrent.TimeUnit;
@Tag(name = "第三方服务对接")
@Slf4j
@RestController
@RequestMapping("/api/rtp")
@RequestMapping("/video/rtp")
public class RtpController {
@Autowired

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

@@ -49,7 +49,7 @@ import java.util.*;
@Tag(name = "服务控制")
@Slf4j
@RestController
@RequestMapping("/api/server")
@RequestMapping("/video/server")
public class ServerController {

32
viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/web/custom/bean/CameraChannel.java Normal file
View File

@@ -0,0 +1,32 @@
package com.viewsh.module.video.web.custom.bean;
import com.viewsh.module.video.gb28181.bean.CommonGBChannel;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@Schema(description = "摄像头信息")
public class CameraChannel extends CommonGBChannel {
@Schema(description = "摄像头设备国标编号")
private String deviceCode;
@Schema(description = "图标路径")
private String icon;
/**
* 分组别名
*/
@Schema(description = "所属组织结构别名")
private String groupAlias;
/**
* 分组所属业务分组别名
*/
@Schema(description = "所属业务分组别名")
private String topGroupGAlias;
}

13
viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/web/custom/bean/CameraCount.java Normal file
View File

@@ -0,0 +1,13 @@
package com.viewsh.module.video.web.custom.bean;
import lombok.Data;
@Data
public class CameraCount {
private String groupAlias;
private String deviceId;
private Long allCount;
private Long onlineCount;
}

34
viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/web/custom/bean/CameraGroup.java Normal file
View File

@@ -0,0 +1,34 @@
package com.viewsh.module.video.web.custom.bean;
import com.viewsh.module.video.gb28181.bean.Group;
import lombok.Getter;
import java.util.ArrayList;
import java.util.List;
public class CameraGroup extends Group {
@Getter
private CameraGroup parent;
@Getter
private final List<CameraGroup> child = new ArrayList<>();
public void setParent(CameraGroup parent) {
if (parent == null) {
return;
}
this.parent = parent;
parent.addChild(this);
}
public void addChild(CameraGroup child) {
if (child == null) {
return;
}
this.child.add(child);
if (this.parent != null) {
this.parent.addChild(child);
}
}
}

22
viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/web/custom/bean/CameraStreamContent.java Normal file
View File

@@ -0,0 +1,22 @@
package com.viewsh.module.video.web.custom.bean;
import com.viewsh.module.video.common.StreamInfo;
import com.viewsh.module.video.vmanager.bean.StreamContent;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
public class CameraStreamContent extends StreamContent {
public CameraStreamContent(StreamInfo streamInfo) {
super(streamInfo);
}
private String name;
// 0不可动，1可动
private Integer controlType;
}

22
viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/web/custom/bean/CameraStreamInfo.java Normal file
View File

@@ -0,0 +1,22 @@
package com.viewsh.module.video.web.custom.bean;
import com.viewsh.module.video.common.StreamInfo;
import com.viewsh.module.video.gb28181.bean.CommonGBChannel;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
public class CameraStreamInfo {
private CommonGBChannel channel;
private StreamInfo streamInfo;
public CameraStreamInfo(CommonGBChannel channel, StreamInfo streamInfo) {
this.channel = channel;
this.streamInfo = streamInfo;
}
}

15
viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/web/custom/bean/ChannelParam.java Normal file
View File

@@ -0,0 +1,15 @@
package com.viewsh.module.video.web.custom.bean;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@Data
@Schema(description = "通道信息")
public class ChannelParam {
@Schema(description = "摄像头设备国标编号, 对于非国标摄像头可以不设置此参数")
private String deviceCode;
@Schema(description = "通道编号")
private String deviceId;
}

17
viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/web/custom/bean/IdsQueryParam.java Normal file
View File

@@ -0,0 +1,17 @@
package com.viewsh.module.video.web.custom.bean;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.util.List;
@Data
@Schema(description = "根据多个ID获取摄像头列表")
public class IdsQueryParam {
@Schema(description = "通道编号列表")
private List<String> deviceIds;
@Schema(description = "坐标系类型：WGS84,GCJ02、BD09")
private String geoCoordSys;
}

13
viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/web/custom/bean/Point.java Normal file
View File

@@ -0,0 +1,13 @@
package com.viewsh.module.video.web.custom.bean;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@Data
@Schema(description = "坐标")
public class Point {
private double lng;
private double lat;
}

23
viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/web/custom/bean/PolygonQueryParam.java Normal file
View File

@@ -0,0 +1,23 @@
package com.viewsh.module.video.web.custom.bean;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.util.List;
@Data
@Schema(description = "多边形检索摄像头参数")
public class PolygonQueryParam {
@Schema(description = "多边形位置")
private List<Point> position;
@Schema(description = "地图级别")
private Integer level;
@Schema(description = "分组别名")
private String groupAlias;
@Schema(description = "坐标系类型：WGS84,GCJ02、BD09")
private String geoCoordSys;
}

17
viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/web/custom/bean/SYMember.java Normal file
View File

@@ -0,0 +1,17 @@
package com.viewsh.module.video.web.custom.bean;
import lombok.Getter;
import lombok.Setter;
@Setter
@Getter
public class SYMember {
private String no;
private Long unicodeNo;
private Long blockId;
private String unitNo;
private String terminalMemberStatus;
private String channelDeviceId;
}

229
viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/web/gb28181/dto/DeviceChannelExtend.java Normal file
View File

@@ -0,0 +1,229 @@
package com.viewsh.module.video.web.gb28181.dto;
import lombok.Data;
@Data
public class DeviceChannelExtend {
/**
* 数据库自增ID
*/
private int id;
/**
* 通道id
*/
private String channelId;
/**
* 设备id
*/
private String deviceId;
/**
* 通道名
*/
private String name;
private String deviceName;
private boolean deviceOnline;
/**
* 生产厂商
*/
private String manufacture;
/**
* 型号
*/
private String model;
/**
* 设备归属
*/
private String owner;
/**
* 行政区域
*/
private String civilCode;
/**
* 警区
*/
private String block;
/**
* 安装地址
*/
private String address;
/**
* 是否有子设备 1有, 0没有
*/
private int parental;
/**
* 父级id
*/
private String parentId;
/**
* 信令安全模式
*/
private int safetyWay;
/**
* 注册方式
*/
private int registerWay;
/**
* 证书序列号
*/
private String certNum;
/**
* 证书有效标识
*/
private int certifiable;
/**
* 证书无效原因码
*/
private int errCode;
/**
* 证书终止有效期
*/
private String endTime;
/**
* 保密属性
*/
private String secrecy;
/**
* IP地址
*/
private String ipAddress;
/**
* 端口号
*/
private int port;
/**
* 密码
*/
private String password;
/**
* 云台类型
*/
private int PTZType;
/**
* 云台类型描述字符串
*/
private String PTZTypeText;
/**
* 创建时间
*/
private String createTime;
/**
* 更新时间
*/
private String updateTime;
/**
* 在线/离线
*/
private String status;
/**
* 经度
*/
private double longitude;
/**
* 纬度
*/
private double latitude;
/**
* 经度 GCJ02
*/
private double longitudeGcj02;
/**
* 纬度 GCJ02
*/
private double latitudeGcj02;
/**
* 经度 WGS84
*/
private double longitudeWgs84;
/**
* 纬度 WGS84
*/
private double latitudeWgs84;
/**
* 子设备数
*/
private int subCount;
/**
* 流唯一编号，存在表示正在直播
*/
private String streamId;
/**
* 是否含有音频
*/
private boolean hasAudio;
/**
* 标记通道的类型，0->国标通道 1->直播流通道 2->业务分组/虚拟组织/行政区划
*/
private int channelType;
/**
* 业务分组
*/
private String businessGroupId;
/**
* GPS的更新时间
*/
private String gpsTime;
public void setPTZType(int PTZType) {
this.PTZType = PTZType;
switch (PTZType) {
case 0:
this.PTZTypeText = "未知";
break;
case 1:
this.PTZTypeText = "球机";
break;
case 2:
this.PTZTypeText = "半球";
break;
case 3:
this.PTZTypeText = "固定枪机";
break;
case 4:
this.PTZTypeText = "遥控枪机";
break;
}
}
}

41
viewsh-module-video/viewsh-module-video-server/src/main/java/no/ecc/vectortile/VectorTileEncoder.java Normal file
View File

@@ -0,0 +1,41 @@
package no.ecc.vectortile;
import org.locationtech.jts.geom.Geometry;
import java.util.Map;
/**
* Vector Tile Encoder stub — replaces no.ecc.vectortile:java-vector-tile:1.4.1
* which is not available in configured Maven repositories.
*
* TODO: Either install the jar in a local Maven repository, or replace with
* an available MVT library (e.g., mapbox-vector-tile from com.wdtinc).
*
* This stub compiles but produces an empty byte array.
*/
public class VectorTileEncoder {
public VectorTileEncoder() {
}
/**
* Add a feature to the encoder.
*
* @param layerName the layer name
* @param attributes feature attributes
* @param geometry JTS geometry
*/
public void addFeature(String layerName, Map<String, ?> attributes, Geometry geometry) {
// stub — no-op
}
/**
* Encode the accumulated features as a protobuf byte array.
*
* @return empty byte array (stub)
*/
public byte[] encode() {
// stub — returns empty tile
return new byte[0];
}
}