From 42a2772d1aa7493bcc4fac3e24ee8eda4eebc23d Mon Sep 17 00:00:00 2001 From: xubinbin <1323875150@qq.com> Date: 星期二, 12 十二月 2023 17:09:04 +0800 Subject: [PATCH] bugfix:请求头带token, SecurityUtils 获取用户id 一直为0 #1195 --- src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java | 41 ++++++++++++++++++++++++----------------- 1 files changed, 24 insertions(+), 17 deletions(-) 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 old mode 100644 new mode 100755 index ef2eecd..1638c71 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java @@ -53,7 +53,7 @@ /** * 璁惧鍥芥爣缂栧彿 */ - @Schema(description = "11111") + @Schema(description = "璁惧鍥芥爣缂栧彿") private String deviceGBId; /** @@ -84,13 +84,13 @@ * 娉ㄥ唽鍛ㄦ湡 (绉�) */ @Schema(description = "娉ㄥ唽鍛ㄦ湡 (绉�)") - private String expires; + private int expires; /** * 蹇冭烦鍛ㄦ湡(绉�) */ @Schema(description = "蹇冭烦鍛ㄦ湡(绉�)") - private String keepTimeout; + private int keepTimeout; /** * 浼犺緭鍗忚 @@ -113,7 +113,6 @@ /** * RTCP娴佷繚娲� - * TODO 棰勭暀, 鏆備笉瀹炵幇 */ @Schema(description = "RTCP娴佷繚娲�") private boolean rtcp; @@ -184,11 +183,11 @@ @Schema(description = "鍒涘缓鏃堕棿") private String createTime; - /** - * 鏍戠被鍨� 鍥芥爣瑙勫畾浜嗕袱绉嶆爲鐨勫睍鐜版柟寮� 琛屾斂鍖哄垝 CivilCode 鍜屼笟鍔″垎缁�:BusinessGroup - */ - @Schema(description = "鏍戠被鍨� 鍥芥爣瑙勫畾浜嗕袱绉嶆爲鐨勫睍鐜版柟寮� 琛屾斂鍖哄垝 CivilCode 鍜屼笟鍔″垎缁�:BusinessGrou") - private String treeType; + @Schema(description = "鏄惁浣滀负娑堟伅閫氶亾") + private boolean asMessageChannel; + + @Schema(description = "鏄惁浣滀负娑堟伅閫氶亾") + private boolean autoPushChannel; public Integer getId() { return id; @@ -286,19 +285,19 @@ this.password = password; } - public String getExpires() { + public int getExpires() { return expires; } - public void setExpires(String expires) { + public void setExpires(int expires) { this.expires = expires; } - public String getKeepTimeout() { + public int getKeepTimeout() { return keepTimeout; } - public void setKeepTimeout(String keepTimeout) { + public void setKeepTimeout(int keepTimeout) { this.keepTimeout = keepTimeout; } @@ -422,11 +421,19 @@ this.createTime = createTime; } - public String getTreeType() { - return treeType; + public boolean isAsMessageChannel() { + return asMessageChannel; } - public void setTreeType(String treeType) { - this.treeType = treeType; + public void setAsMessageChannel(boolean asMessageChannel) { + this.asMessageChannel = asMessageChannel; + } + + public boolean isAutoPushChannel() { + return autoPushChannel; + } + + public void setAutoPushChannel(boolean autoPushChannel) { + this.autoPushChannel = autoPushChannel; } } -- Gitblit v1.8.0