Merge branch 'all-v4-liufei' into 'all-v4'

1. 删除算法相关旧接口  2. usePermission改为使用 permission code  3. 获取相机联网状态可通过 codes 或 ids 查询

See merge request skyeye/skyeye_frontend/skyeye-admin!233

src/api/algo/algo.ts

@@ -41,20 +41,9 @@ export interface Response<Records> {
   totalRow: number;
 }
 
-export function getAlgoInfo(page: number, pageSize: number) {
-  return http.request({
-    url: '/cameraAlgo/getList?pageNumber=' + page + '&pageSize=' + pageSize,
-    method: 'get',
-  });
-}
-
-export function searchAlgoInfo(page: number, keyWord: string) {
-  return http.request({
-    url: '/cameraAlgo/getAlgo?algoInfo=' + keyWord + '&pageNumber=' + page + '&pageSize=12',
-    method: 'get',
-  });
-}
-
+/**
+ * v4: 分页查询算法列表
+ */
 export function queryAlgoInfoPage(data: algoQueryModule) {
   return http.request<Response<Records>>({
     url: '/admin/algo/queryAlgoInfoPage',
@@ -63,7 +52,9 @@ export function queryAlgoInfoPage(data: algoQueryModule) {
   });
 }
 
-//拉取所有算法列表
+/**
+ * v4： 查询完整算法列表
+ */
 export function queryAlgoInfoAll() {
   return http.request<Records[]>({
     url: '/admin/algo/queryAlgoInfo',
@@ -71,6 +62,7 @@ export function queryAlgoInfoAll() {
   });
 }
 
+// 旧接口
 export function algoInfoModify(algoId: number, pushLinkPrompt: string, pushStatement: string) {
   return http.request({
     url: '/cameraAlgo/saveAlgoState',
@@ -83,6 +75,9 @@ export function algoInfoModify(algoId: number, pushLinkPrompt: string, pushState
   });
 }
 
+/**
+ * v4： 编辑算法
+ */
 export function updateAlgoInfo(data: algoUpdateModule) {
   return http.request({
     url: '/admin/algo/updateAlgoInfoById',

src/api/camera/camera-overview.ts

@@ -101,10 +101,28 @@ export const deleteCameraItems = (data: number[]) => {
   });
 };
 
-/** 获取相机状态 */
-export const getCameraState = (data: { cameraCodeList: string[] }) => {
+/**
+ * v4：根据相机code查询相机联网状态
+ * @param data 
+ * @returns 
+ */
+export const getCameraStateByCodes = (data: { cameraCodeList: string[] }) => {
   return http.request<CameraStatus[]>({
-    url: '/admin/cameraConfig/queryCameraStatusList',
+    url: '/admin/cameraConfig/queryCameraStatusListByCameraCodes',
+    method: 'post',
+    data,
+  });
+};
+
+
+/**
+ * v4: 根据相机 id 查询相机联网状态
+ * @param data 
+ * @returns 
+ */
+export const getCameraStateByIds = (data: { cameraIdList: number[] }) => {
+  return http.request<CameraStatus[]>({
+    url: '/admin/cameraConfig/queryCameraStatusListByCameraIds',
     method: 'post',
     data,
   });

src/hooks/web/usePermission.ts

@@ -9,8 +9,8 @@ export function usePermission() {
    */
   function _somePermissions(accesses: string[]) {
     return userStore.getPermissions.some((item) => {
-      const { value }: any = item;
-      return accesses.includes(value);
+      const { code }: any = item;
+      return accesses.includes(code);
     });
   }
 
@@ -30,7 +30,7 @@ export function usePermission() {
   function hasEveryPermission(accesses: string[]): boolean {
     const permissionsList = userStore.getPermissions;
     if (Array.isArray(accesses)) {
-      return permissionsList.every((access: any) => accesses.includes(access.value));
+      return permissionsList.every((access: any) => accesses.includes(access.code));
     }
     throw new Error(`[hasEveryPermission]: ${accesses} should be a array !`);
   }
@@ -43,7 +43,7 @@ export function usePermission() {
   function hasSomePermission(accesses: string[]): boolean {
     const permissionsList = userStore.getPermissions;
     if (Array.isArray(accesses)) {
-      return permissionsList.some((access: any) => accesses.includes(access.value));
+      return permissionsList.some((access: any) => accesses.includes(access.code));
     }
     throw new Error(`[hasSomePermission]: ${accesses} should be a array !`);
   }

src/views/cameras/overview/stores/useCameraOverview.ts

@@ -6,7 +6,7 @@ import {
   getCameraList,
   addCameraItem,
   updateCameraItem,
-  getCameraState,
+  getCameraStateByCodes,
 } from '@/api/camera/camera-overview';
 import { CameraAddItem, CameraDetailServer } from '@/types/camera/type';
 import { useRequest } from 'vue-hooks-plus';
@@ -109,7 +109,7 @@ export const useCameraOverview = defineStore('camera-overview', () => {
   };
 
   const getState = () => {
-    getCameraState({ cameraCodeList: cameraItems.value.map((camera) => camera.code) }).then(
+    getCameraStateByCodes({ cameraCodeList: cameraItems.value.map((camera) => camera.code) }).then(
       (res) => {
         res.forEach((item) => {
           const targetObj = cameraItems.value.find((camera) => camera.code === item.cameraCode);

src/views/cameras/preview/store/useCameraStatus.ts

@@ -1,4 +1,4 @@
-import { getCameraState } from '@/api/camera/camera-overview';
+import { getCameraStateByCodes } from '@/api/camera/camera-overview';
 import { ref } from 'vue';
 
 /** 轮询相机异常的频率，5s */
@@ -10,7 +10,7 @@ export const useCameraStatus = () => {
 
   const getState = (codeList, callback) => {
     if (codeList.length === 0) return;
-    getCameraState({ cameraCodeList: codeList }).then((res) => {
+    getCameraStateByCodes({ cameraCodeList: codeList }).then((res) => {
       const filterData = res.filter((item) => item.status === 1);
       noNetworkingNum.value = filterData.length;
       callback(res);