去除lombok，readme更新

648540858
1 parent 28d7fd3b
Showing 9 changed files with 214 additions and 40 deletions
README.md
pom.xml
src/main/java/com/genersoft/iot/vmp/gb28181/event/platformNotRegister/PlatformCycleRegisterEventLister.java
src/main/java/com/genersoft/iot/vmp/utils/node/BaseNode.java
src/main/java/com/genersoft/iot/vmp/utils/node/ForestNode.java
src/main/java/com/genersoft/iot/vmp/utils/node/TreeNode.java
src/main/java/com/genersoft/iot/vmp/vmanager/bean/DeviceChannelTree.java
src/main/java/com/genersoft/iot/vmp/vmanager/bean/DeviceChannelTreeNode.java
src/main/java/com/genersoft/iot/vmp/vmanager/bean/WVPResult.java
@@ -8,7 +8,7 @@
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-yellow.svg)](https://github.com/xia-chu/ZLMediaKit/pulls)
-WEB VIDEO PLATFORM銝銝芸鈭B28181-2016蝞勗像嚗提摰敹縑隞支挽憭恣AT蝛輸絲摨瑯之PCVRVR漣tsp/rtmp蝑蓮像嚗tsp/rtmp蝑瘚蓮像   
+WEB VIDEO PLATFORM銝銝芸鈭B28181-2016蝞勗像嚗提摰敹縑隞支挽憭恣AT蝛輸絲摨瑯之PCVR漣蒂/瘚/瘚蓮隞像   
 瘚鈭LMediaKit-https://github.com/xiongziliang/ZLMediaKit
@@ -31,11 +31,13 @@ WEB VIDEO PLATFORM銝銝芸鈭B28181-2016蝞勗
 https://gitee.com/pan648540858/wvp-GB28181-pro.git
 # 
-![build_1.png](https://github.com/648540858/wiki/blob/master/images/Screenshot_1.png)
-![build_1.png](https://github.com/648540858/wiki/blob/master/images/Screenshot_2.png)
-![build_1.png](https://github.com/648540858/wiki/blob/master/images/Screenshot_20201012_151459.png)
-![build_1.png](https://github.com/648540858/wiki/blob/master/images/Screenshot_20201012_152643.png)
-![build_1.png](https://github.com/648540858/wiki/blob/master/images/Screenshot_20201012_151606.png)
+![build_1.png](https://images.gitee.com/uploads/images/2022/0304/101513_79632720_1018729.png "2022-03-04_09-51.png")
+![build_1.png](https://images.gitee.com/uploads/images/2022/0304/103025_5df016f9_1018729.png "2022-03-04_10-27.png")
+![build_1.png](https://images.gitee.com/uploads/images/2022/0304/101706_088fbafa_1018729.png "2022-03-04_09-52_1.png")
+![build_1.png](https://images.gitee.com/uploads/images/2022/0304/101756_3d662828_1018729.png "2022-03-04_10-00_1.png")
+![build_1.png](https://images.gitee.com/uploads/images/2022/0304/101823_19050c66_1018729.png "2022-03-04_10-12_1.png")
+![build_1.png](https://images.gitee.com/uploads/images/2022/0304/101848_e5a39557_1018729.png "2022-03-04_10-12_2.png")
+![build_1.png](https://images.gitee.com/uploads/images/2022/0304/101919_ee5b8c79_1018729.png "2022-03-04_10-13.png"")
 # 1.0 蝖  
 1. 閫;  
@@ -79,7 +81,7 @@ https://gitee.com/pan648540858/wvp-GB28181-pro.git
    -  [X] 蝘餃雿蔭憭
    -  [X] 霅虫辣霈ａ
    -  [X] 霅虫辣憭
-   -  [ ] 霈曉敶恥
+   -  [X] 霈曉敶恥
    -  [X] 霈曉敶憭
 16. 蝘餃雿蔭霂Ｗ蝷綽蔭辣霈曄蔭蝘餃雿蔭摮
@@ -96,6 +98,9 @@ https://gitee.com/pan648540858/wvp-GB28181-pro.git
     - [X] 撟喳靽⊥霂
     - [X] 撟喳餈
     - [X] 瘥葵蝥扯像摰敶
+    - [X] 敶恥
+    - [X] 敶
+    - [X] GPS霈ａ嚗瘚
 - [X] 瘛餃TSP閫
 - [X] 瘛餃
 - [X] 瘛餃TMP閫
@@ -253,10 +253,6 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 <!--			<scope>test</scope>-->
 		</dependency>
-		<dependency>
-			<groupId>org.projectlombok</groupId>
-			<artifactId>lombok</artifactId>
-		</dependency>
 	</dependencies>
@@ -4,7 +4,8 @@ import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
 import com.genersoft.iot.vmp.gb28181.event.SipSubscribe;
 import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommanderForPlatform;
 import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
-import lombok.extern.slf4j.Slf4j;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationListener;
 import org.springframework.stereotype.Component;
@@ -12,9 +13,11 @@ import org.springframework.stereotype.Component;
 import java.util.Timer;
 import java.util.TimerTask;
-@Slf4j
 @Component
 public class PlatformCycleRegisterEventLister implements ApplicationListener<PlatformCycleRegisterEvent> {
+
+    private final static Logger logger = LoggerFactory.getLogger(PlatformCycleRegisterEventLister.class);
+
     @Autowired
     private IVideoManagerStorager storager;
     @Autowired
@@ -22,10 +25,10 @@ public class PlatformCycleRegisterEventLister implements ApplicationListener&lt;Pla
     @Override
     public void onApplicationEvent(PlatformCycleRegisterEvent event) {
-        log.info("上级平台周期注册事件");
+        logger.info("上级平台周期注册事件");
         ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(event.getPlatformGbID());
         if (parentPlatform == null) {
-            log.info("[ 平台未注册事件 ] 平台已经删除!!! 平台国标ID：" + event.getPlatformGbID());
+            logger.info("[ 平台未注册事件 ] 平台已经删除!!! 平台国标ID：" + event.getPlatformGbID());
             return;
         }
         Timer timer = new Timer();
@@ -36,7 +39,7 @@ public class PlatformCycleRegisterEventLister implements ApplicationListener&lt;Pla
         timer.schedule(new TimerTask() {
             @Override
             public void run() {
-                log.info("[平台注册]再次向平台注册，平台国标ID：" + event.getPlatformGbID());
+                logger.info("[平台注册]再次向平台注册，平台国标ID：" + event.getPlatformGbID());
                 sipCommanderFroPlatform.register(parentPlatform, null, okEvent);
             }
         }, 15*1000 ,Long.parseLong(parentPlatform.getExpires())* 1000);
 package com.genersoft.iot.vmp.utils.node;
 import com.fasterxml.jackson.annotation.JsonInclude;
-import lombok.Data;
 import java.util.ArrayList;
 import java.util.List;
@@ -10,7 +9,6 @@ import java.util.List;
  * 节点基类
  *
  */
-@Data
 public class BaseNode<T> implements INode<T> {
 	private static final long serialVersionUID = 1L;
@@ -51,4 +49,34 @@ public class BaseNode&lt;T&gt; implements INode&lt;T&gt; {
 		}
 	}
+	@Override
+	public int getId() {
+		return id;
+	}
+
+	public void setId(int id) {
+		this.id = id;
+	}
+
+	@Override
+	public String getParentId() {
+		return parentId;
+	}
+
+	public void setParentId(String parentId) {
+		this.parentId = parentId;
+	}
+
+	@Override
+	public List<T> getChildren() {
+		return children;
+	}
+
+	public void setChildren(List<T> children) {
+		this.children = children;
+	}
+
+	public void setHasChildren(Boolean hasChildren) {
+		this.hasChildren = hasChildren;
+	}
 }
 package com.genersoft.iot.vmp.utils.node;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
 /**
  * 森林节点类
  *
  */
-@Data
-@EqualsAndHashCode(callSuper = false)
 public class ForestNode extends BaseNode<ForestNode> {
 	private static final long serialVersionUID = 1L;
@@ -25,4 +21,11 @@ public class ForestNode extends BaseNode&lt;ForestNode&gt; {
 		this.content = content;
 	}
+	public Object getContent() {
+		return content;
+	}
+
+	public void setContent(Object content) {
+		this.content = content;
+	}
 }
 package com.genersoft.iot.vmp.utils.node;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
+
 /**
  * 树型节点类
  *
  */
-@Data
-@EqualsAndHashCode(callSuper = false)
 public class TreeNode extends BaseNode<TreeNode> {
 	private static final long serialVersionUID = 1L;
@@ -18,4 +15,28 @@ public class TreeNode extends BaseNode&lt;TreeNode&gt; {
 	private String key;
 	private String value;
+
+	public String getTitle() {
+		return title;
+	}
+
+	public void setTitle(String title) {
+		this.title = title;
+	}
+
+	public String getKey() {
+		return key;
+	}
+
+	public void setKey(String key) {
+		this.key = key;
+	}
+
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
 }
@@ -4,14 +4,10 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
 import com.genersoft.iot.vmp.utils.node.INode;
 import io.swagger.annotations.ApiModel;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
 import java.util.ArrayList;
 import java.util.List;
-@Data
-@EqualsAndHashCode(callSuper = true)
 @ApiModel(value = "DeviceChannelTree对象", description = "DeviceChannelTree对象")
 public class DeviceChannelTree extends DeviceChannel implements INode<DeviceChannelTree> {
     private static final long serialVersionUID = 1L;
@@ -62,4 +58,64 @@ public class DeviceChannelTree extends DeviceChannel implements INode&lt;DeviceChan
             return this.hasChildren;
         }
     }
+
+    @Override
+    public int getId() {
+        return id;
+    }
+
+    @Override
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    @Override
+    public String getParentId() {
+        return parentId;
+    }
+
+    @Override
+    public void setParentId(String parentId) {
+        this.parentId = parentId;
+    }
+
+    public String getParentName() {
+        return parentName;
+    }
+
+    public void setParentName(String parentName) {
+        this.parentName = parentName;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public void setChildren(List<DeviceChannelTree> children) {
+        this.children = children;
+    }
+
+    public void setHasChildren(Boolean hasChildren) {
+        this.hasChildren = hasChildren;
+    }
 }
 package com.genersoft.iot.vmp.vmanager.bean;
 import com.genersoft.iot.vmp.utils.node.TreeNode;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-@Data
-@EqualsAndHashCode(callSuper = true)
 public class DeviceChannelTreeNode extends TreeNode {
 	private Integer status;
@@ -17,4 +13,44 @@ public class DeviceChannelTreeNode extends TreeNode {
 	private Double lng;
 	private Double lat;
+
+	public Integer getStatus() {
+		return status;
+	}
+
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
+
+	public String getDeviceId() {
+		return deviceId;
+	}
+
+	public void setDeviceId(String deviceId) {
+		this.deviceId = deviceId;
+	}
+
+	public String getChannelId() {
+		return channelId;
+	}
+
+	public void setChannelId(String channelId) {
+		this.channelId = channelId;
+	}
+
+	public Double getLng() {
+		return lng;
+	}
+
+	public void setLng(Double lng) {
+		this.lng = lng;
+	}
+
+	public Double getLat() {
+		return lat;
+	}
+
+	public void setLat(Double lat) {
+		this.lat = lat;
+	}
 }
 package com.genersoft.iot.vmp.vmanager.bean;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
 public class WVPResult<T> {
+    public WVPResult() {
+    }
+
+    public WVPResult(int code, String msg, T data) {
+        this.code = code;
+        this.msg = msg;
+        this.data = data;
+    }
+
     private int code;
     private String msg;
     private T data;
@@ -32,4 +35,27 @@ public class WVPResult&lt;T&gt; {
         return fail(FAILED, msg);
     }
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    public T getData() {
+        return data;
+    }
+
+    public void setData(T data) {
+        this.data = data;
+    }
 }