From a2cac5ca12f100d052cb31122a84de4bba829bca Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 04 一月 2024 18:34:46 +0800
Subject: [PATCH] Merge branch '2.6.9' into wvp-28181-2.0
---
libs/jdbc-x86/postgresql-42.2.9.jre6.jar | 0
libs/jdbc-x86/kingbase8-8.6.0.jre7.jar | 0
libs/jdbc-x86/postgresql-42.2.9.jar | 0
src/main/resources/all-application.yml | 4 +-
pom.xml | 29 +++++++++-----
src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformGbStreamMapper.java | 5 ++
libs/jdbc-x86/postgresql-42.2.9.jre7.jar | 0
libs/jdbc-x86/kingbase8-8.6.0.jar | 0
src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiDeviceController.java | 24 +++++++----
libs/jdbc-x86/bcprov-jdk15on-1.70.jar | 0
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java | 4 +-
src/main/java/com/genersoft/iot/vmp/service/impl/GbStreamServiceImpl.java | 3 -
libs/jdbc-x86/kingbase8-8.6.0.jre6.jar | 0
13 files changed, 41 insertions(+), 28 deletions(-)
diff --git a/libs/jdbc-x86/bcprov-jdk15on-1.70.jar b/libs/jdbc-x86/bcprov-jdk15on-1.70.jar
new file mode 100644
index 0000000..0e4198e
--- /dev/null
+++ b/libs/jdbc-x86/bcprov-jdk15on-1.70.jar
Binary files differ
diff --git a/libs/jdbc-x86/kingbase8-8.6.0.jar b/libs/jdbc-x86/kingbase8-8.6.0.jar
new file mode 100644
index 0000000..ff4664e
--- /dev/null
+++ b/libs/jdbc-x86/kingbase8-8.6.0.jar
Binary files differ
diff --git a/libs/jdbc-x86/kingbase8-8.6.0.jre6.jar b/libs/jdbc-x86/kingbase8-8.6.0.jre6.jar
new file mode 100644
index 0000000..fcdf628
--- /dev/null
+++ b/libs/jdbc-x86/kingbase8-8.6.0.jre6.jar
Binary files differ
diff --git a/libs/jdbc-x86/kingbase8-8.6.0.jre7.jar b/libs/jdbc-x86/kingbase8-8.6.0.jre7.jar
new file mode 100644
index 0000000..a039358
--- /dev/null
+++ b/libs/jdbc-x86/kingbase8-8.6.0.jre7.jar
Binary files differ
diff --git a/libs/jdbc-x86/postgresql-42.2.9.jar b/libs/jdbc-x86/postgresql-42.2.9.jar
new file mode 100644
index 0000000..487cfc1
--- /dev/null
+++ b/libs/jdbc-x86/postgresql-42.2.9.jar
Binary files differ
diff --git a/libs/jdbc-x86/postgresql-42.2.9.jre6.jar b/libs/jdbc-x86/postgresql-42.2.9.jre6.jar
new file mode 100644
index 0000000..11e9f99
--- /dev/null
+++ b/libs/jdbc-x86/postgresql-42.2.9.jre6.jar
Binary files differ
diff --git a/libs/jdbc-x86/postgresql-42.2.9.jre7.jar b/libs/jdbc-x86/postgresql-42.2.9.jre7.jar
new file mode 100644
index 0000000..522738d
--- /dev/null
+++ b/libs/jdbc-x86/postgresql-42.2.9.jre7.jar
Binary files differ
diff --git a/pom.xml b/pom.xml
index 553a581..9273ccb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -143,17 +143,24 @@
<version>42.5.1</version>
</dependency>
- <!-- kingbase浜哄ぇ閲戜粨 -->
- <!-- 鎵嬪姩涓嬭浇椹卞姩鍚庡畨瑁� -->
- <!-- mvn install:install-file -Dfile=/home/lin/soft/kingbase/jdbc-aarch/kingbase8-8.6.0.jar -DgroupId=com.kingbase -DartifactId=kingbase8
- -Dversion=8.6.0 -Dpackaging=jar -->
- <dependency>
- <groupId>com.kingbase</groupId>
- <artifactId>kingbase8</artifactId>
- <version>8.6.0</version>
- <scope>system</scope>
- <systemPath>${basedir}/libs/jdbc-aarch/kingbase8-8.6.0.jar</systemPath>
- </dependency>
+ <!-- kingbase浜哄ぇ閲戜粨 -->
+ <!-- 鎵嬪姩涓嬭浇椹卞姩鍚庡畨瑁� -->
+ <!-- mvn install:install-file -Dfile=/home/lin/soft/kingbase/jdbc-aarch/kingbase8-8.6.0.jar -DgroupId=com.kingbase -DartifactId=kingbase8 -Dversion=8.6.0 -Dpackaging=jar
+ -->
+ <dependency>
+ <groupId>com.kingbase</groupId>
+ <artifactId>kingbase8</artifactId>
+ <version>8.6.0</version>
+ <scope>system</scope>
+ <systemPath>${basedir}/libs/jdbc-aarch/kingbase8-8.6.0.jar</systemPath>
+ </dependency>
+ <dependency>
+ <groupId>com.kingbase</groupId>
+ <artifactId>kingbase8</artifactId>
+ <version>8.6.0</version>
+ <scope>system</scope>
+ <systemPath>${basedir}/libs/jdbc-x86/kingbase8-8.6.0.jar</systemPath>
+ </dependency>
<!--Mybatis鍒嗛〉鎻掍欢 -->
<dependency>
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
index 473ca91..ecbdcca 100755
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
@@ -598,7 +598,7 @@
SIPRequest notifyRequest = headerProviderPlatformProvider.createNotifyRequest(parentPlatform, catalogXmlContent, subscribeInfo);
- sipSender.transmitRequest(parentPlatform.getDeviceIp(), notifyRequest);
+ sipSender.transmitRequest(parentPlatform.getDeviceIp(), notifyRequest, errorEvent, okEvent);
}
private String getCatalogXmlContentForCatalogAddOrUpdate(ParentPlatform parentPlatform, List<DeviceChannel> channels, int sumNum, String type, SubscribeInfo subscribeInfo) {
@@ -610,7 +610,7 @@
.append("<CmdType>Catalog</CmdType>\r\n")
.append("<SN>" + (int) ((Math.random() * 9 + 1) * 100000) + "</SN>\r\n")
.append("<DeviceID>" + parentPlatform.getDeviceGBId() + "</DeviceID>\r\n")
- .append("<SumNum>1</SumNum>\r\n")
+ .append("<SumNum>"+ channels.size() +"</SumNum>\r\n")
.append("<DeviceList Num=\"" + channels.size() + "\">\r\n");
if (channels.size() > 0) {
for (DeviceChannel channel : channels) {
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/GbStreamServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/GbStreamServiceImpl.java
index 26b4f3e..86e033c 100755
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/GbStreamServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/GbStreamServiceImpl.java
@@ -250,9 +250,6 @@
if (platform == null) {
return ;
}
- if (ObjectUtils.isEmpty(catalogId)) {
- catalogId = platform.getDeviceGBId();
- }
if (platformGbStreamMapper.delByPlatformAndCatalogId(platformId, catalogId) > 0) {
List<GbStream> gbStreams = platformGbStreamMapper.queryChannelInParentPlatformAndCatalog(platformId, catalogId);
List<DeviceChannel> deviceChannelList = new ArrayList<>();
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformGbStreamMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformGbStreamMapper.java
index c394bcb..5f6d784 100755
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformGbStreamMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformGbStreamMapper.java
@@ -103,6 +103,9 @@
"</script>")
void delByAppAndStreamsByPlatformId(@Param("gbStreams") List<GbStream> gbStreams, @Param("platformId") String platformId);
- @Delete("DELETE from wvp_platform_gb_stream WHERE platform_id=#{platformId} and catalog_id=#{catalogId}")
+ @Delete("<script> "+
+ "DELETE from wvp_platform_gb_stream WHERE platform_id=#{platformId}" +
+ " <if test='catalogId != null' > and catalog_id=#{catalogId}</if>" +
+ "</script>")
int delByPlatformAndCatalogId(@Param("platformId") String platformId, @Param("catalogId") String catalogId);
}
diff --git a/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiDeviceController.java b/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiDeviceController.java
index 7b59f7f..688fc80 100644
--- a/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiDeviceController.java
+++ b/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiDeviceController.java
@@ -68,6 +68,7 @@
// if (logger.isDebugEnabled()) {
// logger.debug("鏌ヨ鎵�鏈夎棰戣澶嘇PI璋冪敤");
// }
+
JSONObject result = new JSONObject();
List<Device> devices;
if (start == null || limit ==null) {
@@ -80,7 +81,7 @@
}
JSONArray deviceJSONList = new JSONArray();
- for (Device device : devices) {
+ devices.stream().forEach(device -> {
JSONObject deviceJsonObject = new JSONObject();
deviceJsonObject.put("ID", device.getDeviceId());
deviceJsonObject.put("Name", device.getName());
@@ -99,7 +100,7 @@
deviceJsonObject.put("UpdatedAt", "");
deviceJsonObject.put("CreatedAt", "");
deviceJSONList.add(deviceJsonObject);
- }
+ });
result.put("DeviceList",deviceJSONList);
return result;
}
@@ -114,7 +115,6 @@
@RequestParam(required = false)String q,
@RequestParam(required = false)Boolean online ){
-
JSONObject result = new JSONObject();
List<DeviceChannelExtend> deviceChannels;
List<String> channelIds = null;
@@ -127,13 +127,19 @@
deviceChannels = allDeviceChannelList;
result.put("ChannelCount", deviceChannels.size());
}else {
- deviceChannels = storager.queryChannelsByDeviceIdWithStartAndLimit(serial,channelIds, null, null, online,start, limit);
- int total = allDeviceChannelList.size();
- result.put("ChannelCount", total);
+ if (start > allDeviceChannelList.size()) {
+ deviceChannels = new ArrayList<>();
+ }else {
+ if (start + limit < allDeviceChannelList.size()) {
+ deviceChannels = allDeviceChannelList.subList(start, start + limit);
+ }else {
+ deviceChannels = allDeviceChannelList.subList(start, allDeviceChannelList.size());
+ }
+ }
+ result.put("ChannelCount", allDeviceChannelList.size());
}
-
JSONArray channleJSONList = new JSONArray();
- for (DeviceChannelExtend deviceChannelExtend : deviceChannels) {
+ deviceChannels.stream().forEach(deviceChannelExtend -> {
JSONObject deviceJOSNChannel = new JSONObject();
deviceJOSNChannel.put("ID", deviceChannelExtend.getChannelId());
deviceJOSNChannel.put("DeviceID", deviceChannelExtend.getDeviceId());
@@ -166,7 +172,7 @@
deviceJOSNChannel.put("StreamID", deviceChannelExtend.getStreamId()); // StreamID 鐩存挱娴両D, 鏈夊�艰〃绀烘鍦ㄧ洿鎾�
deviceJOSNChannel.put("NumOutputs ", -1); // 鐩存挱鍦ㄧ嚎浜烘暟
channleJSONList.add(deviceJOSNChannel);
- }
+ });
result.put("ChannelList", channleJSONList);
return result;
}
diff --git a/src/main/resources/all-application.yml b/src/main/resources/all-application.yml
index 0688f28..7336f14 100644
--- a/src/main/resources/all-application.yml
+++ b/src/main/resources/all-application.yml
@@ -54,9 +54,9 @@
password: root123
hikari:
connection-timeout: 20000 # 鏄鎴风绛夊緟杩炴帴姹犺繛鎺ョ殑鏈�澶ф绉掓暟
- initialSize: 10 # 杩炴帴姹犲垵濮嬪寲杩炴帴鏁�
+ initialSize: 50 # 杩炴帴姹犲垵濮嬪寲杩炴帴鏁�
maximum-pool-size: 200 # 杩炴帴姹犳渶澶ц繛鎺ユ暟
- minimum-idle: 5 # 杩炴帴姹犳渶灏忕┖闂茶繛鎺ユ暟
+ minimum-idle: 10 # 杩炴帴姹犳渶灏忕┖闂茶繛鎺ユ暟
idle-timeout: 300000 # 鍏佽杩炴帴鍦ㄨ繛鎺ユ睜涓┖闂茬殑鏈�闀挎椂闂达紙浠ユ绉掍负鍗曚綅锛�
max-lifetime: 1200000 # 鏄睜涓繛鎺ュ叧闂悗鐨勬渶闀跨敓鍛藉懆鏈燂紙浠ユ绉掍负鍗曚綅)
--
Gitblit v1.8.0