From 0532363192ae662b027844276af266f2fe2b16dc Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: Tue, 20 Jun 2023 09:29:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=9B=BD=E6=A0=87=E7=BA=A7?=
 =?UTF-8?q?=E8=81=94=E6=B3=A8=E5=86=8C=E6=9C=BA=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../transmit/cmd/impl/SIPCommanderFroPlatform.java |  2 +-
 .../genersoft/iot/vmp/gb28181/utils/XmlUtil.java   | 14 +++++++-------
 .../vmp/storager/impl/VideoManagerStorageImpl.java |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

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 d39a01cf..0a929206 100644
--- 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
@@ -339,7 +339,7 @@ public class SIPCommanderFroPlatform implements ISIPCommanderForPlatform {
                             }else {
                                 catalogXml.append("<PTZType></PTZType>\r\n");
                             }
-                            catalogXml.append("<Status>" + (channel.getStatus() == 1?"ON":"OFF") + "</Status>\r\n");
+                            catalogXml.append("<Status>" + (channel.isStatus() ?"ON":"OFF") + "</Status>\r\n");
 
                             catalogXml.append("<Longitude>" +
                                     (channel.getLongitudeWgs84() != 0? channel.getLongitudeWgs84():channel.getLongitude())
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java b/src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java
index 2117c1d1..7914ffac 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java
@@ -225,7 +225,7 @@ public class XmlUtil {
             }else {
                 logger.warn("[xml解析] 无法确定行政区划{}的上级行政区划", channelId);
             }
-            deviceChannel.setStatus(1);
+            deviceChannel.setStatus(true);
             return deviceChannel;
         }else {
             if(channelId.length() != 20) {
@@ -284,7 +284,7 @@ public class XmlUtil {
                     if (!ObjectUtils.isEmpty(address)) {
                         deviceChannel.setAddress(address);
                     }
-                    deviceChannel.setStatus(1);
+                    deviceChannel.setStatus(true);
                     if (!ObjectUtils.isEmpty(registerWay)) {
                         try {
                             deviceChannel.setRegisterWay(Integer.parseInt(registerWay));
@@ -298,7 +298,7 @@ public class XmlUtil {
                     return deviceChannel;
                 case 215:
                     // 业务分组
-                    deviceChannel.setStatus(1);
+                    deviceChannel.setStatus(true);
                     if (!ObjectUtils.isEmpty(parentID)) {
                         if (!parentID.trim().equalsIgnoreCase(device.getDeviceId())) {
                             deviceChannel.setParentId(parentID);
@@ -312,7 +312,7 @@ public class XmlUtil {
                     break;
                 case 216:
                     // 虚拟组织
-                    deviceChannel.setStatus(1);
+                    deviceChannel.setStatus(true);
                     if (!ObjectUtils.isEmpty(businessGroupID)) {
                         deviceChannel.setBusinessGroupId(businessGroupID);
                     }
@@ -476,13 +476,13 @@ public class XmlUtil {
                     if (status != null) {
                         // ONLINE OFFLINE HIKVISION DS-7716N-E4 NVR的兼容性处理
                         if (status.equals("ON") || status.equals("On") || status.equals("ONLINE") || status.equals("OK")) {
-                            deviceChannel.setStatus(1);
+                            deviceChannel.setStatus(true);
                         }
                         if (status.equals("OFF") || status.equals("Off") || status.equals("OFFLINE")) {
-                            deviceChannel.setStatus(0);
+                            deviceChannel.setStatus(false);
                         }
                     }else {
-                        deviceChannel.setStatus(1);
+                        deviceChannel.setStatus(true);
                     }
 
                     // 经度
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java b/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java
index 9239747c..455eeb2f 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java
@@ -140,11 +140,11 @@ public class VideoManagerStorageImpl implements IVideoManagerStorage {
 			if (allChannelMap.containsKey(deviceChannel.getChannelId())) {
 				deviceChannel.setStreamId(allChannelMap.get(deviceChannel.getChannelId()).getStreamId());
 				deviceChannel.setHasAudio(allChannelMap.get(deviceChannel.getChannelId()).isHasAudio());
-				if (allChannelMap.get(deviceChannel.getChannelId()).getStatus() !=deviceChannel.getStatus()){
+				if (allChannelMap.get(deviceChannel.getChannelId()).isStatus() !=deviceChannel.isStatus()){
 					List<String> strings = platformChannelMapper.queryParentPlatformByChannelId(deviceChannel.getChannelId());
 					if (!CollectionUtils.isEmpty(strings)){
 						strings.forEach(platformId->{
-							eventPublisher.catalogEventPublish(platformId, deviceChannel, deviceChannel.getStatus()==1?CatalogEvent.ON:CatalogEvent.OFF);
+							eventPublisher.catalogEventPublish(platformId, deviceChannel, deviceChannel.isStatus()?CatalogEvent.ON:CatalogEvent.OFF);
 						});
 					}