ucservice 1.0.9 → 1.1.2

package/index.js

@@ -765,6 +765,19 @@ export const locationOp = (sip) => {
           }
         }, '', net.method);
       });
+    },
+    locateDeviceByType: function(param){
+      let net = location.listTypeLocationNet;
+      return new Promise((resolve, reject) => {
+        loadJson(server_+net.url, { ...param }, function(ret){
+          if(ret.code == 0) {
+            resolve(ret);
+          }else{
+            console.log("获取设备信息失败", ret.code);
+            reject(ret.code);
+          }
+        }, '', net.method);
+      });
     }
   }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ucservice",
   "private": false,
-  "version": "1.0.9",
+  "version": "1.1.2",
   "description": "统一通信服务",
   "main": "dist/ucservice.common.js",
   "style": "ucservice.css",

package/src/common-request.js

@@ -13,7 +13,7 @@ let $ = require('jquery');
 export const loadJson = function(url, param, backSuccfn, async, method, headers) {
   method = (method? method:'POST');
   async = (async == undefined? true:async);
-  for(key in param){ //检测手机号码， 外地号码头部（非杭州）加00，本地号码加0
+  for(let key in param){ //检测手机号码， 外地号码头部（非杭州）加00，本地号码加0
     if(/_phone01$/.test(key)){
       let tel = key.replace(/_phone01$/, "");
       if(param[key] == 0){ //外地号码

package/src/net_url/account_net_url.js

@@ -78,7 +78,23 @@ let account = {
       accPassword: '',
       accShowname: '', //帐号显示名称
       accType: '', //帐号类型，该字段已弃用     0-管理员;  1-一般用户;  2-调度操作员
-      memId: '' //通讯录成员ID   (帐号关联成员)
+      memId: '', //通讯录成员ID   (帐号关联成员)
+      relDispUsername: '',
+      useSbc: '', //是否启用边界网关0-否|1-是
+      businessConfigs: '', //业务权限，eg: sip,JK,dispatch,whiteboard,appMsg,video$!$  分隔符'$!$'后面的全部是账号拥有的权限
+      sipTel: '',
+      dispatchAccount: '',
+      roleIds: 1, 
+      isOperAcc: false,
+      centerId: 0,
+      operLevel: 0,
+      operType: 0,
+      operatorId: 0,
+      mainTel: '',
+      viceTel: '',
+      corpId: '',
+      pocTel: '',
+      operMobileTel: ''
     },
     responseParam: {
       code: '', //返回结果状态码

package/src/net_url/dept_ry_url.js

@@ -14,7 +14,19 @@ let dept_ry = {
       memTel2: '', //	T	号码二(memMobile和memTel2不能都为空)
       memFax: '', //	F	传真号码
       memEmail: '', //	F	电子邮箱
-      dutyId: '' //	F	职务id
+      dutyId: '', //	F	职务id
+      deptName: '',
+      isActive: 1,
+      dutyName: '', //职务名称
+      memLevel: 1,
+      accId: '', //帐号id
+      memMsgLevel: '',
+      businessConfigs: '', //业务权限
+      isOperAcc: true,
+      mainTel: '',
+      operMobileTel: '',
+      mobileTel: '',
+      viceTel: ''
     },
     responseParam: {
       code: '', //返回结果状态码

package/src/net_url/location_url.js

@@ -129,6 +129,53 @@ let location = {
       }
     }
   },
+
+  listTypeLocationNet: {  //按类型查询设备点位信息
+    /***按类型查询，类型：1.移动点位：person， 2.固定点位：fixed, 3.视频监控：camera
+    **/
+    url: '/common-gis-web/data/gisquery/search',
+    method: 'POST',
+    requestParam: {
+      mapId: '',  //地图类型
+      layers: '' //设备类型
+    },
+    responseParam: {
+      code: '', //返回结果状态码
+      message: '',
+      systemTime: '', //yyyy-MM-dd HH:mm:ss
+      data: {
+        total: '',
+        pageSize: '',
+        pageNumber: '',
+        list: [{
+          altitude: 0,
+          center: {longitude: 120.026576, latitude: 30.823369},
+          childMapId: 0,
+          corpId: 0,
+          evtLevel: 0,
+          extData: "",
+          geoHash: "wtmr770xjumy",
+          hasChild: false,
+          id: 1,
+          layerId: 1,
+          layerLogicName: "person",
+          mapId: 0,
+          name: "单兵01",
+          parentId: 0,
+          permKey: "300000.000002.002",
+          points: [{longitude: 0, latitude: 0}],
+          posStatus: "offline",
+          propKey: "6",
+          rectMax: {longitude: 120.026576, latitude: 30.823369},
+          rectMin: {longitude: 120.026576, latitude: 30.823369},
+          speed: 0,
+          type: "Point",
+          updateTime: "2022-04-22 14:21:30"
+        }]
+      }
+    }
+  },
+
   
   /**
    * MQTT订阅

package/src/net_url/meet_url.js

@@ -84,7 +84,7 @@ let meet = {
   listMeetsNet: {  //查询会场列表
     /***查询当前所有会场信息
     **/
-    url: '/dispatch-web/api/meet/joinVideoMember',
+    url: '/dispatch-web/api/meet/listMeets',
     requestParam: {
       token: ''
     },