增加门禁设备

apps/web-antd/src/api/sis/accessControl/index.ts

@@ -12,7 +12,7 @@ import { requestClient } from '#/api/request';
 * @returns 门禁管理列表
 */
 export function accessControlList(params?: AccessControlQuery) {
-  return requestClient.get<PageResult<AccessControlVO>>('/property/accessControl/list', { params });
+  return requestClient.get<PageResult<AccessControlVO>>('/sis/accessControl/list', { params });
 }
 
 /**
@@ -21,7 +21,7 @@ export function accessControlList(params?: AccessControlQuery) {
  * @returns 门禁管理列表
  */
 export function accessControlExport(params?: AccessControlQuery) {
-  return commonExport('/property/accessControl/export', params ?? {});
+  return commonExport('/sis/accessControl/export', params ?? {});
 }
 
 /**
@@ -30,7 +30,7 @@ export function accessControlExport(params?: AccessControlQuery) {
  * @returns 门禁管理详情
  */
 export function accessControlInfo(id: ID) {
-  return requestClient.get<AccessControlVO>(`/property/accessControl/${id}`);
+  return requestClient.get<AccessControlVO>(`/sis/accessControl/${id}`);
 }
 
 /**
@@ -39,7 +39,7 @@ export function accessControlInfo(id: ID) {
  * @returns void
  */
 export function accessControlAdd(data: AccessControlForm) {
-  return requestClient.postWithMsg<void>('/property/accessControl', data);
+  return requestClient.postWithMsg<void>('/sis/accessControl', data);
 }
 
 /**
@@ -48,7 +48,7 @@ export function accessControlAdd(data: AccessControlForm) {
  * @returns void
  */
 export function accessControlUpdate(data: AccessControlForm) {
-  return requestClient.putWithMsg<void>('/property/accessControl', data);
+  return requestClient.putWithMsg<void>('/sis/accessControl', data);
 }
 
 /**
@@ -57,5 +57,5 @@ export function accessControlUpdate(data: AccessControlForm) {
  * @returns void
  */
 export function accessControlRemove(id: ID | IDS) {
-  return requestClient.deleteWithMsg<void>(`/property/accessControl/${id}`);
+  return requestClient.deleteWithMsg<void>(`/sis/accessControl/${id}`);
 }

apps/web-antd/src/api/sis/authRecord/index.ts

@@ -0,0 +1,61 @@
+import type { AuthRecordVO, AuthRecordForm, AuthRecordQuery } from './model';
+
+import type { ID, IDS } from '#/api/common';
+import type { PageResult } from '#/api/common';
+
+import { commonExport } from '#/api/helper';
+import { requestClient } from '#/api/request';
+
+/**
+* 查询授权记录列表
+* @param params
+* @returns 授权记录列表
+*/
+export function authRecordList(params?: AuthRecordQuery) {
+  return requestClient.get<PageResult<AuthRecordVO>>('/sis/authRecord/list', { params });
+}
+
+/**
+ * 导出授权记录列表
+ * @param params
+ * @returns 授权记录列表
+ */
+export function authRecordExport(params?: AuthRecordQuery) {
+  return commonExport('/sis/authRecord/export', params ?? {});
+}
+
+/**
+ * 查询授权记录详情
+ * @param id id
+ * @returns 授权记录详情
+ */
+export function authRecordInfo(id: ID) {
+  return requestClient.get<AuthRecordVO>(`/sis/authRecord/${id}`);
+}
+
+/**
+ * 新增授权记录
+ * @param data
+ * @returns void
+ */
+export function authRecordAdd(data: AuthRecordForm) {
+  return requestClient.postWithMsg<void>('/sis/authRecord', data);
+}
+
+/**
+ * 更新授权记录
+ * @param data
+ * @returns void
+ */
+export function authRecordUpdate(data: AuthRecordForm) {
+  return requestClient.putWithMsg<void>('/sis/authRecord', data);
+}
+
+/**
+ * 删除授权记录
+ * @param id id
+ * @returns void
+ */
+export function authRecordRemove(id: ID | IDS) {
+  return requestClient.deleteWithMsg<void>(`/sis/authRecord/${id}`);
+}

apps/web-antd/src/api/sis/authRecord/model.d.ts

@@ -0,0 +1,54 @@
+import type { PageQuery, BaseEntity } from '#/api/common';
+
+export interface AuthRecordVO {
+  /**
+   * 主键id
+   */
+  id: string | number;
+
+  /**
+   * 人像id
+   */
+  imgId: string | number;
+
+  /**
+   * 门禁id
+   */
+  acdId: string | number;
+
+}
+
+export interface AuthRecordForm extends BaseEntity {
+  /**
+   * 主键id
+   */
+  id?: string | number;
+
+  /**
+   * 人像id
+   */
+  imgId?: string | number;
+
+  /**
+   * 门禁id
+   */
+  acdId?: string | number;
+
+}
+
+export interface AuthRecordQuery extends PageQuery {
+  /**
+   * 人像id
+   */
+  imgId?: string | number;
+
+  /**
+   * 门禁id
+   */
+  acdId?: string | number;
+
+  /**
+    * 日期范围参数
+    */
+  params?: any;
+}

