Merge remote-tracking branch 'origin/master'

src/api/common/api.ts

@@ -15,7 +15,7 @@ enum Api {
   getDictItems = '/sys/dict/getDictItems/',
   getTableList = '/sys/user/queryUserComponentData',
   getCategoryData = '/sys/category/loadAllData',
-  getNuList = '/iot/cameraInfo/nuList', //后期调整
+  getNuList = '/iot/tplink/cameraInfo/nuList', //后期调整
   getOrgInfo = '/api/common/getOrgInfo',//根据机构编码获取机构信息
 }
 
@@ -172,4 +172,4 @@ export const uploadMyFile = (url, data) => {
  */
 export const getOrgInfo = (params) => {
   return defHttp.get({ url: Api.getOrgInfo, params });
-};
+};

src/views/iot/tplink/camera/camera.api.ts

@@ -1,43 +1,45 @@
 import { defHttp } from '/@/utils/http/axios';
 
 enum Api {
-  queryProjectTreeSync = '/iot/projectInfo/queryRegionTreeSync',
+  queryProjectTreeSync = '/iot/tplink/projectInfo/queryRegionTreeSync',
-  queryRegionTreeSync = '/iot/regionInfo/queryRegionTreeSync',
+  queryRegionTreeSync = '/iot/tplink/regionInfo/queryRegionTreeSync',
-  syncProject = '/iot/projectInfo/sync',
+  syncProject = '/iot/tplink/projectInfo/sync',
-  syncRegion = '/iot/regionInfo/sync',
+  syncRegion = '/iot/tplink/regionInfo/sync',
-  list = '/iot/cameraInfo/list',
+  list = '/iot/tplink/cameraInfo/list',
-  ipcCapability = '/iot/cameraInfo/getIpcCapability',
+  syncProjectIpcDevice = '/iot/tplink/cameraInfo/syncProjectIpcDevice',
-  nuList = '/iot/cameraInfo/nuList',
+  ipcCapability = '/iot/tplink/cameraInfo/getIpcCapability',
-  edit = '/iot/cameraInfo/edit',
+  nuList = '/iot/tplink/cameraInfo/nuList',
-  rebootDevice = '/iot/cameraInfo/rebootDevice',
+  edit = '/iot/tplink/cameraInfo/edit',
-  previewUrl = '/iot/cameraInfo/getPreviewUrl',
+  rebootDevice = '/iot/tplink/cameraInfo/rebootDevice',
-  getImageCommon = '/iot/cameraInfo/getImageCommon',
+  previewUrl = '/iot/tplink/cameraInfo/getPreviewUrl',
-  setImageCommon = '/iot/cameraInfo/setImageCommon',
+  getImageCommon = '/iot/tplink/cameraInfo/getImageCommon',
-  getOsdCapability = '/iot/cameraInfo/getOsdCapability',
+  setImageCommon = '/iot/tplink/cameraInfo/setImageCommon',
-  getOsd = '/iot/cameraInfo/getOsd',
+  getOsdCapability = '/iot/tplink/cameraInfo/getOsdCapability',
-  setOsd = '/iot/cameraInfo/setOsd',
+  getOsd = '/iot/tplink/cameraInfo/getOsd',
-  getTamperDet = '/iot/cameraInfo/getTamperDet',
+  setOsd = '/iot/tplink/cameraInfo/setOsd',
-  setTamperDet = '/iot/cameraInfo/setTamperDet',
+  getTamperDet = '/iot/tplink/cameraInfo/getTamperDet',
-  getTamperNotif = '/iot/cameraInfo/getTamperNotif',
+  setTamperDet = '/iot/tplink/cameraInfo/setTamperDet',
-  setTamperNotif = '/iot/cameraInfo/setTamperNotif',
+  getTamperNotif = '/iot/tplink/cameraInfo/getTamperNotif',
-  testAudio = '/iot/cameraInfo/testAudio',
+  setTamperNotif = '/iot/tplink/cameraInfo/setTamperNotif',
-  getAlarmInfo = '/iot/cameraInfo/getAlarmInfo',
+  testAudio = '/iot/tplink/cameraInfo/testAudio',
-  setAlarmInfo = '/iot/cameraInfo/setAlarmInfo',
+  getAlarmInfo = '/iot/tplink/cameraInfo/getAlarmInfo',
-  getAlarmPlan = '/iot/cameraInfo/getAlarmPlan',
+  setAlarmInfo = '/iot/tplink/cameraInfo/setAlarmInfo',
-  setAlarmPlan = '/iot/cameraInfo/setAlarmPlan',
+  getAlarmPlan = '/iot/tplink/cameraInfo/getAlarmPlan',
-  getVideoParams = '/iot/cameraInfo/getVideoParams',
+  setAlarmPlan = '/iot/tplink/cameraInfo/setAlarmPlan',
-  setVideoParams = '/iot/cameraInfo/setVideoParams',
+  getVideoParams = '/iot/tplink/cameraInfo/getVideoParams',
-  configRecovery = '/iot/cameraInfo/configRecovery',
+  setVideoParams = '/iot/tplink/cameraInfo/setVideoParams',
-  searchVideo = '/iot/cameraInfo/searchVideo',
+  configRecovery = '/iot/tplink/cameraInfo/configRecovery',
-  getPlaybackUrlList = '/iot/cameraInfo/getPlaybackUrlList',
+  searchVideo = '/iot/tplink/cameraInfo/searchVideo',
-  deletePlaybackChn = '/iot/cameraInfo/deletePlaybackChn',
+  getPlaybackUrlList = '/iot/tplink/cameraInfo/getPlaybackUrlList',
-  getMultitransUrl = '/iot/cameraInfo/getMultitransUrl',
+  deletePlaybackChn = '/iot/tplink/cameraInfo/deletePlaybackChn',
-  getRecordCfgs = '/iot/cameraInfo/getRecordCfgs',
+  getMultitransUrl = '/iot/tplink/cameraInfo/getMultitransUrl',
-  setRecordCfgs = '/iot/cameraInfo/setRecordCfgs',
+  getRecordCfgs = '/iot/tplink/cameraInfo/getRecordCfgs',
-  getBatchProgress = '/iot/cameraInfo/getBatchProgress',
+  setRecordCfgs = '/iot/tplink/cameraInfo/setRecordCfgs',
-  uploadToServer = '/iot/cameraInfo/uploadToServer',
+  getBatchProgress = '/iot/tplink/cameraInfo/getBatchProgress',
-  stopUploadToServer = '/iot/cameraInfo/stopUploadToServer',
+  uploadToServer = '/iot/tplink/cameraInfo/uploadToServer',
-  getUploadToServerProcess = '/iot/cameraInfo/getUploadToServerProcess',
+  stopUploadToServer = '/iot/tplink/cameraInfo/stopUploadToServer',
+  getUploadToServerProcess = '/iot/tplink/cameraInfo/getUploadToServerProcess',
+  motionCtrl = '/iot/tplink/cameraInfo/motionCtrl',
 
 }
 
