From 667257a75a228ce7fe50a8a3cc8160628876015f Mon Sep 17 00:00:00 2001
From: 64850858 <648540858@qq.com>
Date: Mon, 7 Jun 2021 16:44:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=9B=E5=BB=BA=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E4=B8=8E=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sql/mysql.sql                                 |   4 +++
 .../iot/vmp/gb28181/bean/Device.java          |  26 ++++++++++++++++++
 .../iot/vmp/gb28181/bean/DeviceChannel.java   |  26 ++++++++++++++++++
 .../vmp/storager/dao/DeviceChannelMapper.java |   6 ++--
 .../iot/vmp/storager/dao/DeviceMapper.java    |   6 +++-
 src/main/resources/wvp.sqlite                 | Bin 114688 -> 114688 bytes
 web_src/src/components/DeviceList.vue         |   4 +++
 7 files changed, 68 insertions(+), 4 deletions(-)

diff --git a/sql/mysql.sql b/sql/mysql.sql
index 71e651a1..7055edd3 100644
--- a/sql/mysql.sql
+++ b/sql/mysql.sql
@@ -15,6 +15,8 @@ create table device
     registerTime       varchar(50) null,
     keepaliveTime      varchar(50) null,
     ip                 varchar(50) not null,
+    createTime         varchar(50) not null,
+    updateTime         varchar(50) not null,
     port               int          not null,
     expires            int          not null,
     hostAddress        varchar(50) not null
@@ -49,6 +51,8 @@ create table device_channel
     deviceId    varchar(50) not null,
     parental    varchar(50) null,
     hasAudio    bit(1)   null,
