解决冲突

code/VideoAccess-VCMP/api/.vscode/launch.json

@@ -1,46 +1,46 @@
 {
-    // 使用 IntelliSense 了解相关属性。 
+   // 使用 IntelliSense 了解相关属性。 
-    // 悬停以查看现有属性的描述。
+   // 悬停以查看现有属性的描述。
-    // 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387
+   // 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
+   "version": "0.2.0",
-    "configurations": [
+   "configurations": [
-        {
+      {
-            "type": "node",
+         "type": "node",
-            "request": "launch",
+         "request": "launch",
-            "name": "启动API",
+         "name": "启动API",
-            "program": "${workspaceRoot}/server.js",
+         "program": "${workspaceRoot}/server.js",
-            "env": {
+         "env": {
-                "NODE_ENV": "development"
+            "NODE_ENV": "development"
-            },
+         },
-            "args": [
+         "args": [
-                "-p 4000",
+            "-p 4000",
-                "-f http://localhost:4000",
+            "-f http://localhost:4000",
-                "-g postgres://postgres:123@10.8.30.32:5432/video_access",
+            "-g postgres://postgres:123@10.8.30.32:5432/video_access",
-                "--redisHost 127.0.0.1",
+            "--redisHost 127.0.0.1",
-                "--redisPort 6379",
+            "--redisPort 6379",
-                "--axyApiUrl http://127.0.0.1:4100",
+            "--axyApiUrl http://127.0.0.1:4100",
-                "--iotAuthApi http://127.0.0.1:4200",
+            "--iotAuthApi http://127.0.0.1:4200",
-                "--iotVideoServerUrl http://221.230.55.27:8081",
+            "--iotVideoServerUrl http://221.230.55.27:8081",
-                "--godUrl https://restapi.amap.com/v3",
+            "--godUrl https://restapi.amap.com/v3",
-                "--godKey 21c2d970e1646bb9a795900dd00093ce",
+            "--godKey 21c2d970e1646bb9a795900dd00093ce",
-                "--mqttVideoServer mqtt://127.0.0.1"
+            "--mqttVideoServer tcp://tee2b1be.cn.emqx.cloud:12847"
-            ]
+         ]
-        },
+      },
-        {
+      {
-            "type": "node",
+         "type": "node",
-            "request": "launch",
+         "request": "launch",
-            "name": "run mocha",
+         "name": "run mocha",
-            "program": "${workspaceRoot}/node_modules/mocha/bin/_mocha",
+         "program": "${workspaceRoot}/node_modules/mocha/bin/_mocha",
-            "stopOnEntry": false,
+         "stopOnEntry": false,
-            "args": [
+         "args": [
-                "app/test/*.test.js",
+            "app/test/*.test.js",
-                "--no-timeouts"
+            "--no-timeouts"
-            ],
+         ],
-            "cwd": "${workspaceRoot}",
+         "cwd": "${workspaceRoot}",
-            "runtimeExecutable": null,
+         "runtimeExecutable": null,
-            "env": {
+         "env": {
-                "NODE_ENV": "development"
+            "NODE_ENV": "development"
-            }
+         }
-        }
+      }
-    ]
+   ]
 }

code/VideoAccess-VCMP/api/Dockerfile

@@ -1,7 +1,4 @@
-
+FROM repository.anxinyun.cn/devops/node:12-dev as builder
-FROM repository.anxinyun.cn/base-images/nodejs12:20.10.12.2
-
-MAINTAINER liuxinyi "liu.xinyi@free-sun.com.cn"
 
 COPY . /var/app
 
@@ -9,6 +6,16 @@ WORKDIR /var/app
 
 EXPOSE 8080
 
-CMD ["-g", "postgres://FashionAdmin:123456@iota-m1:5433/SmartRiver", "--qnak", "5XrM4wEB9YU6RQwT64sPzzE6cYFKZgssdP5Kj3uu", "--qnsk", "w6j2ixR_i-aelc6I7S3HotKIX-ukMzcKmDfH6-M5", "--qnbkt", "anxinyun-test", "--qndmn", "http://test.resources.anxinyun.cn"]
+RUN npm config set registry=http://10.8.30.22:7000
+RUN echo "{\"time\":\"$BUILD_TIMESTAMP\",\"build\": \"$BUILD_NUMBER\",\"revision\": \"$SVN_REVISION_1\",\"URL\":\"$SVN_URL_1\"}" > version.json
+RUN npm cache clean -f
+RUN rm -rf package-lock.json
+RUN npm install --registry http://10.8.30.22:7000
+
+FROM registry.cn-hangzhou.aliyuncs.com/fs-devops/node-16:7.22-06-20
+
+WORKDIR /app
+
+COPY --from=builder /var/app .
 
-ENTRYPOINT [ "node", "server.js" ]
+CMD ["node", "server.js"]

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

