Shikong/wvp-gb28181-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

去除多余字段

Browse Source
This commit is contained in:
648540858 2023-06-20 09:57:28 +08:00
parent 0532363192
commit d310204d00
9 changed files with 4 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sql/2.6.8升级2.6.9.sql
View File

@ -38,7 +38,7 @@ alter table device
change geoCoordSys geo_coord_sys varchar(50) not null;
alter table device
change treeType tree_type varchar(50) not null;
drop column treeType;
alter table device
change mediaServerId media_server_id varchar(50) default 'auto' null;
@ -297,7 +297,7 @@ alter table parent_platform
change updateTime update_time varchar(50) null;
alter table parent_platform
change treeType tree_type varchar(50) not null;
drop column treeType;
alter table parent_platform
change asMessageChannel as_message_channel bool default false;

2
sql/初始化.sql
View File

@ -24,7 +24,6 @@ create table wvp_device (
charset character varying(50),
ssrc_check bool default false,
geo_coord_sys character varying(50),
tree_type character varying(50),
media_server_id character varying(50),
custom_name character varying(255),
sdp_ip character varying(50),
@ -187,7 +186,6 @@ create table wvp_platform (
catalog_group integer,
create_time character varying(50),
update_time character varying(50),
tree_type character varying(50),
as_message_channel bool default false,
constraint uk_platform_unique_server_gb_id unique (server_gb_id)
);

14
src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
View File

@ -173,12 +173,6 @@ public class Device {
@Schema(description = "地理坐标系， 目前支持 WGS84,GCJ02")
private String geoCoordSys;
/**
* 树类型 国标规定了两种树的展现方式 行政区划：CivilCode 和业务分组:BusinessGroup
*/
@Schema(description = "树类型 国标规定了两种树的展现方式 行政区划：CivilCode 和业务分组:BusinessGroup")
private String treeType;
@Schema(description = "密码")
private String password;
@ -406,14 +400,6 @@ public class Device {
this.geoCoordSys = geoCoordSys;
}
public String getTreeType() {
return treeType;
}
public void setTreeType(String treeType) {
this.treeType = treeType;
}
public String getPassword() {
return password;
}

14
src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java
View File

@ -183,12 +183,6 @@ public class ParentPlatform {
@Schema(description = "创建时间")
private String createTime;
/**
* 树类型 国标规定了两种树的展现方式 行政区划 CivilCode 和业务分组:BusinessGroup
*/
@Schema(description = "树类型 国标规定了两种树的展现方式 行政区划 CivilCode 和业务分组:BusinessGrou")
private String treeType;
@Schema(description = "是否作为消息通道")
private boolean asMessageChannel;
@ -424,14 +418,6 @@ public class ParentPlatform {
this.createTime = createTime;
}
public String getTreeType() {
return treeType;
}
public void setTreeType(String treeType) {
this.treeType = treeType;
}
public boolean isAsMessageChannel() {
return asMessageChannel;
}

1
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java
View File

@ -164,7 +164,6 @@ public class RegisterRequestProcessor extends SIPRequestProcessorParent implemen
device.setStreamMode("UDP");
device.setCharset("GB2312");
device.setGeoCoordSys("WGS84");
device.setTreeType("CivilCode");
device.setDeviceId(deviceId);
device.setOnLine(false);
}

1
src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
View File

@ -470,7 +470,6 @@ public class DeviceServiceImpl implements IDeviceService {
}
deviceInStore.setSdpIp(device.getSdpIp());
deviceInStore.setCharset(device.getCharset());
deviceInStore.setTreeType(device.getTreeType());
// 目录订阅相关的信息
if (device.getSubscribeCycleForCatalog() > 0) {

2
src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java
View File

@ -130,8 +130,6 @@ public class PlatformServiceImpl implements IPlatformService {
@Override
public boolean update(ParentPlatform parentPlatform) {
logger.info("[国标级联]更新平台 {}", parentPlatform.getDeviceGBId());
// TODO 后续版本去除
parentPlatform.setTreeType("");
parentPlatform.setCharacterSet(parentPlatform.getCharacterSet().toUpperCase());
ParentPlatform parentPlatformOld = platformMapper.getParentPlatById(parentPlatform.getId());
ParentPlatformCatch parentPlatformCatchOld = redisCatchStorage.queryPlatformCatchInfo(parentPlatformOld.getServerGBId());

9
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java
View File

@ -40,7 +40,6 @@ public interface DeviceMapper {
"ssrc_check," +
"as_message_channel," +
"geo_coord_sys," +
"tree_type," +
"on_line," +
"media_server_id," +
"(SELECT count(0) FROM wvp_device_channel WHERE device_id=wvp_device.device_id) as channel_count "+
@ -74,7 +73,6 @@ public interface DeviceMapper {
"ssrc_check,"+
"as_message_channel,"+
"geo_coord_sys,"+
"tree_type,"+
"on_line"+
") VALUES (" +
"#{deviceId}," +
@ -103,7 +101,6 @@ public interface DeviceMapper {
"#{ssrcCheck}," +
"#{asMessageChannel}," +
"#{geoCoordSys}," +
"#{treeType}," +
"#{onLine}" +
")")
int add(Device device);
@ -158,7 +155,6 @@ public interface DeviceMapper {
"ssrc_check,"+
"as_message_channel,"+
"geo_coord_sys,"+
"tree_type,"+
"on_line,"+
"media_server_id,"+
"(SELECT count(0) FROM wvp_device_channel WHERE device_id=de.device_id) as channel_count " +
@ -199,7 +195,6 @@ public interface DeviceMapper {
"ssrc_check,"+
"as_message_channel,"+
"geo_coord_sys,"+
"tree_type,"+
"on_line"+
" FROM wvp_device WHERE on_line = true")
List<Device> getOnlineDevices();
@ -230,7 +225,6 @@ public interface DeviceMapper {
"ssrc_check,"+
"as_message_channel,"+
"geo_coord_sys,"+
"tree_type,"+
"on_line"+
" FROM wvp_device WHERE ip = #{host} AND port=#{port}")
Device getDeviceByHostAndPort(String host, int port);
@ -252,7 +246,6 @@ public interface DeviceMapper {
"<if test=\"ssrcCheck != null\">, ssrc_check=#{ssrcCheck}</if>" +
"<if test=\"asMessageChannel != null\">, as_message_channel=#{asMessageChannel}</if>" +
"<if test=\"geoCoordSys != null\">, geo_coord_sys=#{geoCoordSys}</if>" +
"<if test=\"treeType != null\">, tree_type=#{treeType}</if>" +
"<if test=\"mediaServerId != null\">, media_server_id=#{mediaServerId}</if>" +
"WHERE device_id=#{deviceId}"+
" </script>"})
@ -269,7 +262,6 @@ public interface DeviceMapper {
"ssrc_check,"+
"as_message_channel,"+
"geo_coord_sys,"+
"tree_type,"+
"on_line,"+
"media_server_id"+
") VALUES (" +
@ -283,7 +275,6 @@ public interface DeviceMapper {
"#{ssrcCheck}," +
"#{asMessageChannel}," +
"#{geoCoordSys}," +
"#{treeType}," +
"#{onLine}," +
"#{mediaServerId}" +
")")

5
src/main/java/com/genersoft/iot/vmp/storager/dao/ParentPlatformMapper.java
View File

@ -16,10 +16,10 @@ public interface ParentPlatformMapper {
@Insert("INSERT INTO wvp_platform (enable, name, server_gb_id, server_gb_domain, server_ip, server_port,device_gb_id,device_ip,"+
"device_port,username,password,expires,keep_timeout,transport,character_set,ptz,rtcp,as_message_channel,"+
"status,start_offline_push,catalog_id,administrative_division,catalog_group,create_time,update_time,tree_type) " +
"status,start_offline_push,catalog_id,administrative_division,catalog_group,create_time,update_time) " +
" VALUES (#{enable}, #{name}, #{serverGBId}, #{serverGBDomain}, #{serverIP}, #{serverPort}, #{deviceGBId}, #{deviceIp}, " +
" #{devicePort}, #{username}, #{password}, #{expires}, #{keepTimeout}, #{transport}, #{characterSet}, #{ptz}, #{rtcp}, #{asMessageChannel}, " +
" #{status}, #{startOfflinePush}, #{catalogId}, #{administrativeDivision}, #{catalogGroup}, #{createTime}, #{updateTime}, #{treeType})")
" #{status}, #{startOfflinePush}, #{catalogId}, #{administrativeDivision}, #{catalogGroup}, #{createTime}, #{updateTime})")
int addParentPlatform(ParentPlatform parentPlatform);
@Update("UPDATE wvp_platform " +
@ -47,7 +47,6 @@ public interface ParentPlatformMapper {
"administrative_division=#{administrativeDivision}, " +
"create_time=#{createTime}, " +
"update_time=#{updateTime}, " +
"tree_type=#{treeType}, " +
"catalog_id=#{catalogId} " +
"WHERE id=#{id}")
int updateParentPlatform(ParentPlatform parentPlatform);