Browse Source

添加创建时间与更新时间

64850858 4 years ago
parent
commit
667257a75a

+ 4 - 0
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)
 );
 

+ 26 - 0
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;
+	}
 }

+ 26 - 0
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;
+	}
 }

+ 3 - 3
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>" +

+ 5 - 1
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>" +

BIN
src/main/resources/wvp.sqlite


+ 4 - 0
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">