apps/web-antd/src/api/sis/deviceManage/index.ts

@@ -0,0 +1,61 @@
+import type { DeviceManageVO, DeviceManageForm, DeviceManageQuery } from './model';
+
+import type { ID, IDS } from '#/api/common';
+import type { PageResult } from '#/api/common';
+
+import { commonExport } from '#/api/helper';
+import { requestClient } from '#/api/request';
+
+/**
+* 查询设备管理列表
+* @param params
+* @returns 设备管理列表
+*/
+export function deviceManageList(params?: DeviceManageQuery) {
+  return requestClient.get<PageResult<DeviceManageVO>>('/sis/deviceManage/list', { params });
+}
+
+/**
+ * 导出设备管理列表
+ * @param params
+ * @returns 设备管理列表
+ */
+export function deviceManageExport(params?: DeviceManageQuery) {
+  return commonExport('/sis/deviceManage/export', params ?? {});
+}
+
+/**
+ * 查询设备管理详情
+ * @param id id
+ * @returns 设备管理详情
+ */
+export function deviceManageInfo(id: ID) {
+  return requestClient.get<DeviceManageVO>(`/sis/deviceManage/${id}`);
+}
+
+/**
+ * 新增设备管理
+ * @param data
+ * @returns void
+ */
+export function deviceManageAdd(data: DeviceManageForm) {
+  return requestClient.postWithMsg<void>('/sis/deviceManage', data);
+}
+
+/**
+ * 更新设备管理
+ * @param data
+ * @returns void
+ */
+export function deviceManageUpdate(data: DeviceManageForm) {
+  return requestClient.putWithMsg<void>('/sis/deviceManage', data);
+}
+
+/**
+ * 删除设备管理
+ * @param id id
+ * @returns void
+ */
+export function deviceManageRemove(id: ID | IDS) {
+  return requestClient.deleteWithMsg<void>(`/sis/deviceManage/${id}`);
+}

apps/web-antd/src/api/sis/deviceManage/model.d.ts

@@ -0,0 +1,249 @@
+import type { PageQuery, BaseEntity } from '#/api/common';
+
+export interface DeviceManageVO {
+  /**
+   * 主键id
+   */
+  id: string | number;
+
+  /**
+   * 设备编码
+   */
+  deviceNo: string;
+
+  /**
+   * 设备名称
+   */
+  deviceName: string;
+
+  /**
+   * 设备ip
+   */
+  deviceIp: string;
+
+  /**
+   * 设备端口
+   */
+  devicePort: number;
+
+  /**
+   * 设备账号
+   */
+  deviceAccount: string;
+
+  /**
+   * 设备密码
+   */
+  devicePwd: string;
+
+  /**
+   * 设备
+   */
+  deviceMac: string;
+
+  /**
+   * 设备在线状态 0:离线 1:在线 2:未知
+   */
+  deviceStatus: number;
+
+  /**
+   * 父级设备id
+   */
+  parentId: string | number;
+
+  /**
+   * 设备通道编号
+   */
+  channelNo: string;
+
+  /**
+   * 录像机ip
+   */
+  vcrIp: string;
+
+  /**
+   * 录像机端口
+   */
+  vcrPort: number;
+
+  /**
+   * 录像机账号
+   */
+  vcrAccount: string;
+
+  /**
+   * 录像机密码
+   */
+  vcrPwd: string;
+
+  /**
+   * 门禁id
+   */
+  accessControlId: string | number;
+
+}
+
+export interface DeviceManageForm extends BaseEntity {
+  /**
+   * 主键id
+   */
+  id?: string | number;
+
+  /**
+   * 设备编码
+   */
+  deviceNo?: string;
+
+  /**
+   * 设备名称
+   */
+  deviceName?: string;
+
+  /**
+   * 设备ip
+   */
+  deviceIp?: string;
+
+  /**
+   * 设备端口
+   */
+  devicePort?: number;
+
+  /**
+   * 设备账号
+   */
+  deviceAccount?: string;
+
+  /**
+   * 设备密码
+   */
+  devicePwd?: string;
+
+  /**
+   * 设备
+   */
+  deviceMac?: string;
+
+  /**
+   * 设备在线状态 0:离线 1:在线 2:未知
+   */
+  deviceStatus?: number;
+
+  /**
+   * 父级设备id
+   */
+  parentId?: string | number;
+
+  /**
+   * 设备通道编号
+   */
+  channelNo?: string;
+
+  /**
+   * 录像机ip
+   */
+  vcrIp?: string;
+
+  /**
+   * 录像机端口
+   */
+  vcrPort?: number;
+
+  /**
+   * 录像机账号
+   */
+  vcrAccount?: string;
+
+  /**
+   * 录像机密码
+   */
+  vcrPwd?: string;
+
+  /**
+   * 门禁id
+   */
+  accessControlId?: string | number;
+
+}
+
+export interface DeviceManageQuery extends PageQuery {
+  /**
+   * 设备编码
+   */
+  deviceNo?: string;
+
+  /**
+   * 设备名称
+   */
+  deviceName?: string;
+
+  /**
+   * 设备ip
+   */
+  deviceIp?: string;
+
+  /**
+   * 设备端口
+   */
+  devicePort?: number;
+
+  /**
+   * 设备账号
+   */
+  deviceAccount?: string;
+
+  /**
+   * 设备密码
+   */
+  devicePwd?: string;
+
+  /**
+   * 设备
+   */
+  deviceMac?: string;
+
+  /**
+   * 设备在线状态 0:离线 1:在线 2:未知
+   */
+  deviceStatus?: number;
+
+  /**
+   * 父级设备id
+   */
+  parentId?: string | number;
+
+  /**
+   * 设备通道编号
+   */
+  channelNo?: string;
+
+  /**
+   * 录像机ip
+   */
+  vcrIp?: string;
+
+  /**
+   * 录像机端口
+   */
+  vcrPort?: number;
+
+  /**
+   * 录像机账号
+   */
+  vcrAccount?: string;
+
+  /**
+   * 录像机密码
+   */
+  vcrPwd?: string;
+
+  /**
+   * 门禁id
+   */
+  accessControlId?: string | number;
+
+  /**
+    * 日期范围参数
+    */
+  params?: any;
+}