@@ -206,7 +206,8 @@ async function createNvrCamera (ctx) {
                   serialNo: c.streamid,
                   name: c.name,
                   sip: corCamera.sipip,
-                  cloudControl: c.cloudControl
+                  cloudControl: c.cloudControl,
+                  gbId: corCamera.id,
                })
             } else {
                createData.push({
@@ -219,6 +220,7 @@ async function createNvrCamera (ctx) {
                   createTime: moment().format(),
                   createUserId: userId,
                   forbidden: false,
+                  gbId: corCamera.id,
                })
             }
          } else {
@@ -294,6 +296,7 @@ async function createIpcCamera (ctx) {
       const gbCameraRes = await verifyIpcInfo({ serialNo })
 
       storageData.sip = gbCameraRes.dataValues.sipip
+      storageData.gbId = gbCameraRes.dataValues.id
 
       if (handleCameraId) {
          await models.Camera.update(storageData, {
@@ -436,7 +439,8 @@ async function createCascadeCamera (ctx) {
             externalDomain,
             cascadeType,
             sip: c.sipip,
-            name: c.name
+            name: c.name,
+            gbId: c.id,
          }
          const added = addedCmeraRes.find(ac => ac.serialNo == c.streamid)
          if (added) {

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

@@ -27,6 +27,9 @@ async function getCameraProject (ctx, next) {
             } : {},
             required: Boolean(nvrId),
             attributes: ['id', 'name', 'serialNo']
+         }, {
+            model: models.GbCamera,
+            attributes: ['id', 'online']
          }],
          distinct: true
       }
@@ -156,6 +159,11 @@ async function detail (ctx) {
       const cameraRes = await models.Camera.findOne({
          where: {
             id: cameraId
+         },
+         include: {
+            model: models.GbCamera,
+            attributes: ['id', 'online'],
+            required: false
          }
       })
 

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

@@ -7,6 +7,7 @@ const socketConect = require('./service/socket')
 const mqttVideoServer = require('./service/mqttVideoServer')
 const paasRequest = require('./service/paasRequest');
 const authenticator = require('./middlewares/authenticator');
+const schedule = require('./schedule')
 // const apiLog = require('./middlewares/api-log');
 
 module.exports.entry = function (app, router, opts) {
@@ -28,6 +29,9 @@ module.exports.entry = function (app, router, opts) {
    // 工具类函数
    utils(app, opts)
 
+   // 定时任务
+   // schedule(app, opts)
+   
    // 鉴权中间件
    router.use(authenticator(app, opts));
 

code/VideoAccess-VCMP/api/app/lib/models/gb_camera.js

@@ -146,11 +146,15 @@ module.exports = dc => {
       comment: "",
       indexes: []
    });
-   dc.models.GbCamera = GbCamera;
 
    const Nvr = dc.models.Nvr;
    Nvr.belongsTo(GbCamera, { foreignKey: 'serialNo', targetKey: 'streamid', as: 'gbNvr' });
    GbCamera.hasMany(Nvr, { foreignKey: 'serialNo', sourceKey: 'streamid', as: 'gbNvr' });
 
+   const Camera = dc.models.Camera;
+   Camera.belongsTo(GbCamera, { foreignKey: 'gbId', targetKey: 'id' });
+   GbCamera.hasMany(Camera, { foreignKey: 'gbId', sourceKey: 'id' });
+
+   dc.models.GbCamera = GbCamera;
    return GbCamera;
 };

code/VideoAccess-VCMP/api/app/lib/schedule/freshYingshiState.js

@@ -0,0 +1,25 @@
+const schedule = require('node-schedule');
+const moment = require('moment')
+
+module.exports = function (app, opts) {
+   const freshYingshiState = schedule.scheduleJob(
+      '* * 4 * * *',
+      // '* */1 * * * *',
+      async () => {
+         try {
+            const { models } = app.fs.dc
+            await models.UserToken.destroy({
+               where: {
+                  expired: { $lt: now }
+               }
+            })
+           
+         } catch (error) {
+            app.fs.logger.error(`sechedule: freshYingshiState, error: ${error}`);
+         }
+      });
+
+   return {
+      freshYingshiState
+   }
+}

code/VideoAccess-VCMP/api/app/lib/schedule/index.js

@@ -0,0 +1,18 @@
+'use strict';
+
+const fs = require('fs');
+// 将定时任务汇集未来可根据需要选取操作
+module.exports = async function (app, opts) {
+    fs.readdirSync(__dirname).forEach((filename) => {
+        if (!['index.js'].some(f => filename == f)) {
+            const schedule = require(`./${filename}`)(app, opts)
+            for (let k of Object.keys(schedule)) {
+                console.info(`定时任务 ${k} 启动`);
+            }
+            app.fs.utils = {
+                ...app.fs.schedule,
+                ...schedule,
+            }
+        }
+    });
+};

code/VideoAccess-VCMP/api/app/lib/service/mqttVideoServer.js

@@ -2,21 +2,22 @@
 const mqtt = require('mqtt');
 
 module.exports = async function factory (app, opts) {
-   // const client = mqtt.connect(opts.mqtt.mqttVideoServer);
+   console.info(`mqtt connecting ${opts.mqtt.mqttVideoServer}`);
 
-   // client.on('connect', function () {
+   const client = mqtt.connect(opts.mqtt.mqttVideoServer);
-   //    console.info(`mqtt connect success ${opts.mqtt.mqttVideoServer}`);
-   // })
-   // client.on('error', function (e) {
-   //    console.error(`mqtt connect failed ${opts.mqtt.mqttVideoServer}`);
-   //    app.fs.logger.error('info', '[FS-AUTH-MQTT]', `mqtt connect failed ${opts.mqtt.mqttVideoServer}`);
-   // })
 
-   // client.subscribe('test', { qos: 2 });//订阅主题为test的消息  
+   client.on('connect', function () {
+      console.info(`mqtt connect success ${opts.mqtt.mqttVideoServer}`);
+      client.subscribe('test', { qos: 2 });//订阅主题为test的消息  
+   })
+   client.on('error', function (e) {
+      console.error(`mqtt connect failed ${opts.mqtt.mqttVideoServer}`);
+      app.fs.logger.error('info', '[FS-AUTH-MQTT]', `mqtt connect failed ${opts.mqtt.mqttVideoServer}`);
+   })
 
-   // client.on('message', function (top, message) {
+   client.on('message', function (top, message) {
-   //    console.log(message.toString());
+      console.log(message.toString());
-   // });
+   });
 
-   // app.mqttVideoServer = client
+   app.mqttVideoServer = client
 }

code/VideoAccess-VCMP/script/0.0.1/0_init_db.sql

@@ -0,0 +1,497 @@
+/*
+ Navicat Premium Data Transfer
+
+ Source Server         : 10.8.30.32
+ Source Server Type    : PostgreSQL
+ Source Server Version : 90515
+ Source Host           : 10.8.30.32:5432
+ Source Catalog        : video_access
+ Source Schema         : public
+
+ Target Server Type    : PostgreSQL
+ Target Server Version : 90515
+ File Encoding         : 65001
+
+ Date: 20/06/2022 14:41:32
+*/
+
+
+-- ----------------------------
+-- Sequence structure for camera_ability_bind_id_seq
+-- ----------------------------
+DROP SEQUENCE IF EXISTS "public"."camera_ability_bind_id_seq";
+CREATE SEQUENCE "public"."camera_ability_bind_id_seq" 
+INCREMENT 1
+MINVALUE  1
+MAXVALUE 9223372036854775807
+START 1
+CACHE 1;
+
+-- ----------------------------
+-- Sequence structure for camera_id_seq
+-- ----------------------------
+DROP SEQUENCE IF EXISTS "public"."camera_id_seq";
+CREATE SEQUENCE "public"."camera_id_seq" 
+INCREMENT 1
+MINVALUE  1
+MAXVALUE 9223372036854775807
+START 1
+CACHE 1;
+
+-- ----------------------------
+-- Sequence structure for gbCamera_id_seq
+-- ----------------------------
+DROP SEQUENCE IF EXISTS "public"."gbCamera_id_seq";
+CREATE SEQUENCE "public"."gbCamera_id_seq" 
+INCREMENT 1
+MINVALUE  1
+MAXVALUE 9223372036854775807
+START 1
+CACHE 1;
+
+-- ----------------------------
+-- Sequence structure for gb_id_seq
+-- ----------------------------
+DROP SEQUENCE IF EXISTS "public"."gb_id_seq";
+CREATE SEQUENCE "public"."gb_id_seq" 
+INCREMENT 1
+MINVALUE  1
+MAXVALUE 9223372036854775807
+START 1
+CACHE 1;
+
+-- ----------------------------
+-- Sequence structure for nvr_id_seq
+-- ----------------------------
+DROP SEQUENCE IF EXISTS "public"."nvr_id_seq";
+CREATE SEQUENCE "public"."nvr_id_seq" 
+INCREMENT 1
+MINVALUE  1
+MAXVALUE 9223372036854775807
+START 1
+CACHE 1;
+
+-- ----------------------------
+-- Sequence structure for secret_yingshi_id_seq
+-- ----------------------------
+DROP SEQUENCE IF EXISTS "public"."secret_yingshi_id_seq";
+CREATE SEQUENCE "public"."secret_yingshi_id_seq" 
+INCREMENT 1
+MINVALUE  1
+MAXVALUE 9223372036854775807
+START 1
+CACHE 1;
+
+-- ----------------------------
+-- Sequence structure for t_upload_comm_http_id_seq
+-- ----------------------------
+DROP SEQUENCE IF EXISTS "public"."t_upload_comm_http_id_seq";
+CREATE SEQUENCE "public"."t_upload_comm_http_id_seq" 
+INCREMENT 1
+MINVALUE  1
+MAXVALUE 9223372036854775807
+START 1
+CACHE 1;
+
+-- ----------------------------
+-- Sequence structure for vender_id_seq
+-- ----------------------------
+DROP SEQUENCE IF EXISTS "public"."vender_id_seq";
+CREATE SEQUENCE "public"."vender_id_seq" 
+INCREMENT 1
+MINVALUE  1
+MAXVALUE 9223372036854775807
+START 1
+CACHE 1;
+
+-- ----------------------------
+-- Table structure for ax_project
+-- ----------------------------
+DROP TABLE IF EXISTS "public"."ax_project";
+CREATE TABLE "public"."ax_project" (
+  "id" int4 NOT NULL,
+  "name" varchar(64) COLLATE "pg_catalog"."default" NOT NULL
+)
+;
+COMMENT ON TABLE "public"."ax_project" IS '安心云项目副表，主要用于和camera等进行联合查询
+在安心云进行摄像头绑定的时候进行同步';
+
+-- ----------------------------
+-- Records of ax_project
+-- ----------------------------
+INSERT INTO "public"."ax_project" VALUES (1, '安心云项目');
+
+-- ----------------------------
+-- Table structure for camera
+-- ----------------------------
+DROP TABLE IF EXISTS "public"."camera";
+CREATE TABLE "public"."camera" (
+  "id" int4 NOT NULL DEFAULT nextval('camera_id_seq'::regclass),
+  "type" varchar(16) COLLATE "pg_catalog"."default" NOT NULL,
+  "name" varchar(128) COLLATE "pg_catalog"."default",
+  "channel_name" varchar(64) COLLATE "pg_catalog"."default",
+  "external_domain" varchar(64) COLLATE "pg_catalog"."default",
+  "rtmp" varchar(1024) COLLATE "pg_catalog"."default",
+  "serial_no" varchar(128) COLLATE "pg_catalog"."default",
+  "cloud_control" bool,
+  "high_definition" bool,
+  "voice" bool,
+  "memory_card" varchar(32) COLLATE "pg_catalog"."default",
+  "vender_id" int4,
+  "cascade_type" varchar(32) COLLATE "pg_catalog"."default",
+  "sip" varchar(1024) COLLATE "pg_catalog"."default",
+  "longitude" numeric(16,12),
+  "latitude" numeric(16,12),
+  "forbidden" bool NOT NULL DEFAULT false,
+  "create_time" timestamptz(6) NOT NULL,
+  "recycle_time" timestamptz(6),
+  "delete" bool NOT NULL DEFAULT false,
+  "create_user_id" int4 NOT NULL,
+  "nvr_id" int4,
+  "model" varchar(128) COLLATE "pg_catalog"."default",
+  "kind_id" int4,
+  "yingshi_secret_id" int4,
+  "gb_id" int4
+)
+;
+COMMENT ON COLUMN "public"."camera"."type" IS '设备类型：yingshi - 萤石；nvr - NVR摄像头；ipc - IPC 网络摄像头；cascade - 级联摄像头';
+COMMENT ON COLUMN "public"."camera"."name" IS '设备名称/安装位置';
+COMMENT ON COLUMN "public"."camera"."channel_name" IS '通道名称';
+COMMENT ON COLUMN "public"."camera"."external_domain" IS '外域名称';
+COMMENT ON COLUMN "public"."camera"."serial_no" IS '设备编号';
+COMMENT ON COLUMN "public"."camera"."cloud_control" IS '云台控制';
+COMMENT ON COLUMN "public"."camera"."high_definition" IS '高清支持';
+COMMENT ON COLUMN "public"."camera"."voice" IS '语音对讲支持';
+COMMENT ON COLUMN "public"."camera"."memory_card" IS '内存卡容量';
+COMMENT ON COLUMN "public"."camera"."vender_id" IS '设备厂商id';
+COMMENT ON COLUMN "public"."camera"."cascade_type" IS '级联方式：up - 上级联；down - 下级联';
+COMMENT ON COLUMN "public"."camera"."longitude" IS '经度';
+COMMENT ON COLUMN "public"."camera"."latitude" IS '维度';
+COMMENT ON COLUMN "public"."camera"."forbidden" IS '是否禁用';
+COMMENT ON COLUMN "public"."camera"."recycle_time" IS '放入回收站时间';
+COMMENT ON COLUMN "public"."camera"."delete" IS '是否彻底删除';
+COMMENT ON COLUMN "public"."camera"."model" IS '型号';
+
+-- ----------------------------
+-- Table structure for camera_ability
+-- ----------------------------
+DROP TABLE IF EXISTS "public"."camera_ability";
+CREATE TABLE "public"."camera_ability" (
+  "id" int4 NOT NULL,
+  "ability" varchar(64) COLLATE "pg_catalog"."default" NOT NULL
+)
+;
+COMMENT ON TABLE "public"."camera_ability" IS '摄像机能力';
+
+-- ----------------------------
+-- Records of camera_ability
+-- ----------------------------
+INSERT INTO "public"."camera_ability" VALUES (1, '普通摄像头');
+INSERT INTO "public"."camera_ability" VALUES (2, '人流量计数');
+INSERT INTO "public"."camera_ability" VALUES (3, '热成像');
+INSERT INTO "public"."camera_ability" VALUES (4, 'AI摄像头');
+INSERT INTO "public"."camera_ability" VALUES (1314, '其他');
+
+-- ----------------------------
+-- Table structure for camera_ability_bind
+-- ----------------------------
+DROP TABLE IF EXISTS "public"."camera_ability_bind";
+CREATE TABLE "public"."camera_ability_bind" (
+  "id" int4 NOT NULL DEFAULT nextval('camera_ability_bind_id_seq'::regclass),
+  "camera_id" int4 NOT NULL,
+  "ability_id" int4 NOT NULL
+)
+;
+
+-- ----------------------------
+-- Table structure for camera_kind
+-- ----------------------------
+DROP TABLE IF EXISTS "public"."camera_kind";
+CREATE TABLE "public"."camera_kind" (
+  "id" int4 NOT NULL,
+  "kind" varchar(64) COLLATE "pg_catalog"."default" NOT NULL
+)
+;
+COMMENT ON TABLE "public"."camera_kind" IS '摄像机类型';
+
+-- ----------------------------
+-- Records of camera_kind
+-- ----------------------------
+INSERT INTO "public"."camera_kind" VALUES (1, '枪机');
+INSERT INTO "public"."camera_kind" VALUES (2, '球机');
+INSERT INTO "public"."camera_kind" VALUES (1314, '其他');
+
+-- ----------------------------
+-- Table structure for gbCamera
+-- ----------------------------
+DROP TABLE IF EXISTS "public"."gbCamera";
+CREATE TABLE "public"."gbCamera" (
+  "id" int4 NOT NULL DEFAULT nextval('gb_id_seq'::regclass),
+  "level" int4,
+  "parent" varchar(32) COLLATE "pg_catalog"."default",
+  "streamid" varchar(255) COLLATE "pg_catalog"."default",
+  "online" varchar(255) COLLATE "pg_catalog"."default",
+  "manufactuer" varchar(255) COLLATE "pg_catalog"."default",
+  "model" varchar(255) COLLATE "pg_catalog"."default",
+  "civilCode" varchar(255) COLLATE "pg_catalog"."default",
+  "adddress" varchar(255) COLLATE "pg_catalog"."default",
+  "name" varchar(255) COLLATE "pg_catalog"."default",
+  "Addr" varchar(255) COLLATE "pg_catalog"."default",
+  "Sipip" varchar(255) COLLATE "pg_catalog"."default",
+  "ipctype" varchar(255) COLLATE "pg_catalog"."default",
+  "registerTime" varchar(255) COLLATE "pg_catalog"."default" DEFAULT ''::character varying,
+  "updateTime" varchar(255) COLLATE "pg_catalog"."default"
+)
+;
+
+-- ----------------------------
+-- Table structure for nvr
+-- ----------------------------
+DROP TABLE IF EXISTS "public"."nvr";
+CREATE TABLE "public"."nvr" (
+  "id" int4 NOT NULL DEFAULT nextval('nvr_id_seq'::regclass),
+  "name" varchar(64) COLLATE "pg_catalog"."default" NOT NULL,
+  "vender_id" int4,
+  "serial_no" varchar(64) COLLATE "pg_catalog"."default" NOT NULL,
+  "region_code" varchar(64) COLLATE "pg_catalog"."default",
+  "longitude" numeric(16,12) NOT NULL,
+  "latitude" numeric(16,12) NOT NULL,
+  "create_time" timestamptz(6) NOT NULL DEFAULT now(),
+  "channel_count" int4,
+  "port" varchar(32) COLLATE "pg_catalog"."default",
+  "delete" bool NOT NULL DEFAULT false,
+  "create_user_id" int4 NOT NULL
+)
+;
+COMMENT ON COLUMN "public"."nvr"."vender_id" IS '设备厂家id';
+COMMENT ON COLUMN "public"."nvr"."serial_no" IS '设备编号';
+COMMENT ON COLUMN "public"."nvr"."region_code" IS '行政区码';
+COMMENT ON COLUMN "public"."nvr"."create_time" IS '创建时间';
+COMMENT ON COLUMN "public"."nvr"."channel_count" IS '通道数';
+COMMENT ON COLUMN "public"."nvr"."port" IS '端口';
+
+-- ----------------------------
+-- Table structure for secret_yingshi
+-- ----------------------------
+DROP TABLE IF EXISTS "public"."secret_yingshi";
+CREATE TABLE "public"."secret_yingshi" (
+  "id" int4 NOT NULL DEFAULT nextval('secret_yingshi_id_seq'::regclass),
+  "key" varchar(512) COLLATE "pg_catalog"."default" NOT NULL,
+  "secret" varchar(512) COLLATE "pg_catalog"."default" NOT NULL,
+  "token" varchar(512) COLLATE "pg_catalog"."default",
+  "expire" varchar(512) COLLATE "pg_catalog"."default"
+)
+;
+
+-- ----------------------------
+-- Records of secret_yingshi
+-- ----------------------------
+INSERT INTO "public"."secret_yingshi" VALUES (3, 'd0704fb9d5d14a6682c1c1d592c12512', '93d023269495b86be62cdfdcf34a6cd1', 'at.67z1cfi515oyuu8p4wtgnr6e8dd7qwe4-6bg4tycrsw-0evcx34-xh1ks80et', '1656293969344');
+INSERT INTO "public"."secret_yingshi" VALUES (1, '5d16a667e1c2423d9d0d634f781810b4', '0cc4e1ec4e6a53ea3dabeb09cd5f468b', 'at.4p2f551n58eb9cjdd8vr4uuh1j4ozdjn-9gvmswjpa7-1y5juuk-gochbasv0', '1656294553279');
+INSERT INTO "public"."secret_yingshi" VALUES (2, '3ea2b502f6804d64b43e4cb3d135665c', '331c85c5b7ce76179f6eb7dccb8aeb27', 'at.9q4woxj71nkmckb9d2xe1yoycc81fd4l-2a45fk76s4-0qvuhi2-j5bvk57lp', '1656293899796');
+
+-- ----------------------------
+-- Table structure for t_upload_comm_http
+-- ----------------------------
+DROP TABLE IF EXISTS "public"."t_upload_comm_http";
+CREATE TABLE "public"."t_upload_comm_http" (
+  "id" int4 NOT NULL DEFAULT nextval('t_upload_comm_http_id_seq'::regclass),
+  "content" json NOT NULL,
+  "enable" bool NOT NULL DEFAULT true,
+  "description" varchar(255) COLLATE "pg_catalog"."default"
+)
+;
+
+-- ----------------------------
+-- Table structure for vender
+-- ----------------------------
+DROP TABLE IF EXISTS "public"."vender";
+CREATE TABLE "public"."vender" (
+  "id" int4 NOT NULL DEFAULT nextval('vender_id_seq'::regclass),
+  "name" varchar(64) COLLATE "pg_catalog"."default" NOT NULL
+)
+;
+COMMENT ON TABLE "public"."vender" IS '设备厂商';
+
+-- ----------------------------
+-- Records of vender
+-- ----------------------------
+INSERT INTO "public"."vender" VALUES (2, '海康威视');
+INSERT INTO "public"."vender" VALUES (3, '大华');
+INSERT INTO "public"."vender" VALUES (1, '飞尚科技');
+INSERT INTO "public"."vender" VALUES (1314, '其他');
+
+-- ----------------------------
+-- Alter sequences owned by
+-- ----------------------------
+ALTER SEQUENCE "public"."camera_ability_bind_id_seq"
+OWNED BY "public"."camera_ability_bind"."id";
+SELECT setval('"public"."camera_ability_bind_id_seq"', 35, true);
+
+-- ----------------------------
+-- Alter sequences owned by
+-- ----------------------------
+ALTER SEQUENCE "public"."camera_id_seq"
+OWNED BY "public"."camera"."id";
+SELECT setval('"public"."camera_id_seq"', 314, true);
+
+-- ----------------------------
+-- Alter sequences owned by
+-- ----------------------------
+SELECT setval('"public"."gbCamera_id_seq"', 2, false);
+
+-- ----------------------------
+-- Alter sequences owned by
+-- ----------------------------
+SELECT setval('"public"."gb_id_seq"', 38, true);
+
+-- ----------------------------
+-- Alter sequences owned by
+-- ----------------------------
+ALTER SEQUENCE "public"."nvr_id_seq"
+OWNED BY "public"."nvr"."id";
+SELECT setval('"public"."nvr_id_seq"', 69, true);
+
+-- ----------------------------
+-- Alter sequences owned by
+-- ----------------------------
+ALTER SEQUENCE "public"."secret_yingshi_id_seq"
+OWNED BY "public"."secret_yingshi"."id";
+SELECT setval('"public"."secret_yingshi_id_seq"', 4, true);
+
+-- ----------------------------
+-- Alter sequences owned by
+-- ----------------------------
+SELECT setval('"public"."t_upload_comm_http_id_seq"', 2, false);
+
+-- ----------------------------
+-- Alter sequences owned by
+-- ----------------------------
+ALTER SEQUENCE "public"."vender_id_seq"
+OWNED BY "public"."vender"."id";
+SELECT setval('"public"."vender_id_seq"', 4, true);
+
+-- ----------------------------
+-- Indexes structure for table ax_project
+-- ----------------------------
+CREATE UNIQUE INDEX "ax_project_id_uindex" ON "public"."ax_project" USING btree (
+  "id" "pg_catalog"."int4_ops" ASC NULLS LAST
+);
+
+-- ----------------------------
+-- Primary Key structure for table ax_project
+-- ----------------------------
+ALTER TABLE "public"."ax_project" ADD CONSTRAINT "ax_project_pk" PRIMARY KEY ("id");
+
+-- ----------------------------
+-- Indexes structure for table camera
+-- ----------------------------
+CREATE UNIQUE INDEX "camera_id_uindex" ON "public"."camera" USING btree (
+  "id" "pg_catalog"."int4_ops" ASC NULLS LAST
+);
+
+-- ----------------------------
+-- Primary Key structure for table camera
+-- ----------------------------
+ALTER TABLE "public"."camera" ADD CONSTRAINT "camera_pk" PRIMARY KEY ("id");
+
+-- ----------------------------
+-- Indexes structure for table camera_ability
+-- ----------------------------
+CREATE UNIQUE INDEX "camera_ability_id_uindex" ON "public"."camera_ability" USING btree (
+  "id" "pg_catalog"."int4_ops" ASC NULLS LAST
+);
+
+-- ----------------------------
+-- Primary Key structure for table camera_ability
+-- ----------------------------
+ALTER TABLE "public"."camera_ability" ADD CONSTRAINT "camera_ability_pk" PRIMARY KEY ("id");
+
+-- ----------------------------
+-- Indexes structure for table camera_ability_bind
+-- ----------------------------
+CREATE UNIQUE INDEX "camera_ability_bind_id_uindex" ON "public"."camera_ability_bind" USING btree (
+  "id" "pg_catalog"."int4_ops" ASC NULLS LAST
+);
+
+-- ----------------------------
+-- Primary Key structure for table camera_ability_bind
+-- ----------------------------
+ALTER TABLE "public"."camera_ability_bind" ADD CONSTRAINT "camera_ability_bind_pk" PRIMARY KEY ("id");
+
+-- ----------------------------
+-- Indexes structure for table camera_kind
+-- ----------------------------
+CREATE UNIQUE INDEX "camera_kind_id_uindex" ON "public"."camera_kind" USING btree (
+  "id" "pg_catalog"."int4_ops" ASC NULLS LAST
+);
+
+-- ----------------------------
+-- Primary Key structure for table camera_kind
+-- ----------------------------
+ALTER TABLE "public"."camera_kind" ADD CONSTRAINT "camera_kind_pk" PRIMARY KEY ("id");
+
+-- ----------------------------
+-- Primary Key structure for table gbCamera
+-- ----------------------------
+ALTER TABLE "public"."gbCamera" ADD CONSTRAINT "gbCamera_pkey" PRIMARY KEY ("id");
+
+-- ----------------------------
+-- Indexes structure for table nvr
+-- ----------------------------
+CREATE UNIQUE INDEX "nvr_id_uindex" ON "public"."nvr" USING btree (
+  "id" "pg_catalog"."int4_ops" ASC NULLS LAST
+);
+
+-- ----------------------------
+-- Primary Key structure for table nvr
+-- ----------------------------
+ALTER TABLE "public"."nvr" ADD CONSTRAINT "nvr_pk" PRIMARY KEY ("id");
+
+-- ----------------------------
+-- Indexes structure for table secret_yingshi
+-- ----------------------------
+CREATE UNIQUE INDEX "secret_yingshi_id_uindex" ON "public"."secret_yingshi" USING btree (
+  "id" "pg_catalog"."int4_ops" ASC NULLS LAST
+);
+
+-- ----------------------------
+-- Primary Key structure for table secret_yingshi
+-- ----------------------------
+ALTER TABLE "public"."secret_yingshi" ADD CONSTRAINT "secret_yingshi_pk" PRIMARY KEY ("id");
+
+-- ----------------------------
+-- Primary Key structure for table t_upload_comm_http
+-- ----------------------------
+ALTER TABLE "public"."t_upload_comm_http" ADD CONSTRAINT "t_upload_comm_http_pkey" PRIMARY KEY ("id");
+
+-- ----------------------------
+-- Indexes structure for table vender
+-- ----------------------------
+CREATE UNIQUE INDEX "vender_id_uindex" ON "public"."vender" USING btree (
+  "id" "pg_catalog"."int4_ops" ASC NULLS LAST
+);
+
+-- ----------------------------
+-- Primary Key structure for table vender
+-- ----------------------------
+ALTER TABLE "public"."vender" ADD CONSTRAINT "vender_pk" PRIMARY KEY ("id");
+
+-- ----------------------------
+-- Foreign Keys structure for table camera
+-- ----------------------------
+ALTER TABLE "public"."camera" ADD CONSTRAINT "camera_camera_kind_id_fk" FOREIGN KEY ("kind_id") REFERENCES "public"."camera_kind" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
+ALTER TABLE "public"."camera" ADD CONSTRAINT "camera_nvr_id_fk" FOREIGN KEY ("nvr_id") REFERENCES "public"."nvr" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
+ALTER TABLE "public"."camera" ADD CONSTRAINT "camera_secret_yingshi_id_fk" FOREIGN KEY ("yingshi_secret_id") REFERENCES "public"."secret_yingshi" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
+ALTER TABLE "public"."camera" ADD CONSTRAINT "camera_vender_id_fk" FOREIGN KEY ("vender_id") REFERENCES "public"."vender" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
+
+-- ----------------------------
+-- Foreign Keys structure for table camera_ability_bind
+-- ----------------------------
+ALTER TABLE "public"."camera_ability_bind" ADD CONSTRAINT "camera_ability_bind_camera_ability_id_fk" FOREIGN KEY ("ability_id") REFERENCES "public"."camera_ability" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
+ALTER TABLE "public"."camera_ability_bind" ADD CONSTRAINT "camera_ability_bind_camera_id_fk" FOREIGN KEY ("camera_id") REFERENCES "public"."camera" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
+
+-- ----------------------------
+-- Foreign Keys structure for table nvr
+-- ----------------------------
+ALTER TABLE "public"."nvr" ADD CONSTRAINT "nvr_vender_id_fk" FOREIGN KEY ("vender_id") REFERENCES "public"."vender" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;

code/VideoAccess-VCMP/web/Dockerfile

@@ -1,5 +1,4 @@
-
+FROM repository.anxinyun.cn/devops/node:12-dev as builder
-FROM repository.anxinyun.cn/base-images/nodejs12:20.10.12.2
 
 COPY . /var/app
 
@@ -7,6 +6,19 @@ WORKDIR /var/app
 
 EXPOSE 8080
 
-CMD ["-u", "http://localhost:8088"]
+RUN npm config set registry=http://10.8.30.22:7000
+RUN echo "{\"time\":\"$BUILD_TIMESTAMP\",\"build\": \"$BUILD_NUMBER\",\"revision\": \"$SVN_REVISION_1\",\"URL\":\"$SVN_URL_1\"}" > version.json
+RUN npm cache clean -f
+RUN npm install --registry http://10.8.30.22:7000
+RUN npm run build
+RUN rm  -rf client/src
+RUN rm  -rf node_modules
+RUN npm install --production --registry http://10.8.30.22:7000
+
+FROM registry.cn-hangzhou.aliyuncs.com/fs-devops/node-16:7.22-06-20
+
+WORKDIR /app
+
+COPY --from=builder /var/app .
 
-ENTRYPOINT [ "node", "server.js" ]
+CMD ["node", "server.js"]

code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoOperation.jsx

@@ -71,7 +71,7 @@ const VideoOperation = ({
                                  operation.map(p => {
                                     return <img
                                        src={`/assets/images/background/video-icon-${p.key}-${operationState[p.key].select ? 'select' : 'unselect'}.png`}
-                                       height={26}
+                                       height={18}
                                        style={{ marginRight: 24, cursor: 'pointer' }}
                                        onClick={p.click}
                                     />

code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoPlay.jsx

@@ -7,7 +7,10 @@ import './videoPlay.less';
 
 const VideoPlay = ({ height, width }) => {
    const [jessibuca, setjessibuca] = useState(null)
-   const [playUrl, setPlayUrl] = useState('http://flv.bdplay.nodemedia.cn/live/bbb.flv')
+   const [playUrl, setPlayUrl] = useState(
+      // 'http://flv.bdplay.nodemedia.cn/live/bbb.flv'
+      'http://221.230.55.27:2020/hdl/34020000001110000077/34020000001310000001.flv'
+   )
    const [isPlaying, setIsPlaying] = useState(false)
    const [operationState, setoperationState] = useState()
    const [voiceDisY, setVoiceDisY] = useState(0)

jenkinsfile_vcmp_api

@@ -0,0 +1,19 @@
+pipeline {
+    agent {
+        node{
+            label 'jnlp-slave'
+        }
+    }
+    
+    stages {
+        stage('Testing vcmp ......') {
+            steps {
+                sh 'switch-auth.sh  anxinyun' 
+                buildName "#${BUILD_NUMBER}  ~/fs-cloud/${JOB_NAME}:${IMAGE_VERSION}"
+                buildDescription "registry.cn-hangzhou.aliyuncs.com/${CLOUD}/${JOB_NAME}:${IMAGE_VERSION}"
+                sh 'docker build -t registry.cn-hangzhou.aliyuncs.com/${CLOUD}/${JOB_NAME}:${IMAGE_VERSION} ./code/VideoAccess-VCMP/api' 
+                sh 'docker push registry.cn-hangzhou.aliyuncs.com/${CLOUD}/${JOB_NAME}:${IMAGE_VERSION}' 
+            }
+        }
+    }
+}

jenkinsfile_vcmp_web

@@ -0,0 +1,19 @@
+pipeline {
+    agent {
+        node{
+            label 'jnlp-slave'
+        }
+    }
+    
+    stages {
+        stage('Testing vcmp ......') {
+            steps {
+                sh 'switch-auth.sh  anxinyun' 
+                buildName "#${BUILD_NUMBER}  ~/fs-cloud/${JOB_NAME}:${IMAGE_VERSION}"
+                buildDescription "registry.cn-hangzhou.aliyuncs.com/${CLOUD}/${JOB_NAME}:${IMAGE_VERSION}"
+                sh 'docker build -t registry.cn-hangzhou.aliyuncs.com/${CLOUD}/${JOB_NAME}:${IMAGE_VERSION} ./code/VideoAccess-VCMP/web' 
+                sh 'docker push registry.cn-hangzhou.aliyuncs.com/${CLOUD}/${JOB_NAME}:${IMAGE_VERSION}' 
+            }
+        }
+    }
+}