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, 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