model-action 1.0.24 → 2.0.2

package/src/modules/Poi.ts

@@ -1,168 +1,245 @@
-
 /**
  * POI点方法
  */
-import { Action, LocationItem, RequiredSome, SendParam } from "./Action";
-
-type PoiActionType = 'show' | 'hide' | 'add' | 'delete' | 'update' | 'getInfo' | 'status'
-type PoiType = {
-    action: PoiActionType,          //方法
-    id?: string,                //POI点UE中的ID
-    type?: string,              //POI类型
-    typeChild?: string,         //POI子类型
-    text?: string,              //POI标题
-    location?: LocationItem,        //POI在场景中的坐标格式
-    place?: string,              //POI所在位置
-    description?: string,        //POI描述
-    linkId?: string,             //POI关联设备ID
-    floorNum?: string,           //总楼层
-    lowestFloor?: string,         //最低楼层
-    state?: 'normal' | 'alarm'
-} & SendParam
-
-type IdList = Array<{
-    id: string;
-    state: 'normal' | 'alarm'
-}>
+import { Action, SendParam } from "./Action";
+
+type PoiActionType = 'show' | 'hide' | 'showAll' | 'hideAll' | 'add' | 'remove' | 'update' | 'find'
+
+// POI基础信息
+export interface PoiBaseInfo {
+    id: string;             // POI的ID
+    type: string;           // POI类型，如 "Camera"
+    label: string;          // 标签
+    location: string;        // 位置，格式 "X=0.0,Y=0.0,Z=0.0"
+    rotation: string;       // 旋转，格式 "P=-35.004208,Y=113.576096,R=0.000000"
+    scale: number;          // 缩放
+    place: string;          // 地方
+    linkId: string;         // 链接ID
+    category: string;       // 分类，如 "Camera"
+    description: string;     // 描述
+    hasMesh: boolean;       // 是否有网格
+}
+
+// POI更新信息（不包含type字段）
+export type PoiUpdateInfo = Omit<PoiBaseInfo, 'type'>
+
+type PoiType = SendParam & {
+    cmd: "POI";
+    data: {
+        action: PoiActionType;
+        [key: string]: any;
+    };
+}
 
 export class PoiAction extends Action {
     /**
-      * 添加poi
-      * @param {*} type 相机type
-      * @param {*} location poi点位置
-      * @param {*} text POI标题
-      * @param {*} place POI所在位置
-      * @param {*} description POI描述
-      * @param {*} linkId POI关联的设备ID
-      */
-    static poiAdd(type: PoiType['type'] = 'Camera', location: LocationItem, text: PoiType['text'] = '', place: PoiType['place'] = '', description: PoiType['description'] = '', linkId: PoiType['linkId'] = '') {
-        const param: RequiredSome<PoiType, 'action' | 'type' | 'location'> = {
+     * 显隐指定id的POI
+     * @param action 操作类型：show 显示 | hide 隐藏
+     * @param id POI的ID
+     */
+    static poiShowHide(
+        action: 'show' | 'hide',
+        id: string
+    ) {
+        const data: {
+            action: 'show' | 'hide';
+            id: string;
+        } = {
+            action,
+            id
+        };
+
+        const param: PoiType = {
             cmd: "POI",
-            action: "add",
-            type,
-            text,
-            location,
-            place,
-            description,
-            linkId
-        };
-        this.sendParam(param, '新增POI')
+            data
+        };
+        
+        const actionMap = {
+            show: '显示指定POI',
+            hide: '隐藏指定POI'
+        };
+        this.sendParam(param, actionMap[action])
     }
 
     /**
-     * 更新poi
-     * @param {*} type 相机type
-     * @param {*} location poi点位置
-     * @param {*} text POI标题
-     * @param {*} place POI所在位置
-     * @param {*} description POI描述
-     * @param {*} linkId POI关联的设备ID
+     * 显隐指定类型和地方的POI
+     * @param action 操作类型：show 显示 | hide 隐藏
+     * @param type POI类型，如 "Camera"、"JK" 等
+     * @param place 地方，如 "A_1F"，如果不传place字段，三维自动判断是显示楼里的还是楼外的
      */
-    static poiUpdate(type: PoiType['type'] = 'Camera', location: LocationItem, text: PoiType['text'] = '', place: PoiType['place'] = '', description: PoiType['description'] = '', linkId: PoiType['linkId'] = '') {
-        const param: RequiredSome<PoiType, 'action' | 'type' | 'location'> = {
+    static poiShowHideByType(
+        action: 'show' | 'hide',
+        type: string,
+        place?: string
+    ) {
+        const data: {
+            action: 'show' | 'hide';
+            type: string;
+            place?: string;
+        } = {
+            action,
+            type
+        };
+
+        // 如果提供了 place，则添加
+        if (place) {
+            data.place = place;
+        }
+
+        const param: PoiType = {
             cmd: "POI",
-            action: "update",
-            type,
-            text,
-            location,
-            place,
-            description,
-            linkId
-        };
-        this.sendParam(param, '更新POI')
+            data
+        };
+        
+        const actionMap = {
+            show: '显示指定类型POI',
+            hide: '隐藏指定类型POI'
+        };
+        this.sendParam(param, actionMap[action])
     }
 
     /**
-    * 删除poi
-    * @param {*} id 点ID
-    */
-    static poiDel(id: string) {
+     * 显示所有POI
+     */
+    static poiShowAll() {
+        const data: {
+            action: 'showAll';
+        } = {
+            action: 'showAll'
+        };
+
         const param: PoiType = {
             cmd: "POI",
-            action: "delete",
-            id,
+            data
         };
-        this.sendParam(param, '删除POI')
+        this.sendParam(param, '显示所有POI')
     }
 
     /**
-     * 显示poi
-     * @param {*} id POI的ID
-     * @param {*} type 相机type
-     * @param {*} place POI所在位置
+     * 隐藏所有POI
      */
-    static poiShow(id: PoiType['id'], type: PoiType['type'], place: PoiType['place']) {
+    static poiHideAll() {
+        const data: {
+            action: 'hideAll';
+        } = {
+            action: 'hideAll'
+        };
+
         const param: PoiType = {
             cmd: "POI",
-            action: "show",
-            type,
-            place
+            data
         };
-        if (id) {
-            param['id'] = id
-        }
-
-        this.sendParam(param, '显示POI')
+        this.sendParam(param, '隐藏所有POI')
     }
 
     /**
-    * 隐藏poi
-    * @param {*} id POI的ID
-    * @param {*} type 相机type
-    * @param {*} place POI所在位置
-    */
-    static poiHide(id: PoiType['id'], type: PoiType['type'], place: PoiType['place']) {
+     * 添加POI点
+     * @param baseInfos POI基础信息数组
+     */
+    static poiAdd(baseInfos: PoiBaseInfo[]) {
+        const data: {
+            action: 'add';
+            baseInfos: PoiBaseInfo[];
+        } = {
+            action: 'add',
+            baseInfos
+        };
+
         const param: PoiType = {
             cmd: "POI",
-            action: "hide",
-            type,
-            place
+            data
         };
-        if (id) {
-            param['id'] = id
-        }
-
-        this.sendParam(param, '隐藏POI')
+        this.sendParam(param, '添加POI点')
     }
 
     /**
-     * 把所有的POI恢复到Normal状态
-     * @param {*} state normal一般状态 alarm 告警状态
+     * 删除POI点
+     * @param id POI的ID、linkId或type，根据传入的值删除对应的POI
      */
-    static poiNormal(state: 'normal' | 'alarm') {
+    static poiRemove(id: string) {
+        const data: {
+            action: 'remove';
+            id: string;
+        } = {
+            action: 'remove',
+            id
+        };
+
         const param: PoiType = {
             cmd: "POI",
-            action: "status",
-            state
+            data
         };
-        this.sendParam(param, `恢复poi至${state}状态`)
+        this.sendParam(param, '删除POI点')
     }
 
     /**
-     * 切换指定ID设备的poi状态
-     * @param {*} ids 设备ID列表
-     * @param {*} isLocation 是否定位到第一个ID对应的设备
+     * 更新POI点
+     * @param baseInfos POI更新信息数组（不包含type字段）
      */
-    static poiSwitchStatus(ids: IdList, isLocation: boolean = false) {
-        const param = {
-            cmd: "status",
-            isLocation,
-            type: 'POI',
-            ids
-        }
-        this.sendParam(param, `切换poi至指定状态`)
+    static poiUpdate(baseInfos: PoiUpdateInfo[]) {
+        const data: {
+            action: 'update';
+            baseInfos: PoiUpdateInfo[];
+        } = {
+            action: 'update',
+            baseInfos
+        };
+
+        const param: PoiType = {
+            cmd: "POI",
+            data
+        };
+        this.sendParam(param, '更新POI点')
     }
 
     /**
-     * 获取指定POI
-     * @param {*} type 相机type
+     * 获取POI点信息
+     * @param id 可选，POI的ID，如果提供则获取指定ID的POI信息
+     * @param type 可选，POI类型，如 "Camera"，如果提供则获取指定类型的POI信息
+     * @param place 可选，地方，如 "A_1F"，如果提供则获取指定地方指定类型的POI信息
      */
-    static poiGetInfo(type: PoiType['type'] = 'Camera') {
+    static poiFind(id?: string, type?: string, place?: string) {
+        const data: {
+            action: 'find';
+            id?: string;
+            type?: string;
+            place?: string;
+        } = {
+            action: 'find'
+        };
+
+        // 如果提供了 id，则添加
+        if (id) {
+            data.id = id;
+        }
+
+        // 如果提供了 type，则添加
+        if (type) {
+            data.type = type;
+        }
+
+        // 如果提供了 place，则添加
+        if (place) {
+            data.place = place;
+        }
+
         const param: PoiType = {
             cmd: "POI",
-            action: "getInfo",
-            type,
+            data
         };
-        this.sendParam(param, '获取POI信息')
+        
+        // 根据参数组合生成不同的描述
+        let msg = '获取POI点信息';
+        if (id) {
+            msg = '获取指定ID的POI信息';
+        } else if (type && place) {
+            msg = '获取指定地方指定类型的POI信息';
+        } else if (type) {
+            msg = '获取指定类型的POI信息';
+        } else {
+            msg = '获取所有POI信息';
+        }
+        
+        this.sendParam(param, msg)
     }
 }

package/src/modules/Routing.ts

@@ -1,117 +1,128 @@
-
 /**
- * 巡更
+ * 巡检操作方法
  */
-import { Action, } from "./Action";
+import { Action, SendParam } from "./Action";
+
+// 路由巡视动作类型
+export type RoutingActionType = 'start' | 'stop' | 'pause' | 'restart'
+
+// 路由巡视类型
+export type RoutingType = 'videoPatrol'
+
+// 路由巡视参数
+export interface RoutingParam {
+    type: RoutingType;              // 巡视类型，目前只有 videoPatrol
+    id: string;                     // 路线ID，命名规则：园区室外使用 VP-1, VP-2；室内分层建筑使用 A-1（A楼1楼）
+    isPauseAtRouting?: boolean;     // 巡检途中遇到摄像头弹框时是否停下来，默认 false
+    isRolerMoveOnRouting?: boolean; // 巡检途中是否有人在路径上行走，默认 false
+    isViewFollow?: boolean;         // 巡检途中视角是否跟随路径线，默认 false。true时，isRolerMoveOnRouting 应为 false
+}
+
+type RoutingParamType = SendParam & {
+    cmd: "routing";
+    data: {
+        action: RoutingActionType;
+        type?: RoutingType;
+        id?: string;
+        isPauseAtRouting?: boolean;
+        isRolerMoveOnRouting?: boolean;
+        isViewFollow?: boolean;
+    };
+}
 
 export class RoutingAction extends Action {
     /**
-      * 巡检开始
-      * @param {*} id (必须）巡检的唯一ID)
-      * @param {*} type (必须）巡检的类型) 
-      *     videoPatrol => 视频巡更
-      *     cameraRoute => 视角跟随样条线
-      */
-    static videoPatrolStart(id: string, type: string = "videoPatrol", extendParams = {}) {
-        const param: any = {
-            cmd: "routing",
-            action: "start",
-            id,
-            ...extendParams,
+     * 开始路由巡视
+     * 显示指定路线的巡视效果，相机跟随路线，线路是在场景中预设的一条固定的样条线
+     * @param param 路由巡视参数
+     */
+    static start(param: RoutingParam) {
+        // 如果 isViewFollow 为 true，则 isRolerMoveOnRouting 应该为 false
+        if (param.isViewFollow === true && param.isRolerMoveOnRouting === true) {
+            console.warn('当 isViewFollow 为 true 时，isRolerMoveOnRouting 应该为 false');
+        }
+
+        const data: {
+            action: 'start';
+            type: RoutingType;
+            id: string;
+            isPauseAtRouting?: boolean;
+            isRolerMoveOnRouting?: boolean;
+            isViewFollow?: boolean;
+        } = {
+            action: 'start',
+            type: param.type,
+            id: param.id
         };
-        if (type) {
-            param.type = type
+
+        // 可选参数
+        if (param.isPauseAtRouting !== undefined) {
+            data.isPauseAtRouting = param.isPauseAtRouting;
+        }
+        if (param.isRolerMoveOnRouting !== undefined) {
+            data.isRolerMoveOnRouting = param.isRolerMoveOnRouting;
+        }
+        if (param.isViewFollow !== undefined) {
+            data.isViewFollow = param.isViewFollow;
         }
-        this.sendParam(param, '巡更开始')
-    }
 
-    /**
-     * 巡检结束
-     * @param {*} id (必须）巡检的唯一ID)
-    * @param {*} type (必须）巡检的类型)
-     */
-    static videoPatrolStop(id: string, type: string = "videoPatrol", extendParams = {}) {
-        const param: any = {
+        const sendParam: RoutingParamType = {
             cmd: "routing",
-            action: "stop",
-            id,
-            ...extendParams,
+            data
         };
-        if (type) {
-            param.type = type
-        }
-        this.sendParam(param, '巡更结束')
+        this.sendParam(sendParam, '开始路由巡视')
     }
 
     /**
-     * 巡检暂停
-     * @param {*} id (必须）巡检的唯一ID)
-    * @param {*} type (必须）巡检的类型)
+     * 停止路由巡视
+     * 停止并隐藏巡视，整条巡检结束后，必须调用 start 才能重新开始
      */
-    static videoPatrolPause(id: string, type: string = "videoPatrol", extendParams = {}) {
-        const param: any = {
-            cmd: "routing",
-            action: "pause",    
-            id,
-            ...extendParams,
+    static stop() {
+        const data: {
+            action: 'stop';
+        } = {
+            action: 'stop'
         };
-        if (type) {
-            param.type = type
-        }
-        this.sendParam(param, '巡更暂停')
-    }
 
-    /**
-     * 巡检下一步
-     * @param {*} id (必须）巡检的唯一ID)
-    * @param {*} type (必须）巡检的类型)
-    */
-    static videoPatrolNext(id: string, type: string = "videoPatrol", extendParams = {}) {
-        const param: any = {
+        const sendParam: RoutingParamType = {
             cmd: "routing",
-            action: "next",
-            id,
-            ...extendParams,
+            data
         };
-        if (type) {
-            param.type = type
-        }
-        this.sendParam(param, '巡更下一步')
+        this.sendParam(sendParam, '停止路由巡视')
     }
 
     /**
-     * 巡更上一步
-     * @param {*} id (必须）巡检的唯一ID)
-    * @param {*} type (必须）巡检的类型)
+     * 暂停路由巡视
      */
-    static videoPatrolPrev(id: string, type: string = "videoPatrol", extendParams = {}) {
-        const param: any = {
+    static pause() {
+        const data: {
+            action: 'pause';
+        } = {
+            action: 'pause'
+        };
+
+        const sendParam: RoutingParamType = {
             cmd: "routing",
-            action: "last",
-            id,
-            ...extendParams,
+            data
         };
-        if(type){
-            param.type = type
-        }
-        this.sendParam(param, '巡更上一步')
+        this.sendParam(sendParam, '暂停路由巡视')
     }
 
     /**
-     * 巡更重新开始，从暂停点开始
-     * @param {*} id (必须）巡检的唯一ID)
-    * @param {*} type (必须）巡检的类型)
+     * 重新开始路由巡视
+     * 从暂停点继续开始巡视
      */
-    static videoPatrolRestart(id: string, type: string = "videoPatrol", extendParams = {}) {
-        const param: any = {
+    static restart() {
+        const data: {
+            action: 'restart';
+        } = {
+            action: 'restart'
+        };
+
+        const sendParam: RoutingParamType = {
             cmd: "routing",
-            action: "restart",
-            id,
-            ...extendParams,
+            data
         };
-        if (type) {
-            param.type = type
-        }
-        this.sendParam(param, '巡更重新开始，从暂停点开始')
+        this.sendParam(sendParam, '重新开始路由巡视')
     }
 }

package/src/modules/Scene.ts

@@ -1,35 +1,57 @@
-
-
-
 /**
- * 场景方法
+ * 场景操作方法
  */
 import { Action, SendParam } from "./Action";
 
+// 场景操作类型
+export type SceneActionType = 'changeSence' | 'resetSence';
 
-enum SceneActionType{
-    Exit = '0',       //退出独显
-    Enter = '1',      //进入独显
+// 场景编码类型
+export type SceneCode = 'QF' | 'RZ' | string; // QF = 曲阜，RZ = 日照
+
+type SceneParamType = SendParam & {
+    cmd: "sence";
+    data: {
+        action: SceneActionType;
+        code?: SceneCode;
+    };
 }
-type SceneType = {
-    action: SceneActionType,
-    isAdjustLight: boolean   //是否调整灯光
-    tag?: string,           //指定场景需要打的tag，根据项目定义，如果场景中只有一处需要独显，这里可以不传该字段
-} & SendParam
 
 export class SceneAction extends Action {
     /**
-     * 独显某场景模型
-     * @param {*} action 1进入独显 0退出独显
+     * 切换场景
+     * @param code 场景编码
      */
-    static singleShow(action:SceneActionType,isAdjustLight:SceneType['isAdjustLight'] = false,tag:SceneType['tag']) {
-        const param: SceneType = {
-            cmd: "POI",
-            action,
-            tag,
-            isAdjustLight
+    static changeSence(code: SceneCode) {
+        const data: {
+            action: 'changeSence';
+            code: SceneCode;
+        } = {
+            action: 'changeSence',
+            code
+        };
+
+        const sendParam: SceneParamType = {
+            cmd: "sence",
+            data
         };
-        this.sendParam(param, `${action==='0'?'退出':'进入'}独显`);
+        this.sendParam(sendParam, `切换场景 - code: ${code}`);
     }
 
+    /**
+     * 重置场景到初始状态
+     */
+    static resetSence() {
+        const data: {
+            action: 'resetSence';
+        } = {
+            action: 'resetSence'
+        };
+
+        const sendParam: SceneParamType = {
+            cmd: "sence",
+            data
+        };
+        this.sendParam(sendParam, '重置场景到初始状态');
+    }
 }