Commit 8ffe48d5 authored by gaoyingwei's avatar gaoyingwei

打开摄像头开关,加抓拍时间字段回显

parent d25aff88
...@@ -126,6 +126,12 @@ public class DoorDeviceInfo extends CyIdIncreEntity<DoorDeviceInfo> { ...@@ -126,6 +126,12 @@ public class DoorDeviceInfo extends CyIdIncreEntity<DoorDeviceInfo> {
@TableField(exist = false) @TableField(exist = false)
private String capturePic; private String capturePic;
/**
* 抓拍图像
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date captureTime;
/** /**
* 设备上班数据内容 (告警原因) * 设备上班数据内容 (告警原因)
*/ */
......
...@@ -140,4 +140,4 @@ message: ...@@ -140,4 +140,4 @@ message:
config: true config: true
dahua: dahua:
videoStatus: false videoStatus: true
\ No newline at end of file \ No newline at end of file
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
<result column="del_flag" jdbcType="CHAR" property="delFlag"/> <result column="del_flag" jdbcType="CHAR" property="delFlag"/>
<result column="report_time" jdbcType="TIMESTAMP" property="reportTime"/> <result column="report_time" jdbcType="TIMESTAMP" property="reportTime"/>
<result column="capture_pic" jdbcType="VARCHAR" property="capturePic"/> <result column="capture_pic" jdbcType="VARCHAR" property="capturePic"/>
<result column="capture_time" jdbcType="TIMESTAMP" property="captureTime"/>
<result column="data_val" jdbcType="VARCHAR" property="dataVal"/> <result column="data_val" jdbcType="VARCHAR" property="dataVal"/>
</resultMap> </resultMap>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment