Merge branch 'dev_trial' of https://gitea.anxinyun.cn/free-sun/FS-IOT into dev_trial

code/VideoAccess-VCMP/api/app/lib/controllers/camera/index.js

@@ -262,7 +262,7 @@ async function detail (ctx) {
 async function getCameraListAll (ctx) {
    try {
       const { models } = ctx.fs.dc;
-
+      var front = new moment(); //验证前时间
       const cameraRes = await models.Camera.findAll({
          attributes: { exclude: ['delete', 'recycleTime', 'rtmp', 'createUserId', 'nvrId', 'kindId', 'yingshiSecretId', 'gbId'] },
          order: [['id', 'DESC']],
@@ -286,7 +286,9 @@ async function getCameraListAll (ctx) {
             ],
          }]
       })
-
+      var after = new moment();
+      var duration = moment.duration(after.diff(front))._data.milliseconds;
+      console.log('duration',duration)
       ctx.status = 200;
       ctx.body = cameraRes
    } catch (error) {