+    createTime  varchar(50) not null,
+    updateTime  varchar(50) not null,
     primary key (channelId, deviceId)
 );
 
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
index a9185e0c..6f3d4d73 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
@@ -84,6 +84,16 @@ public class Device {
 	 */
 	private int expires;
 
+	/**
+	 * 创建时间
+	 */
+	private String createTime;
+
+	/**
+	 * 更新时间
+	 */
+	private String updateTime;
+
 	public String getDeviceId() {
 		return deviceId;
 	}
@@ -203,4 +213,20 @@ public class Device {
 	public void setExpires(int expires) {
 		this.expires = expires;
 	}
+
+	public String getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(String createTime) {
+		this.createTime = createTime;
+	}
+
+	public String getUpdateTime() {
+		return updateTime;
+	}
+
+	public void setUpdateTime(String updateTime) {
+		this.updateTime = updateTime;
+	}
 }
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java
index ca6ef60f..6d40e360 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java
@@ -118,6 +118,16 @@ public class DeviceChannel {
 	 * 云台类型描述字符串
 	 */
 	private String PTZTypeText;
+
+	/**
+	 * 创建时间
+	 */
+	private String createTime;
+
+	/**
+	 * 更新时间
+	 */
+	private String updateTime;
 	
 	/**
 	 * 在线/离线
@@ -403,4 +413,20 @@ public class DeviceChannel {
 	public void setStreamId(String streamId) {
 		this.streamId = streamId;
 	}
+
+	public String getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(String createTime) {
+		this.createTime = createTime;
+	}
+
+	public String getUpdateTime() {
+		return updateTime;
+	}
+
+	public void setUpdateTime(String updateTime) {
+		this.updateTime = updateTime;
+	}
 }
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
index 2f534cf6..6b3bd1c5 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
@@ -16,15 +16,15 @@ public interface DeviceChannelMapper {
 
     @Insert("INSERT INTO device_channel (channelId, deviceId, name, manufacture, model, owner, civilCode, block, " +
             "address, parental, parentId, safetyWay, registerWay, certNum, certifiable, errCode, secrecy, " +
-            "ipAddress, port, password, PTZType, status, streamId, longitude, latitude) " +
+            "ipAddress, port, password, PTZType, status, streamId, longitude, latitude, createTime, updateTime) " +
             "VALUES ('${channelId}', '${deviceId}', '${name}', '${manufacture}', '${model}', '${owner}', '${civilCode}', '${block}'," +
             "'${address}', ${parental}, '${parentId}', ${safetyWay}, ${registerWay}, '${certNum}', ${certifiable}, ${errCode}, '${secrecy}', " +
-            "'${ipAddress}', ${port}, '${password}', ${PTZType}, ${status}, '${streamId}', ${longitude}, ${latitude})")
+            "'${ipAddress}', ${port}, '${password}', ${PTZType}, ${status}, '${streamId}', ${longitude}, ${latitude}, datetime('now','localtime'), datetime('now','localtime'))")
     int add(DeviceChannel channel);
 
     @Update(value = {" <script>" +
             "UPDATE device_channel " +
-            "SET deviceId='${deviceId}'" +
+            "SET updateTime=datetime('now','localtime'))" +
             "<if test=\"name != null\">, name='${name}'</if>" +
             "<if test=\"manufacture != null\">, manufacture='${manufacture}'</if>" +
             "<if test=\"model != null\">, model='${model}'</if>" +
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java
index d597f35b..4fac2c18 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java
@@ -30,6 +30,8 @@ public interface DeviceMapper {
                 "expires," +
                 "registerTime," +
                 "keepaliveTime," +
+                "createTime," +
+                "updateTime," +
                 "online" +
             ") VALUES (" +
                 "#{deviceId}," +
@@ -45,13 +47,15 @@ public interface DeviceMapper {
                 "#{expires}," +
                 "#{registerTime}," +
                 "#{keepaliveTime}," +
+                "datetime('now','localtime')," +
+                "datetime('now','localtime')," +
                 "#{online}" +
             ")")
     int add(Device device);
 
     @Update(value = {" <script>" +
                 "UPDATE device " +
-                "SET deviceId='${deviceId}'" +
+                "SET updateTime=datetime('now','localtime')" +
                 "<if test=\"name != null\">, name='${name}'</if>" +
                 "<if test=\"manufacturer != null\">, manufacturer='${manufacturer}'</if>" +
                 "<if test=\"model != null\">, model='${model}'</if>" +
diff --git a/src/main/resources/wvp.sqlite b/src/main/resources/wvp.sqlite
index 3131c0f05b1486b5b922a97f05cdb959af05c0b2..7c38c4325a7e1c19b3c59f5914b4b623cf48223e 100644
GIT binary patch
delta 451
zcmZo@U~gz(pCB#xlYxOj28cO;m<foMPt-AH{JAk<9zSz4Kks(N35@^c7a2HA3}9zv
z1S(<PE;xbl3;(7DmIq3FtXmlP*Kt*H8M4)IKIW+7aN)bhH-mQrZw*f?k1y*M)-BuB
z5*Yhfr<;{Cp4eWK#yFdig}a_XcVeR^yLpomo4B{?^of;>65EaH7|$_oH_T%6V`Kr^
zac*McsqIIr81)&a->+pfnSQF0@x}Hp)r?|{)7RxQ21|0jV&G&EVqibb-pv-pro#G;
z#eqeLH<?#;V<R6U3+F4QWg8n8F##D2E)yFa*tMID*u?E6!B$P5o6X2Rowt&aT~4N1
ztJ#oUTvC#;O}`{DDJL~0wJb9kN=k3<FJiO<+E>CT$5mR8l30=&l9`)2{ag*B{PbJJ
zj6BT7%^K7FDjC(M+gCC=ZGTqGXvjFdtCG=SyLc(1JQL6x%+?zl&6%04n@y%SW;0sx
zu(wJ!8?%dRYBF}_PCu5-sL05){Y5sTGLx!Oa#1SO0wvB6*N6}uE>0zcr4X^{9C?fy
Rj9i-;9f0wnAh0Mv005ugh28)F

delta 484
zcmZo@U~gz(pCB#xoq>Tt28x*&7?|cy)G=oKzA<4QKXaor?`FmY%nF-X4F1?J3J}=T
z!16$ejje`(e;xN8?s~3DE<?5&IMib~$<oifi@9yPS^{Gq>%<8sw%4RF&SqrcGhmY1
z*eJ%d-7t&MkCDx~mQCDWbNc)|Mv3VzwTyDy94&=4?Bbf5jGeO6^J*Ct8JV|FsAW`U
zntr>UQI&;(fw695V-@4{b@`0Jy6pcL1euB$_&4$S@(J@;aev`F#e1LYFV|6aGgfiV
zF6L*P-khRLMI6sLW^v4#*tmg({U0+2NV^gHKgKSgH_<>-L9;%)xTGXwt940YQch}0
zYFTD7l$_pQ%P6|Nu!K>IQ8FON)7LR5Qo-9bQbP%%$TLMrlS^}ZR2ico<Mz|#jPgv=
zx1=(jVBu_Jcsa50DZ6&F0h_qJB-o?;5H0bB5So4ZyHds+POeQ1oM87%?=EL_n7$#G
z@dXPn7lZJ2yBtP4#_com7{wTY{%5#4vGL;cnp{Q`cJn4BHgRuNNZ{q<Fmi0q&R{&o
b$jG&s(c!=RW(5Iu0aiw!4(ZK;0$=z6q*aI@

diff --git a/web_src/src/components/DeviceList.vue b/web_src/src/components/DeviceList.vue
index e05855fb..c2971aa5 100644
--- a/web_src/src/components/DeviceList.vue
+++ b/web_src/src/components/DeviceList.vue
@@ -46,6 +46,10 @@
           </el-table-column>
           <el-table-column prop="registerTime" label="最近注册" align="center" width="140">
           </el-table-column>
+          <el-table-column prop="updateTime" label="更新时间" align="center" width="140">
+          </el-table-column>
+          <el-table-column prop="createTime" label="创建时间" align="center" width="140">
+          </el-table-column>
           <el-table-column label="地址" width="180" align="center">
             <template slot-scope="scope">
               <div slot="reference" class="name-wrapper">