by2025/admin-vben5
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
Details

Browse Source
This commit is contained in:
fyy
2025-08-06 09:12:22 +08:00
parent 2beb771185 febe532404
commit 90531f1598
32 changed files with 1011 additions and 674 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/web-antd/src/api/property/assetManage/asset/model.d.ts vendored
View File

@@ -59,7 +59,7 @@ export interface AssetVO {
/**
* 固定资产类型
*/
type: number;
type: string;
/**
* 创建时间

6
apps/web-antd/src/api/property/floor/index.ts
View File

@@ -61,9 +61,9 @@ export function floorRemove(id: ID | IDS) {
}
/**
* 根据单元ID查询楼层
* 根据楼层ID查询楼层
* @param id id
*/
export function queryByUnitId(id: ID | IDS) {
return requestClient.get<FloorVO[]>(`/property/floor/queryByUnitId/${id}`);
export function queryByBuildingId(id: ID | IDS) {
return requestClient.get<FloorVO[]>(`/property/floor/queryByBuildingId/${id}`);
}

10
apps/web-antd/src/api/sis/authGroup/model.d.ts vendored
View File

@@ -21,6 +21,16 @@ export interface AuthGroupVO {
*/
isEnable: boolean;
/**
* 设备id
*/
acIds?: string[] | number[];
/**
* 楼层id
*/
floorIds?: string[] | number[];
}
export interface AuthGroupForm extends BaseEntity {

14
apps/web-antd/src/api/sis/deviceChannel/model.d.ts vendored
View File

@@ -1,4 +1,4 @@
import type { PageQuery, BaseEntity } from '#/api/common';
import type { BaseEntity, PageQuery } from '#/api/common';
export interface DeviceChannelVO {
/**
@@ -51,6 +51,13 @@ export interface DeviceChannelVO {
*/
channelNo: string;
nvrId: string;
nvrFactoryNo: string;
nvrIp: string;
nvrPort: number;
nvrAccount: string;
nvrPwd: string;
nvrChannelNo: string;
}
export interface DeviceChannelForm extends BaseEntity {
@@ -103,7 +110,6 @@ export interface DeviceChannelForm extends BaseEntity {
* 设备通道编号
*/
channelNo?: string;
}
export interface DeviceChannelQuery extends PageQuery {
@@ -153,7 +159,7 @@ export interface DeviceChannelQuery extends PageQuery {
channelNo?: string;
/**
* 日期范围参数
*/
* 日期范围参数
*/
params?: any;
}

75
apps/web-antd/src/api/sis/deviceManage/model.d.ts vendored
View File

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

19
apps/web-antd/src/api/sis/elevatorInfo/index.ts
View File

@@ -59,22 +59,3 @@ export function elevatorInfoUpdate(data: ElevatorInfoForm) {
export function elevatorInfoRemove(elevatorId: ID | IDS) {
return requestClient.deleteWithMsg<void>(`/sis/elevatorInfo/${elevatorId}`);
}
/**
* 新增电梯⇄楼层关联
* @param params
* @returns void
*/
export function refAdd(data: ElevatorFloorRefForm) {
return requestClient.postWithMsg<void>('/sis/elevatorInfo/ref/add', data);
}
/**
* 查询电梯⇄楼层关联
* @param id
* @returns void
*/
export function refQuery(id: ID) {
return requestClient.get<ElevatorFloorRefVo[]>(`/sis/elevatorInfo/ref/${id}`);
}

27
apps/web-antd/src/api/sis/elevatorInfo/model.d.ts vendored
View File

@@ -96,6 +96,22 @@ export interface ElevatorInfoVO {
*/
controlPwd: string
elevatorControlDeviceId: {
value: number,
deviceIp: string,
deviceId: number,
}
remoteCallElevatorDeviceId: {
value: number,
deviceIp: string,
deviceId: number,
}[]
/**
* 建筑ID
*/
buildingId?: number | string
}
export interface ElevatorInfoForm extends BaseEntity {
@@ -195,10 +211,9 @@ export interface ElevatorInfoForm extends BaseEntity {
controlPwd?: string
/**
* 单元ID
* 建筑ID
*/
unitId?: number
buildingId?: number
}
export interface ElevatorInfoQuery extends PageQuery {
@@ -299,9 +314,9 @@ export interface ElevatorInfoQuery extends PageQuery {
}
export interface ElevatorFloorRefVo {
/**
*
*/
/**
*
*/
elevatorId: string | number
/**