apps/web-antd/src/api/sis/personLibImg/index.ts

@@ -39,7 +39,7 @@ export function personLibImgInfo(id: ID) {
  * @returns void
  */
 export function personLibImgAdd(data: PersonLibImgForm) {
-  return requestClient.postWithMsg<void>('/sis/personLibImg', data);
+  return requestClient.postWithMsg<void>('/sis/personLibImg/add', data);
 }
 
 /**

apps/web-antd/src/views/sis/accessControl/device/accessControlModal.vue

@@ -0,0 +1,140 @@
+<script setup lang="ts">
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+import { $t } from '@vben/locales';
+import { cloneDeep, getPopupContainer, handleNode } from '@vben/utils';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  accessControlAdd,
+  accessControlInfo,
+  accessControlUpdate,
+} from '#/api/sis/accessControl';
+import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup';
+import { communityTree } from '#/api/property/community';
+import { modalSchema } from './data';
+
+const emit = defineEmits<{ reload: [] }>();
+
+const isUpdate = ref(false);
+const title = computed(() => {
+  return isUpdate.value ? $t('pages.common.edit') : $t('pages.common.add');
+});
+
+const [BasicForm, formApi] = useVbenForm({
+  commonConfig: {
+    // 默认占满两列
+    formItemClass: 'col-span-1',
+    // 默认label宽度 px
+    labelWidth: 80,
+    // 通用配置项 会影响到所有表单项
+    componentProps: {
+      class: 'w-full',
+    },
+  },
+  schema: modalSchema(),
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-1',
+});
+
+const { onBeforeClose, markInitialized, resetInitialized } = useBeforeCloseDiff(
+  {
+    initializedGetter: defaultFormValueGetter(formApi),
+    currentGetter: defaultFormValueGetter(formApi),
+  },
+);
+
+const [BasicModal, modalApi] = useVbenModal({
+  // 在这里更改宽度
+  class: 'w-[30%]',
+  fullscreenButton: false,
+  onBeforeClose,
+  onClosed: handleClosed,
+  onConfirm: handleConfirm,
+  onOpenChange: async (isOpen) => {
+    if (!isOpen) {
+      return null;
+    }
+    modalApi.modalLoading(true);
+    setupCommunitySelect();
+    const { id } = modalApi.getData() as { id?: number | string };
+    isUpdate.value = !!id;
+
+    if (isUpdate.value && id) {
+      const record = await accessControlInfo(id);
+      await formApi.setValues(record);
+    }
+    await markInitialized();
+
+    modalApi.modalLoading(false);
+  },
+});
+
+async function handleConfirm() {
+  try {
+    modalApi.lock(true);
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    // getValues获取为一个readonly的对象 需要修改必须先深拷贝一次
+    const data = cloneDeep(await formApi.getValues());
+    await (isUpdate.value ? accessControlUpdate(data) : accessControlAdd(data));
+    resetInitialized();
+    emit('reload');
+    modalApi.close();
+  } catch (error) {
+    console.error(error);
+  } finally {
+    modalApi.lock(false);
+  }
+}
+
+async function setupCommunitySelect() {
+  const areaList = await communityTree(4);
+  // 选中后显示在输入框的值 即父节点 / 子节点
+  // addFullName(areaList, 'areaName', ' / ');
+  const splitStr = '/';
+  handleNode(areaList, 'label', splitStr, function (node: any) {
+    if (node.level != 4) {
+      node.disabled = true;
+    }
+  });
+  formApi.updateSchema([
+    {
+      componentProps: () => ({
+        class: 'w-full',
+        fieldNames: {
+          key: 'id',
+          label: 'label',
+          value: 'code',
+          children: 'children',
+        },
+        getPopupContainer,
+        placeholder: '请选择楼层',
+        showSearch: true,
+        treeData: areaList,
+        treeDefaultExpandAll: true,
+        treeLine: { showLeafIcon: false },
+        // 筛选的字段
+        treeNodeFilterProp: 'label',
+        // 选中后显示在输入框的值
+        treeNodeLabelProp: 'fullName',
+      }),
+      fieldName: 'floorId',
+    },
+  ]);
+}
+
+async function handleClosed() {
+  await formApi.resetForm();
+  resetInitialized();
+}
+</script>
+
+<template>
+  <BasicModal :title="title">
+    <BasicForm />
+  </BasicModal>
+</template>

apps/web-antd/src/views/sis/accessControl/device/data.ts

@@ -1,14 +1,34 @@
-import type {FormSchemaGetter} from '#/adapter/form';
-import type {VxeGridProps} from '#/adapter/vxe-table';
+import type { FormSchemaGetter } from '#/adapter/form';
+import type { VxeGridProps } from '#/adapter/vxe-table';
 
-import {getDictOptions} from '#/utils/dict';
-import {renderDict} from '#/utils/render';
+import { getDictOptions } from '#/utils/dict';
+import { renderDict } from '#/utils/render';
+import { communityTree } from '#/api/property/community';
+import { addFullName } from '@vben/utils';
 
 export const querySchema: FormSchemaGetter = () => [
   {
-    component: 'Input',
-    fieldName: 'accessCode',
-    label: '设备编码',
+    label: '社区',
+    fieldName: 'searchValue',
+    component: 'ApiTreeSelect',
+    componentProps: {
+      allowClear: true,
+      placeholder: '请选择社区/楼栋/单元/楼层',
+      treeDefaultExpandAll: true,
+      treeNodeLabelProp: 'fullName',
+      fieldNames: {
+        key: 'code',
+        label: 'label',
+        value: 'code',
+        children: 'children',
+      },
+      api: async () => {
+        const areaList = await communityTree(4);
+        addFullName(areaList, 'label', '/');
+        console.log(areaList);
+        return areaList;
+      },
+    },
   },
   {
     component: 'Input',
@@ -28,32 +48,11 @@ export const querySchema: FormSchemaGetter = () => [
 // 需要使用i18n注意这里要改成getter形式 否则切换语言不会刷新
 // export const columns: () => VxeGridProps['columns'] = () => [
 export const columns: VxeGridProps['columns'] = [
-  {type: 'checkbox', width: 60},
-  {
-    title: '序号',
-    field: 'id',
-    slots: {
-      default: ({rowIndex}) => {
-        return rowIndex + 1;
-      },
-    },
-  },
-  {
-    title: '设备编码',
-    field: 'accessCode',
-  },
+  { type: 'checkbox', width: 60 },
   {
     title: '设备名称',
     field: 'accessName',
   },
-  {
-    title: '园区编码',
-    field: 'communityCode',
-  },
-  {
-    title: '建筑编码',
-    field: 'buildingCode',
-  },
   {
     title: '设备IP',
     field: 'accessIp',
@@ -74,27 +73,19 @@ export const columns: VxeGridProps['columns'] = [
     title: '控制卡类型',
     field: 'controlType',
     slots: {
-      default: ({row}) => {
+      default: ({ row }) => {
         return renderDict(row.controlType, 'wy_kzklx');
       },
     },
   },
-  {
-    title: '控制卡类型编码',
-    field: 'controlCode',
-  },
   {
     title: '外部编码',
     field: 'outCode',
   },
-  {
-    title: '组织编码',
-    field: 'orgCode',
-  },
   {
     field: 'action',
     fixed: 'right',
-    slots: {default: 'action'},
+    slots: { default: 'action' },
     title: '操作',
     width: 180,
   },
@@ -110,12 +101,6 @@ export const modalSchema: FormSchemaGetter = () => [
       triggerFields: [''],
     },
   },
-  {
-    label: '设备编码',
-    fieldName: 'accessCode',
-    component: 'Input',
-    rules: 'required',
-  },
   {
     label: '设备名称',
     fieldName: 'accessName',
@@ -123,16 +108,11 @@ export const modalSchema: FormSchemaGetter = () => [
     rules: 'required',
   },
   {
-    label: '园区编码',
-    fieldName: 'communityCode',
-    component: 'Input',
-    rules: 'required',
-  },
-  {
-    label: '建筑编码',
-    fieldName: 'buildingCode',
-    component: 'Input',
-    rules: 'required',
+    component: 'TreeSelect',
+    fieldName: 'floorId',
+    defaultValue: undefined,
+    label: '楼层',
+    rules: 'selectRequired',
   },
   {
     label: '设备IP',
@@ -148,13 +128,6 @@ export const modalSchema: FormSchemaGetter = () => [
     label: '设备类型',
     fieldName: 'accessType',
     component: 'Input',
-    rules: 'required',
-  },
-  {
-    label: '工厂编码',
-    fieldName: 'factoryCode',
-    component: 'Input',
-    rules: 'required',
   },
   {
     label: '控制卡类型',
@@ -166,20 +139,4 @@ export const modalSchema: FormSchemaGetter = () => [
     },
     rules: 'selectRequired',
   },
-  {
-    label: '控制卡类型编码',
-    fieldName: 'controlCode',
-    component: 'Input',
-  },
-  {
-    label: '外部编码',
-    fieldName: 'outCode',
-    component: 'Input',
-  },
-  {
-    label: '组织编码',
-    fieldName: 'orgCode',
-    component: 'Input',
-    rules: 'required',
-  },
 ];

apps/web-antd/src/views/sis/accessControl/device/index.vue

@@ -1,26 +1,21 @@
 <script setup lang="ts">
-import type { Recordable } from '@vben/types';
-
-import { ref } from 'vue';
-
 import { Page, useVbenModal, type VbenFormProps } from '@vben/common-ui';
 import { getVxePopupContainer } from '@vben/utils';
 
 import { Modal, Popconfirm, Space } from 'ant-design-vue';
-import dayjs from 'dayjs';
 
 import {
   useVbenVxeGrid,
   vxeCheckboxChecked,
-  type VxeGridProps
+  type VxeGridProps,
 } from '#/adapter/vxe-table';
 
 import {
   accessControlExport,
   accessControlList,
   accessControlRemove,
-} from '#/api/property/accessControl';
-import type { AccessControlForm } from '#/api/property/accessControl/model';
+} from '#/api/sis/accessControl';
+import type { AccessControlForm } from '#/api/sis/accessControl/model';
 import { commonDownloadExcel } from '#/utils/file/download';
 
 import accessControlModal from './accessControlModal.vue';
@@ -76,7 +71,7 @@ const gridOptions: VxeGridProps = {
     keyField: 'id',
   },
   // 表格全局唯一表示 保存列配置需要用到
-  id: 'property-accessControl-index'
+  id: 'property-accessControl-index',
 };
 
 const [BasicTable, tableApi] = useVbenVxeGrid({
@@ -118,9 +113,14 @@ function handleMultiDelete() {
 }
 
 function handleDownloadExcel() {
-  commonDownloadExcel(accessControlExport, '门禁管理数据', tableApi.formApi.form.values, {
-    fieldMappingTime: formOptions.fieldMappingTime,
-  });
+  commonDownloadExcel(
+    accessControlExport,
+    '门禁管理数据',
+    tableApi.formApi.form.values,
+    {
+      fieldMappingTime: formOptions.fieldMappingTime,
+    },
+  );
 }
 </script>
 
@@ -140,7 +140,8 @@ function handleDownloadExcel() {
             danger
             type="primary"
             v-access:code="['property:accessControl:remove']"
-            @click="handleMultiDelete">
+            @click="handleMultiDelete"
+          >
             {{ $t('pages.common.delete') }}
           </a-button>
           <a-button

apps/web-antd/src/views/sis/accessControl/permissionRules/accessControl-modal.vue

@@ -6,7 +6,7 @@ import { $t } from '@vben/locales';
 import { cloneDeep } from '@vben/utils';
 
 import { useVbenForm } from '#/adapter/form';
-import { accessControlAdd, accessControlInfo, accessControlUpdate } from '#/api/property/accessControl';
+import { accessControlAdd, accessControlInfo, accessControlUpdate } from '#/api/sis/accessControl';
 import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup';
 
 import { modalSchema } from './data';

apps/web-antd/src/views/sis/accessControl/permissionRules/index.vue

@@ -19,8 +19,8 @@ import {
   accessControlExport,
   accessControlList,
   accessControlRemove,
-} from '#/api/property/accessControl';
-import type { AccessControlForm } from '#/api/property/accessControl/model';
+} from '#/api/sis/accessControl';
+import type { AccessControlForm } from '#/api/sis/accessControl/model';
 import { commonDownloadExcel } from '#/utils/file/download';
 
 import accessControlModal from './accessControl-modal.vue';

apps/web-antd/src/views/sis/accessControl/permissionSettings/accessControl-modal.vue

@@ -6,7 +6,7 @@ import { $t } from '@vben/locales';
 import { cloneDeep } from '@vben/utils';
 
 import { useVbenForm } from '#/adapter/form';
-import { accessControlAdd, accessControlInfo, accessControlUpdate } from '#/api/property/accessControl';
+import { accessControlAdd, accessControlInfo, accessControlUpdate } from '#/api/sis/accessControl';
 import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup';
 
 import { modalSchema } from './data';

apps/web-antd/src/views/sis/accessControl/permissionSettings/index.vue

@@ -19,8 +19,8 @@ import {
   accessControlExport,
   accessControlList,
   accessControlRemove,
-} from '#/api/property/accessControl';
-import type { AccessControlForm } from '#/api/property/accessControl/model';
+} from '#/api/sis/accessControl';
+import type { AccessControlForm } from '#/api/sis/accessControl/model';
 import { commonDownloadExcel } from '#/utils/file/download';
 
 import accessControlModal from './accessControl-modal.vue';

apps/web-antd/src/views/sis/accessControl/useRecord/accessControl-modal.vue

@@ -6,7 +6,7 @@ import { $t } from '@vben/locales';
 import { cloneDeep } from '@vben/utils';
 
 import { useVbenForm } from '#/adapter/form';
-import { accessControlAdd, accessControlInfo, accessControlUpdate } from '#/api/property/accessControl';
+import { accessControlAdd, accessControlInfo, accessControlUpdate } from '#/api/sis/accessControl';
 import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup';
 
 import { modalSchema } from './data';

apps/web-antd/src/views/sis/accessControl/useRecord/index.vue

@@ -19,8 +19,8 @@ import {
   accessControlExport,
   accessControlList,
   accessControlRemove,
-} from '#/api/property/accessControl';
-import type { AccessControlForm } from '#/api/property/accessControl/model';
+} from '#/api/sis/accessControl';
+import type { AccessControlForm } from '#/api/sis/accessControl/model';
 import { commonDownloadExcel } from '#/utils/file/download';
 
 import accessControlModal from './accessControl-modal.vue';

apps/web-antd/src/views/sis/deviceManage/data.ts

@@ -0,0 +1,170 @@
+import type { FormSchemaGetter } from '#/adapter/form';
+import type { VxeGridProps } from '#/adapter/vxe-table';
+import { getPopupContainer } from '@vben/utils';
+import { getDictOptions } from '#/utils/dict';
+import { DictEnum } from '@vben/constants';
+import { accessControlList } from '#/api/sis/accessControl';
+import type { AccessControlQuery } from '#/api/sis/accessControl/model';
+
+export const querySchema: FormSchemaGetter = () => [
+  {
+    component: 'Input',
+    fieldName: 'deviceName',
+    label: '设备名称',
+  },
+  {
+    component: 'Input',
+    fieldName: 'deviceIp',
+    label: '设备ip',
+  },
+  {
+    fieldName: 'deviceStatus',
+    label: '在线状态',
+    component: 'Select',
+    componentProps: {
+      getPopupContainer,
+      options: getDictOptions(DictEnum.sis_device_status),
+    },
+  },
+];
+
+// 需要使用i18n注意这里要改成getter形式 否则切换语言不会刷新
+// export const columns: () => VxeGridProps['columns'] = () => [
+export const columns: VxeGridProps['columns'] = [
+  { type: 'checkbox', width: 60 },
+  {
+    title: '设备名称',
+    field: 'deviceName',
+  },
+  {
+    title: '设备ip',
+    field: 'deviceIp',
+  },
+  {
+    title: '设备端口',
+    field: 'devicePort',
+  },
+  {
+    title: '设备',
+    field: 'deviceMac',
+  },
+  {
+    title: '在线状态',
+    field: 'deviceStatus',
+  },
+
+  {
+    title: '通道编号',
+    field: 'channelNo',
+  },
+  {
+    title: '录像机ip',
+    field: 'vcrIp',
+  },
+  {
+    title: '录像机端口',
+    field: 'vcrPort',
+  },
+  {
+    title: '门禁id',
+    field: 'accessControlId',
+  },
+  {
+    field: 'action',
+    fixed: 'right',
+    slots: { default: 'action' },
+    title: '操作',
+    width: 180,
+  },
+];
+
+export const modalSchema: FormSchemaGetter = () => [
+  {
+    label: '主键id',
+    fieldName: 'id',
+    component: 'Input',
+    dependencies: {
+      show: () => false,
+      triggerFields: [''],
+    },
+  },
+  {
+    label: '设备名称',
+    fieldName: 'deviceName',
+    component: 'Input',
+    rules: 'required',
+  },
+  {
+    label: '设备ip',
+    fieldName: 'deviceIp',
+    component: 'Input',
+    rules: 'required',
+  },
+  {
+    label: '设备端口',
+    fieldName: 'devicePort',
+    component: 'Input',
+    rules: 'required',
+  },
+  {
+    label: '设备账号',
+    fieldName: 'deviceAccount',
+    component: 'Input',
+    rules: 'required',
+  },
+  {
+    label: '设备密码',
+    fieldName: 'devicePwd',
+    component: 'Input',
+    rules: 'required',
+  },
+  {
+    label: '设备Mac',
+    fieldName: 'deviceMac',
+    component: 'Input',
+  },
+  {
+    label: '通道编号',
+    fieldName: 'channelNo',
+    component: 'Input',
+  },
+  {
+    label: '录像机ip',
+    fieldName: 'vcrIp',
+    component: 'Input',
+  },
+  {
+    label: '录像机端口',
+    fieldName: 'vcrPort',
+    component: 'Input',
+  },
+  {
+    label: '录像机账号',
+    fieldName: 'vcrAccount',
+    component: 'Input',
+  },
+  {
+    label: '录像机密码',
+    fieldName: 'vcrPwd',
+    component: 'Input',
+  },
+  {
+    label: '绑定门禁',
+    fieldName: 'accessControlId',
+    component: 'ApiSelect',
+    componentProps: {
+      // mode: 'multiple', // 关键属性，启用多选模式
+      resultField: 'list', // 根据API返回结构调整
+      labelField: 'accessName',
+      valueField: 'accessCode',
+      api: async () => {
+        const params: AccessControlQuery = {
+          pageNum: 1,
+          pageSize: 500,
+        };
+        const res = await accessControlList(params);
+        return res.rows;
+      },
+    },
+  },
+];

apps/web-antd/src/views/sis/deviceManage/deviceManage-modal.vue

@@ -6,7 +6,7 @@ import { $t } from '@vben/locales';
 import { cloneDeep } from '@vben/utils';
 
 import { useVbenForm } from '#/adapter/form';
-import { accessControlAdd, accessControlInfo, accessControlUpdate } from '#/api/property/accessControl';
+import { deviceManageAdd, deviceManageInfo, deviceManageUpdate } from '#/api/sis/deviceManage';
 import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup';
 
 import { modalSchema } from './data';
@@ -21,7 +21,7 @@ const title = computed(() => {
 const [BasicForm, formApi] = useVbenForm({
   commonConfig: {
     // 默认占满两列
-    formItemClass: 'col-span-2',
+    formItemClass: 'col-span-1',
     // 默认label宽度 px
     labelWidth: 80,
     // 通用配置项 会影响到所有表单项
@@ -43,7 +43,7 @@ const { onBeforeClose, markInitialized, resetInitialized } = useBeforeCloseDiff(
 
 const [BasicModal, modalApi] = useVbenModal({
   // 在这里更改宽度
-  class: 'w-[550px]',
+  class: 'w-[60%]',
   fullscreenButton: false,
   onBeforeClose,
   onClosed: handleClosed,
@@ -58,7 +58,7 @@ const [BasicModal, modalApi] = useVbenModal({
     isUpdate.value = !!id;
 
     if (isUpdate.value && id) {
-      const record = await accessControlInfo(id);
+      const record = await deviceManageInfo(id);
       await formApi.setValues(record);
     }
     await markInitialized();
@@ -76,7 +76,7 @@ async function handleConfirm() {
     }
     // getValues获取为一个readonly的对象 需要修改必须先深拷贝一次
     const data = cloneDeep(await formApi.getValues());
-    await (isUpdate.value ? accessControlUpdate(data) : accessControlAdd(data));
+    await (isUpdate.value ? deviceManageUpdate(data) : deviceManageAdd(data));
     resetInitialized();
     emit('reload');
     modalApi.close();

apps/web-antd/src/views/sis/deviceManage/index.vue

@@ -0,0 +1,182 @@
+<script setup lang="ts">
+import type { Recordable } from '@vben/types';
+
+import { ref } from 'vue';
+
+import { Page, useVbenModal, type VbenFormProps } from '@vben/common-ui';
+import { getVxePopupContainer } from '@vben/utils';
+
+import { Modal, Popconfirm, Space } from 'ant-design-vue';
+import dayjs from 'dayjs';
+
+import {   
+  useVbenVxeGrid,
+  vxeCheckboxChecked,
+  type VxeGridProps 
+} from '#/adapter/vxe-table';
+
+import {
+  deviceManageExport,
+  deviceManageList,
+  deviceManageRemove,
+} from '#/api/sis/deviceManage';
+import type { DeviceManageForm } from '#/api/sis/deviceManage/model';
+import { commonDownloadExcel } from '#/utils/file/download';
+
+import deviceManageModal from './deviceManage-modal.vue';
+import { columns, querySchema } from './data';
+
+const formOptions: VbenFormProps = {
+  commonConfig: {
+    labelWidth: 80,
+    componentProps: {
+      allowClear: true,
+    },
+  },
+  schema: querySchema(),
+  wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4',
+  // 处理区间选择器RangePicker时间格式 将一个字段映射为两个字段 搜索/导出会用到
+  // 不需要直接删除
+  // fieldMappingTime: [
+  //  [
+  //    'createTime',
+  //    ['params[beginTime]', 'params[endTime]'],
+  //    ['YYYY-MM-DD 00:00:00', 'YYYY-MM-DD 23:59:59'],
+  //  ],
+  // ],
+};
+
+const gridOptions: VxeGridProps = {
+  checkboxConfig: {
+    // 高亮
+    highlight: true,
+    // 翻页时保留选中状态
+    reserve: true,
+    // 点击行选中
+    // trigger: 'row',
+  },
+  // 需要使用i18n注意这里要改成getter形式 否则切换语言不会刷新
+  // columns: columns(),
+  columns,
+  height: 'auto',
+  keepSource: true,
+  pagerConfig: {},
+  proxyConfig: {
+    ajax: {
+      query: async ({ page }, formValues = {}) => {
+        return await deviceManageList({
+          pageNum: page.currentPage,
+          pageSize: page.pageSize,
+          ...formValues,
+        });
+      },
+    },
+  },
+  rowConfig: {
+    keyField: 'id',
+  },
+  // 表格全局唯一表示 保存列配置需要用到
+  id: 'sis-deviceManage-index'
+};
+
+const [BasicTable, tableApi] = useVbenVxeGrid({
+  formOptions,
+  gridOptions,
+});
+
+const [DeviceManageModal, modalApi] = useVbenModal({
+  connectedComponent: deviceManageModal,
+});
+
+function handleAdd() {
+  modalApi.setData({});
+  modalApi.open();
+}
+
+async function handleEdit(row: Required<DeviceManageForm>) {
+  modalApi.setData({ id: row.id });
+  modalApi.open();
+}
+
+async function handleDelete(row: Required<DeviceManageForm>) {
+  await deviceManageRemove(row.id);
+  await tableApi.query();
+}
+
+function handleMultiDelete() {
+  const rows = tableApi.grid.getCheckboxRecords();
+  const ids = rows.map((row: Required<DeviceManageForm>) => row.id);
+  Modal.confirm({
+    title: '提示',
+    okType: 'danger',
+    content: `确认删除选中的${ids.length}条记录吗？`,
+    onOk: async () => {
+      await deviceManageRemove(ids);
+      await tableApi.query();
+    },
+  });
+}
+
+function handleDownloadExcel() {
+  commonDownloadExcel(deviceManageExport, '设备管理数据', tableApi.formApi.form.values, {
+    fieldMappingTime: formOptions.fieldMappingTime,
+  });
+}
+</script>
+
+<template>
+  <Page :auto-content-height="true">
+    <BasicTable table-title="设备管理列表">
+      <template #toolbar-tools>
+        <Space>
+          <a-button
+            v-access:code="['sis:deviceManage:export']"
+            @click="handleDownloadExcel"
+          >
+            {{ $t('pages.common.export') }}
+          </a-button>
+          <a-button
+            :disabled="!vxeCheckboxChecked(tableApi)"
+            danger
+            type="primary" 
+            v-access:code="['sis:deviceManage:remove']" 
+            @click="handleMultiDelete">
+            {{ $t('pages.common.delete') }}
+          </a-button>
+          <a-button
+            type="primary"
+            v-access:code="['sis:deviceManage:add']"
+            @click="handleAdd"
+          >
+            {{ $t('pages.common.add') }}
+          </a-button>
+        </Space>
+      </template>
+      <template #action="{ row }">
+        <Space>
+          <ghost-button
+            v-access:code="['sis:deviceManage:edit']"
+            @click.stop="handleEdit(row)"
+          >
+            {{ $t('pages.common.edit') }}
+          </ghost-button>
+          <Popconfirm
+            :get-popup-container="getVxePopupContainer"
+            placement="left"
+            title="确认删除？"
+            @confirm="handleDelete(row)"
+          >
+            <ghost-button
+              danger
+              v-access:code="['sis:deviceManage:remove']"
+              @click.stop=""
+            >
+              {{ $t('pages.common.delete') }}
+            </ghost-button>
+          </Popconfirm>
+        </Space>
+      </template>
+    </BasicTable>
+    <DeviceManageModal @reload="tableApi.query()" />
+  </Page>
+</template>

apps/web-antd/src/views/sis/personLibImg/index.vue

@@ -1,15 +1,13 @@
 <script setup lang="ts">
 import type { VbenFormProps } from '@vben/common-ui';
+import { Page, useVbenModal } from '@vben/common-ui';
 
 import type { VxeGridProps } from '#/adapter/vxe-table';
+import { useVbenVxeGrid, vxeCheckboxChecked } from '#/adapter/vxe-table';
 import type { PersonLibImgForm } from '#/api/sis/personLibImg/model';
-
-import { Page, useVbenModal } from '@vben/common-ui';
 import { getVxePopupContainer } from '@vben/utils';
 
 import { Modal, Popconfirm, Space } from 'ant-design-vue';
-
-import { useVbenVxeGrid, vxeCheckboxChecked } from '#/adapter/vxe-table';
 import {
   personLibImgExport,
   personLibImgList,
@@ -121,6 +119,11 @@ function handleDownloadExcel() {
     },
   );
 }
+
+/**
+ * 对图像进行门禁授权
+ */
+function accessControlAuth() {}
 </script>
 
 <template>
@@ -128,6 +131,14 @@ function handleDownloadExcel() {
     <BasicTable table-title="人像信息列表">
       <template #toolbar-tools>
         <Space>
+          <a-button
+            type="primary"
+            :disabled="!vxeCheckboxChecked(tableApi)"
+            v-access:code="['system:personLibImg:add']"
+            @click="accessControlAuth"
+          >
+            门禁授权
+          </a-button>
           <a-button
             v-access:code="['system:personLibImg:export']"
             @click="handleDownloadExcel"
@@ -160,6 +171,7 @@ function handleDownloadExcel() {
           >
             {{ $t('pages.common.edit') }}
           </ghost-button>
+
           <Popconfirm
             :get-popup-container="getVxePopupContainer"
             placement="left"

packages/@core/base/shared/src/constants/dict-enum.ts

@@ -20,6 +20,7 @@ export const DictEnum = {
   wy_room_type: 'room_type', // 房间类型
   wy_fjzt: 'wy_fjzt', // 房间状态
   wy_direction_towards: 'direction_towards', // 房间朝向
+  sis_device_status: 'sis_device_status',   //设备在线状态
 
   SIS_ACCESS_CONTROL_DEVICE_TYPE: 'sis_access_control_device_type',
   SIS_LIB_TYPE: 'sis_lib_type',