From f1c9e66a5cce474b21a43f92f20749f965cd518d Mon Sep 17 00:00:00 2001
From: "gao.zhiyuan" <gao.zhiyuan@free-sun.com.cn>
Date: Mon, 10 Oct 2022 16:52:21 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=86=E9=A2=91=E5=91=8A=E8=AD=A6=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E6=97=B6=E5=8C=BA=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/app/lib/controllers/status/alarm.js                 | 6 +++---
 .../VideoAccess-VCMP/script/1.3.4/schema/1.alert_tables.sql | 5 +++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/code/VideoAccess-VCMP/api/app/lib/controllers/status/alarm.js b/code/VideoAccess-VCMP/api/app/lib/controllers/status/alarm.js
index 509366f..a65e243 100644
--- a/code/VideoAccess-VCMP/api/app/lib/controllers/status/alarm.js
+++ b/code/VideoAccess-VCMP/api/app/lib/controllers/status/alarm.js
@@ -49,8 +49,8 @@ async function record (ctx) {
          || (isRestore && alarmRes && alarmRes.length)
       ) {
          let updateD = {
-            updateTime: moment().format(),
-            confirmTime: moment().format(),
+            updateTime: moment().format('YYYY-MM-DD HH:mm:ss'),
+            confirmTime: moment().format('YYYY-MM-DD HH:mm:ss'),
          }
          if (isRestore) {
             updateD.autoRestore = true
@@ -66,7 +66,7 @@ async function record (ctx) {
          alarmRes = await models.CameraStatusAlarm.create({
             statusId: statusRes.id,
             description,
-            createTime: moment().format(),
+            createTime: moment().format('YYYY-MM-DD HH:mm:ss'),
             serialNo,
             channelNo,
             platform,
diff --git a/code/VideoAccess-VCMP/script/1.3.4/schema/1.alert_tables.sql b/code/VideoAccess-VCMP/script/1.3.4/schema/1.alert_tables.sql
index 3b6ab0b..9882213 100644
--- a/code/VideoAccess-VCMP/script/1.3.4/schema/1.alert_tables.sql
+++ b/code/VideoAccess-VCMP/script/1.3.4/schema/1.alert_tables.sql
@@ -3,3 +3,8 @@ alter table camera_status_alarm
 
 comment on column camera_status_alarm.auto_restore is '是否自动恢复的';
 
+alter table camera_status_alarm alter column confirm_time type timestamp(6) using confirm_time::timestamp(6);
+
+alter table camera_status_alarm alter column create_time type timestamp(6) using create_time::timestamp(6);
+
+alter table camera_status_alarm alter column update_time type timestamp(6) using update_time::timestamp(6);