@@ -72,6 +74,13 @@ export const syncRegion = (params?) => defHttp.get({ url: Api.syncRegion, params
  */
 export const list = (params) => defHttp.get({ url: Api.list, params });
 
+
+/**
+ * 同步此项目下的IPC设备
+ * @param params
+ */
+export const syncProjectIpcDevice = (params) => defHttp.get({ url: Api.syncProjectIpcDevice, params });
+
 /**
  * 获取IPC能力集
  * @param params
@@ -266,3 +275,10 @@ export const stopUploadToServer = (params) => defHttp.get({ url: Api.stopUploadT
  */
 export const getUploadToServerProcess = (params) => defHttp.get({ url: Api.getUploadToServerProcess, params });
 
+/**
+ * 控制球机转动
+ * @param params
+ */
+export const motionCtrl = (params) => defHttp.get({ url: Api.motionCtrl, params });
+
+

src/views/iot/tplink/plan/plan.api.ts

@@ -2,16 +2,16 @@ import { defHttp } from '/@/utils/http/axios';
 import {Modal} from "ant-design-vue";
 
 enum Api {
-  queryProjectTreeSync = '/iot/projectInfo/queryRegionTreeSync',
+  queryProjectTreeSync = '/iot/tplink/projectInfo/queryRegionTreeSync',
-  queryRegionTreeSync = '/iot/regionInfo/queryRegionTreeSync',
+  queryRegionTreeSync = '/iot/tplink/regionInfo/queryRegionTreeSync',
-  queryTreeList = '/iot/cameraInfo/queryTreeList',
+  queryTreeList = '/iot/tplink/cameraInfo/queryTreeList',
-  getStorageDevice = '/iot/cameraInfo/getStorageDevice',
+  getStorageDevice = '/iot/tplink/cameraInfo/getStorageDevice',
-  getAllRecordPlans = '/iot/cameraInfo/getAllRecordPlans',
+  getAllRecordPlans = '/iot/tplink/cameraInfo/getAllRecordPlans',
-  getRecordCfgs = '/iot/cameraInfo/getRecordCfgs',
+  getRecordCfgs = '/iot/tplink/cameraInfo/getRecordCfgs',
-  addRecordCfgs = '/iot/cameraInfo/addRecordCfgs',
+  addRecordCfgs = '/iot/tplink/cameraInfo/addRecordCfgs',
-  setRecordCfgs = '/iot/cameraInfo/setRecordCfgs',
+  setRecordCfgs = '/iot/tplink/cameraInfo/setRecordCfgs',
-  delRecordCfgs = '/iot/cameraInfo/delRecordCfgs',
+  delRecordCfgs = '/iot/tplink/cameraInfo/delRecordCfgs',
-  getBatchProgress = '/iot/cameraInfo/getBatchProgress',
+  getBatchProgress = '/iot/tplink/cameraInfo/getBatchProgress',
 }
 
 /**

src/views/iot/tplink/project/ProjectInfo.api.ts

@@ -1,11 +1,11 @@
 import { defHttp } from '/@/utils/http/axios';
 
 enum Api {
-  list = '/iot/projectInfo/list',
+  list = '/iot/tplink/projectInfo/list',
-  sync = '/iot/projectInfo/sync',
+  sync = '/iot/tplink/projectInfo/sync',
-  add = '/iot/projectInfo/add',
+  add = '/iot/tplink/projectInfo/add',
-  edit = '/iot/projectInfo/edit',
+  edit = '/iot/tplink/projectInfo/edit',
-  delete = '/iot/projectInfo/delete',
+  delete = '/iot/tplink/projectInfo/delete',
 }
 
 /**

src/views/iot/tplink/region/RegionInfo.api.ts

@@ -1,16 +1,16 @@
 import { defHttp } from '/@/utils/http/axios';
 
 enum Api {
-  queryProjectTreeSync = '/iot/projectInfo/queryRegionTreeSync',
+  queryProjectTreeSync = '/iot/tplink/projectInfo/queryRegionTreeSync',
-  queryRegionTreeSync = '/iot/regionInfo/queryRegionTreeSync',
+  queryRegionTreeSync = '/iot/tplink/regionInfo/queryRegionTreeSync',
-  syncProject = '/iot/projectInfo/sync',
+  syncProject = '/iot/tplink/projectInfo/sync',
-  syncRegion = '/iot/regionInfo/sync',
+  syncRegion = '/iot/tplink/regionInfo/sync',
-  syncRegionChildren = '/iot/regionInfo/syncChildren',
+  syncRegionChildren = '/iot/tplink/regionInfo/syncChildren',
-  list = '/iot/regionInfo/list',
+  list = '/iot/tplink/regionInfo/list',
-  sync = '/iot/regionInfo/sync',
+  sync = '/iot/tplink/regionInfo/sync',
-  add = '/iot/regionInfo/add',
+  add = '/iot/tplink/regionInfo/add',
-  edit = '/iot/regionInfo/edit',
+  edit = '/iot/tplink/regionInfo/edit',
-  delete = '/iot/regionInfo/delete',
+  delete = '/iot/tplink/regionInfo/delete',
   queryChildrenByParentId = '/sys/sysDepart/queryChildrenByParentId',
 }