From bc431e429026d5efb9d404767f76a0724978d40d Mon Sep 17 00:00:00 2001
From: Cloud User <liaobin143@gmail.com>
Date: 星期五, 15 九月 2023 22:39:08 +0800
Subject: [PATCH] fix-use-source-ip-as-stream-ip
---
src/main/java/com/genersoft/iot/vmp/service/impl/GbStreamServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
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
old mode 100644
new mode 100755
index 5b5cd0b..b3f4d7d
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/GbStreamServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/GbStreamServiceImpl.java
@@ -110,11 +110,11 @@
deviceChannel.setLatitude(gbStream.getLatitude());
deviceChannel.setDeviceId(platform.getDeviceGBId());
deviceChannel.setManufacture("wvp-pro");
- deviceChannel.setStatus(gbStream.isStatus()?1:0);
+ deviceChannel.setStatus(gbStream.isStatus());
deviceChannel.setRegisterWay(1);
- PlatformCatalog catalog = catalogMapper.select(catalogId);
+ PlatformCatalog catalog = catalogMapper.selectByPlatFormAndCatalogId(platform.getServerGBId(), catalogId);
if (catalog != null) {
deviceChannel.setCivilCode(catalog.getCivilCode());
deviceChannel.setParentId(catalog.getParentId());
@@ -213,10 +213,10 @@
}else {
status = gbStreamMapper.selectStatusForPush(gbStream.getApp(), gbStream.getStream());
}
- deviceChannel.setStatus((status != null && status )?1:0);
+ deviceChannel.setStatus(status != null && status);
deviceChannel.setRegisterWay(1);
- PlatformCatalog catalog = catalogMapper.select(catalogId);
+ PlatformCatalog catalog = catalogMapper.selectByPlatFormAndCatalogId(platform.getServerGBId(), catalogId);
if (catalog != null) {
deviceChannel.setCivilCode(catalog.getCivilCode());
deviceChannel.setParentId(catalog.getParentId());
--
Gitblit v1.8.0