Merge branch 'wvp-28181-2.0' into main-dev
# Conflicts: # web_src/config/index.js结构优化
648540858
commit
3571ca272b
|
|
@ -455,6 +455,23 @@ rename table stream_push to wvp_stream_push;
|
|||
rename table user to wvp_user;
|
||||
rename table user_role to wvp_user_role;
|
||||
|
||||
alter table wvp_device add column broadcast_push_after_ack bool default false;
|
||||
alter table wvp_device_channel add column custom_name varchar(255) null ;
|
||||
alter table wvp_device_channel add column custom_longitude double null ;
|
||||
alter table wvp_device_channel add column custom_latitude double null ;
|
||||
alter table wvp_device_channel add column custom_ptz_type int null ;
|
||||
|
||||
create table wvp_resources_tree (
|
||||
id serial primary key ,
|
||||
is_catalog bool default true,
|
||||
device_channel_id integer ,
|
||||
gb_stream_id integer,
|
||||
name character varying(255),
|
||||
parentId integer,
|
||||
path character varying(255)
|
||||
);
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
15
sql/初始化.sql
15
sql/初始化.sql
|
|
@ -32,6 +32,7 @@ create table wvp_device (
|
|||
as_message_channel bool default false,
|
||||
keepalive_interval_time integer,
|
||||
switch_primary_sub_stream bool default false,
|
||||
broadcast_push_after_ack bool default false,
|
||||
constraint uk_device_device unique (device_id)
|
||||
);
|
||||
|
||||
|
|
@ -53,6 +54,7 @@ create table wvp_device_channel (
|
|||
id serial primary key ,
|
||||
channel_id character varying(50) not null,
|
||||
name character varying(255),
|
||||
custom_name character varying(255),
|
||||
manufacture character varying(50),
|
||||
model character varying(50),
|
||||
owner character varying(50),
|
||||
|
|
@ -71,9 +73,12 @@ create table wvp_device_channel (
|
|||
port integer,
|
||||
password character varying(255),
|
||||
ptz_type integer,
|
||||
custom_ptz_type integer,
|
||||
status bool default false,
|
||||
longitude double precision,
|
||||
custom_longitude double precision,
|
||||
latitude double precision,
|
||||
custom_latitude double precision,
|
||||
stream_id character varying(50),
|
||||
device_id character varying(50) not null,
|
||||
parental character varying(50),
|
||||
|
|
@ -278,6 +283,16 @@ create table wvp_user_role (
|
|||
create_time character varying(50),
|
||||
update_time character varying(50)
|
||||
);
|
||||
create table wvp_resources_tree (
|
||||
id serial primary key ,
|
||||
is_catalog bool default true,
|
||||
device_channel_id integer ,
|
||||
gb_stream_id integer,
|
||||
name character varying(255),
|
||||
parentId integer,
|
||||
path character varying(255)
|
||||
);
|
||||
|
||||
|
||||
/*初始数据*/
|
||||
INSERT INTO wvp_user VALUES (1, 'admin','21232f297a57a5a743894a0e4a801fc3',1,'2021-04-13 14:14:57','2021-04-13 14:14:57','3e80d1762a324d5b0ff636e0bd16f1e3');
|
||||
|
|
|
|||
|
|
@ -195,10 +195,10 @@ public class ZLMRESTfulUtils {
|
|||
} else {
|
||||
logger.error(String.format("[ %s ]请求失败: %s %s", url, response.code(), response.message()));
|
||||
}
|
||||
Objects.requireNonNull(response.body()).close();
|
||||
} else {
|
||||
logger.error(String.format("[ %s ]请求失败: %s %s", url, response.code(), response.message()));
|
||||
}
|
||||
Objects.requireNonNull(response.body()).close();
|
||||
} catch (ConnectException e) {
|
||||
logger.error(String.format("连接ZLM失败: %s, %s", e.getCause().getMessage(), e.getMessage()));
|
||||
logger.info("请检查media配置并确认ZLM已启动...");
|
||||
|
|
|
|||
|
|
@ -5,6 +5,10 @@
|
|||
|
||||
|
||||
spring:
|
||||
# 设置接口超时时间
|
||||
mvc:
|
||||
async:
|
||||
request-timeout: 20000
|
||||
# [可选]上传文件大小限制
|
||||
servlet:
|
||||
multipart:
|
||||
|
|
|
|||
|
|
@ -1,4 +1,8 @@
|
|||
spring:
|
||||
# 设置接口超时时间
|
||||
mvc:
|
||||
async:
|
||||
request-timeout: 20000
|
||||
thymeleaf:
|
||||
cache: false
|
||||
# [可选]上传文件大小限制
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ export default {
|
|||
data(){
|
||||
return {
|
||||
isLogin: false,
|
||||
excludeLoginCheck: ["/play/wasm", "/play/rtc"],
|
||||
userInfo: { //保存用户信息
|
||||
nick: null,
|
||||
ulevel: null,
|
||||
|
|
@ -21,27 +22,29 @@ export default {
|
|||
},
|
||||
created() {
|
||||
if (userService.getToken() == null){
|
||||
console.log(22222)
|
||||
console.log(this.$route.path)
|
||||
try {
|
||||
if (this.excludeLoginCheck && this.excludeLoginCheck.length > 0) {
|
||||
for (let i = 0; i < this.excludeLoginCheck.length; i++) {
|
||||
if (this.$route.path.startsWith(this.excludeLoginCheck[i])){
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
}catch (e) {
|
||||
console.error(e)
|
||||
}
|
||||
//如果没有登录状态则跳转到登录页
|
||||
this.$router.push('/login');
|
||||
}
|
||||
},
|
||||
//监听路由检查登录
|
||||
watch:{
|
||||
"$route" : 'checkLogin'
|
||||
},
|
||||
|
||||
mounted(){
|
||||
//组件开始挂载时获取用户信息
|
||||
// this.getUserInfo();
|
||||
},
|
||||
methods: {
|
||||
checkLogin(){
|
||||
//检查是否存在session
|
||||
if (userService.getToken() == null){
|
||||
//如果没有登录状态则跳转到登录页
|
||||
// this.$router.push('/login');
|
||||
}
|
||||
|
||||
},
|
||||
},
|
||||
components: {}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -84,9 +84,9 @@
|
|||
</el-form-item>
|
||||
|
||||
<el-form-item label="无人观看" prop="rtpType" >
|
||||
<el-radio v-model="proxyParam.noneReader" label="1">不做处理</el-radio>
|
||||
<el-radio v-model="proxyParam.enableDisableNoneReader" label="2">停用</el-radio>
|
||||
<el-radio v-model="proxyParam.enableRemoveNoneReader" label="3">移除</el-radio>
|
||||
<el-radio v-model="proxyParam.noneReader" label="0">不做处理</el-radio>
|
||||
<el-radio v-model="proxyParam.noneReader" label="1">停用</el-radio>
|
||||
<el-radio v-model="proxyParam.noneReader" label="2">移除</el-radio>
|
||||
<!-- <el-select-->
|
||||
<!-- @change="noneReaderHandler"-->
|
||||
<!-- v-model="proxyParam.noneReader"-->
|
||||
|
|
|
|||
Loading…
Reference in New Issue