From 877fe9272a89db5fc00057c3df3fa456d3ab792e Mon Sep 17 00:00:00 2001 From: "gao.zhiyuan" Date: Fri, 26 Aug 2022 09:28:31 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=89=E5=BF=83=E4=BA=91=E6=91=84?= =?UTF-8?q?=E5=83=8F=E5=A4=B4=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{1.3.0 => 1.3.1}/data/1_sync_camera_data/.vscode/launch.json | 0 .../script/{1.3.0 => 1.3.1}/data/1_sync_camera_data/index.js | 0 .../script/{1.3.0 => 1.3.1}/data/1_sync_camera_data/package.json | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename code/VideoAccess-VCMP/script/{1.3.0 => 1.3.1}/data/1_sync_camera_data/.vscode/launch.json (100%) rename code/VideoAccess-VCMP/script/{1.3.0 => 1.3.1}/data/1_sync_camera_data/index.js (100%) rename code/VideoAccess-VCMP/script/{1.3.0 => 1.3.1}/data/1_sync_camera_data/package.json (100%) diff --git a/code/VideoAccess-VCMP/script/1.3.0/data/1_sync_camera_data/.vscode/launch.json b/code/VideoAccess-VCMP/script/1.3.1/data/1_sync_camera_data/.vscode/launch.json similarity index 100% rename from code/VideoAccess-VCMP/script/1.3.0/data/1_sync_camera_data/.vscode/launch.json rename to code/VideoAccess-VCMP/script/1.3.1/data/1_sync_camera_data/.vscode/launch.json diff --git a/code/VideoAccess-VCMP/script/1.3.0/data/1_sync_camera_data/index.js b/code/VideoAccess-VCMP/script/1.3.1/data/1_sync_camera_data/index.js similarity index 100% rename from code/VideoAccess-VCMP/script/1.3.0/data/1_sync_camera_data/index.js rename to code/VideoAccess-VCMP/script/1.3.1/data/1_sync_camera_data/index.js diff --git a/code/VideoAccess-VCMP/script/1.3.0/data/1_sync_camera_data/package.json b/code/VideoAccess-VCMP/script/1.3.1/data/1_sync_camera_data/package.json similarity index 100% rename from code/VideoAccess-VCMP/script/1.3.0/data/1_sync_camera_data/package.json rename to code/VideoAccess-VCMP/script/1.3.1/data/1_sync_camera_data/package.json From 35606216fb3779ef0d6e535c57ae70c3127787dc Mon Sep 17 00:00:00 2001 From: "gao.zhiyuan" Date: Fri, 26 Aug 2022 09:37:40 +0800 Subject: [PATCH 2/2] CameraListAll order --- code/VideoAccess-VCMP/api/app/lib/controllers/camera/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/code/VideoAccess-VCMP/api/app/lib/controllers/camera/index.js b/code/VideoAccess-VCMP/api/app/lib/controllers/camera/index.js index b763778..07dcae8 100644 --- a/code/VideoAccess-VCMP/api/app/lib/controllers/camera/index.js +++ b/code/VideoAccess-VCMP/api/app/lib/controllers/camera/index.js @@ -265,6 +265,7 @@ async function getCameraListAll (ctx) { const cameraRes = await models.Camera.findAll({ attributes: { exclude: ['delete', 'recycleTime', 'rtmp', 'createUserId', 'nvrId', 'kindId', 'yingshiSecretId', 'gbId'] }, + order: [['id', 'DESC']], where: { delete: false, recycleTime: null,