From d310204d00b3701999da87090845c50ba9adc146 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 20 六月 2023 09:57:28 +0800
Subject: [PATCH] 去除多余字段
---
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java | 9 ---------
sql/2.6.8升级2.6.9.sql | 4 ++--
src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java | 14 --------------
src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java | 1 -
src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java | 2 --
src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java | 14 --------------
sql/初始化.sql | 2 --
src/main/java/com/genersoft/iot/vmp/storager/dao/ParentPlatformMapper.java | 5 ++---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java | 1 -
9 files changed, 4 insertions(+), 48 deletions(-)
diff --git "a/sql/2.6.8\345\215\207\347\272\2472.6.9.sql" "b/sql/2.6.8\345\215\207\347\272\2472.6.9.sql"
index a6b9f12..3734bcd 100644
--- "a/sql/2.6.8\345\215\207\347\272\2472.6.9.sql"
+++ "b/sql/2.6.8\345\215\207\347\272\2472.6.9.sql"
@@ -38,7 +38,7 @@
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 @@
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;
diff --git "a/sql/\345\210\235\345\247\213\345\214\226.sql" "b/sql/\345\210\235\345\247\213\345\214\226.sql"
index f29a924..d61c47c 100644
--- "a/sql/\345\210\235\345\247\213\345\214\226.sql"
+++ "b/sql/\345\210\235\345\247\213\345\214\226.sql"
@@ -24,7 +24,6 @@
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 @@
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)
);
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
index a364f00..0ef0629 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
@@ -173,12 +173,6 @@
@Schema(description = "鍦扮悊鍧愭爣绯伙紝 鐩墠鏀寔 WGS84,GCJ02")
private String geoCoordSys;
- /**
- * 鏍戠被鍨� 鍥芥爣瑙勫畾浜嗕袱绉嶆爲鐨勫睍鐜版柟寮� 琛屾斂鍖哄垝锛欳ivilCode 鍜屼笟鍔″垎缁�:BusinessGroup
- */
- @Schema(description = "鏍戠被鍨� 鍥芥爣瑙勫畾浜嗕袱绉嶆爲鐨勫睍鐜版柟寮� 琛屾斂鍖哄垝锛欳ivilCode 鍜屼笟鍔″垎缁�:BusinessGroup")
- private String treeType;
-
@Schema(description = "瀵嗙爜")
private String password;
@@ -404,14 +398,6 @@
public void setGeoCoordSys(String geoCoordSys) {
this.geoCoordSys = geoCoordSys;
- }
-
- public String getTreeType() {
- return treeType;
- }
-
- public void setTreeType(String treeType) {
- this.treeType = treeType;
}
public String getPassword() {
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java
index 01a11eb..fbc95ed 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java
@@ -183,12 +183,6 @@
@Schema(description = "鍒涘缓鏃堕棿")
private String createTime;
- /**
- * 鏍戠被鍨� 鍥芥爣瑙勫畾浜嗕袱绉嶆爲鐨勫睍鐜版柟寮� 琛屾斂鍖哄垝 CivilCode 鍜屼笟鍔″垎缁�:BusinessGroup
- */
- @Schema(description = "鏍戠被鍨� 鍥芥爣瑙勫畾浜嗕袱绉嶆爲鐨勫睍鐜版柟寮� 琛屾斂鍖哄垝 CivilCode 鍜屼笟鍔″垎缁�:BusinessGrou")
- private String treeType;
-
@Schema(description = "鏄惁浣滀负娑堟伅閫氶亾")
private boolean asMessageChannel;
@@ -422,14 +416,6 @@
public void setCreateTime(String createTime) {
this.createTime = createTime;
- }
-
- public String getTreeType() {
- return treeType;
- }
-
- public void setTreeType(String treeType) {
- this.treeType = treeType;
}
public boolean isAsMessageChannel() {
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java
index 6e3cf67..6eea02f 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java
@@ -164,7 +164,6 @@
device.setStreamMode("UDP");
device.setCharset("GB2312");
device.setGeoCoordSys("WGS84");
- device.setTreeType("CivilCode");
device.setDeviceId(deviceId);
device.setOnLine(false);
}
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
index 8a6257f..bb48089 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
@@ -470,7 +470,6 @@
}
deviceInStore.setSdpIp(device.getSdpIp());
deviceInStore.setCharset(device.getCharset());
- deviceInStore.setTreeType(device.getTreeType());
// 鐩綍璁㈤槄鐩稿叧鐨勪俊鎭�
if (device.getSubscribeCycleForCatalog() > 0) {
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java
index 5a84dee..e2e83c3 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java
@@ -130,8 +130,6 @@
@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());
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java
index 4bbf51b..12e550f 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java
@@ -40,7 +40,6 @@
"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 @@
"ssrc_check,"+
"as_message_channel,"+
"geo_coord_sys,"+
- "tree_type,"+
"on_line"+
") VALUES (" +
"#{deviceId}," +
@@ -103,7 +101,6 @@
"#{ssrcCheck}," +
"#{asMessageChannel}," +
"#{geoCoordSys}," +
- "#{treeType}," +
"#{onLine}" +
")")
int add(Device device);
@@ -158,7 +155,6 @@
"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 @@
"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 @@
"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 @@
"<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 @@
"ssrc_check,"+
"as_message_channel,"+
"geo_coord_sys,"+
- "tree_type,"+
"on_line,"+
"media_server_id"+
") VALUES (" +
@@ -283,7 +275,6 @@
"#{ssrcCheck}," +
"#{asMessageChannel}," +
"#{geoCoordSys}," +
- "#{treeType}," +
"#{onLine}," +
"#{mediaServerId}" +
")")
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/ParentPlatformMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/ParentPlatformMapper.java
index 2c6852a..386d7dc 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/ParentPlatformMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/ParentPlatformMapper.java
@@ -16,10 +16,10 @@
@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 @@
"administrative_division=#{administrativeDivision}, " +
"create_time=#{createTime}, " +
"update_time=#{updateTime}, " +
- "tree_type=#{treeType}, " +
"catalog_id=#{catalogId} " +
"WHERE id=#{id}")
int updateParentPlatform(ParentPlatform parentPlatform);
--
Gitblit v1.8.0