admin/JiShe.IOT.UI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新接口调用

Browse Source
This commit is contained in:
ChenYi 2025-07-28 15:06:31 +08:00
parent afeb8fcaee
commit 0a1bffe8f8
16 changed files with 111 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
apps/web-antd/src/api-client/schemas.gen.ts
View File

@ -1266,9 +1266,9 @@ export const DeviceTableModelDataInfoPageInputSchema = {
</example>`,
nullable: true
},
systemName: {
dataBaseName: {
type: 'string',
description: '系统名称',
description: '数据库名称',
nullable: true
},
ioTDataType: {
@ -1304,7 +1304,7 @@ export const DeviceTableModelDataInfoPageInputSchema = {
export const DeviceTableModelDataInfoPageOutputSchema = {
type: 'object',
properties: {
systemName: {
dataBaseName: {
type: 'string',
description: '系统名称',
nullable: true
@ -1390,9 +1390,9 @@ export const DeviceTreeModelDataInfoInputSchema = {
</example>`,
nullable: true
},
systemName: {
dataBaseName: {
type: 'string',
description: '系统名称',
description: '数据库名称',
nullable: true
},
ioTDataType: {
@ -3764,9 +3764,9 @@ export const MeterReadingPacketInfoPageInputSchema = {
</example>`,
nullable: true
},
systemName: {
dataBaseName: {
type: 'string',
description: '系统名称',
description: '数据库名称',
nullable: true
},
ioTDataType: {
@ -7033,9 +7033,9 @@ export const QueryCTWingAepReceiveMessageInputSchema = {
</example>`,
nullable: true
},
systemName: {
dataBaseName: {
type: 'string',
description: '系统名称',
description: '数据库名称',
nullable: true
},
ioTDataType: {
@ -7229,9 +7229,9 @@ export const QueryOneNETReceiveMessageInputSchema = {
</example>`,
nullable: true
},
systemName: {
dataBaseName: {
type: 'string',
description: '系统名称',
description: '数据库名称',
nullable: true
},
ioTDataType: {

50
apps/web-antd/src/api-client/types.gen.ts
View File

@ -588,9 +588,9 @@ export type DeviceTableModelDataInfoPageInput = {
*/
sorting?: (string) | null;
/**
* 系统名称
* 数据库名称
*/
systemName?: (string) | null;
dataBaseName?: (string) | null;
/**
* 数据类型
*/
@ -617,7 +617,7 @@ export type DeviceTableModelDataInfoPageOutput = {
/**
* 系统名称
*/
systemName?: (string) | null;
dataBaseName?: (string) | null;
/**
* 数据类型
*/
@ -673,9 +673,9 @@ export type DeviceTreeModelDataInfoInput = {
*/
sorting?: (string) | null;
/**
* 系统名称
* 数据库名称
*/
systemName?: (string) | null;
dataBaseName?: (string) | null;
/**
* 数据类型
*/
@ -1662,9 +1662,9 @@ export type MeterReadingPacketInfoPageInput = {
*/
sorting?: (string) | null;
/**
* 系统名称
* 数据库名称
*/
systemName?: (string) | null;
dataBaseName?: (string) | null;
/**
* 数据类型
*/
@ -3534,9 +3534,9 @@ export type QueryCTWingAepReceiveMessageInput = {
*/
sorting?: (string) | null;
/**
* 系统名称
* 数据库名称
*/
systemName?: (string) | null;
dataBaseName?: (string) | null;
/**
* 数据类型
*/
@ -3677,9 +3677,9 @@ export type QueryOneNETReceiveMessageInput = {
*/
sorting?: (string) | null;
/**
* 系统名称
* 数据库名称
*/
systemName?: (string) | null;
dataBaseName?: (string) | null;
/**
* 数据类型
*/
@ -5084,23 +5084,27 @@ export type PostTableModelPacketInfoPageData = {
export type PostTableModelPacketInfoPageResponse = (MeterReadingPacketInfoPageOutputPagedResultDto);
export type PostTableModelPacketInfoPageError = (RemoteServiceErrorResponse);
export type PostTableModelPacketInfoPageError = unknown;
export type PostTableModelPacketInfoInsertData = {
body?: MeterReadingPacketInfoDto;
query?: {
input?: MeterReadingPacketInfoDto;
};
};
export type PostTableModelPacketInfoInsertResponse = (unknown);
export type PostTableModelPacketInfoInsertError = (RemoteServiceErrorResponse);
export type PostTableModelPacketInfoInsertError = unknown;
export type PostTableModelPacketInfoBatchInsertData = {
body?: Array<MeterReadingPacketInfoDto>;
query?: {
input?: Array<MeterReadingPacketInfoDto>;
};
};
export type PostTableModelPacketInfoBatchInsertResponse = (unknown);
export type PostTableModelPacketInfoBatchInsertError = (RemoteServiceErrorResponse);
export type PostTableModelPacketInfoBatchInsertError = unknown;
export type PostTableModelDeviceDataInfoPageData = {
body?: DeviceTableModelDataInfoPageInput;
@ -5108,23 +5112,27 @@ export type PostTableModelDeviceDataInfoPageData = {
export type PostTableModelDeviceDataInfoPageResponse = (DeviceTableModelDataInfoPageOutputPagedResultDto);
export type PostTableModelDeviceDataInfoPageError = (RemoteServiceErrorResponse);
export type PostTableModelDeviceDataInfoPageError = unknown;
export type PostTableModelCtWingLogInfoData = {
body?: QueryCTWingAepReceiveMessageInput;
query?: {
input?: QueryCTWingAepReceiveMessageInput;
};
};
export type PostTableModelCtWingLogInfoResponse = (QueryCTWingAepReceiveMessageOutputPagedResultDto);
export type PostTableModelCtWingLogInfoError = (RemoteServiceErrorResponse);
export type PostTableModelCtWingLogInfoError = unknown;
export type PostTableModelOneNetLogInfoData = {
body?: QueryOneNETReceiveMessageInput;
query?: {
input?: QueryOneNETReceiveMessageInput;
};
};
export type PostTableModelOneNetLogInfoResponse = (QueryOneNETReceiveMessageOutputPagedResultDto);
export type PostTableModelOneNetLogInfoError = (RemoteServiceErrorResponse);
export type PostTableModelOneNetLogInfoError = unknown;
export type PostTenantsFindData = {
body?: FindTenantByNameInput;

3
apps/web-antd/src/locales/langs/en-US/abp.json
View File

@ -77,7 +77,7 @@
"loginMode": "Login Method",
"loginUrl": "Login URL",
"detail": "Details",
"systemName": "System Name",
"dataBaseName": "Database Name",
"projectId": "Project ID",
"dataType": "Data Type",
"deviceType": "Device Type",
@ -210,6 +210,7 @@
},
"IoTDBBase": {
"IoTDataType": "IoTDataType",
"DataBaseName": "DataBaseName",
"DeviceType": "DeviceType",
"Timestamps": "Timestamps",
"FormattedTimestamps": "Formatted Timestamps",

3
apps/web-antd/src/locales/langs/zh-CN/abp.json
View File

@ -77,7 +77,7 @@
"loginMode": "登录方式",
"loginUrl": "登录地址",
"detail": "详情",
"systemName": "系统名称",
"dataBaseName": "数据库名称",
"projectId": "项目编码",
"dataType": "数据类型",
"deviceType": "设备类型",
@ -210,6 +210,7 @@
},
"IoTDBBase": {
"IoTDataType": "数据类型",
"DataBaseName": "所属数据库",
"DeviceType": "设备类型",
"Timestamps": "时标(纳秒)",
"FormattedTimestamps": "时标",

2
apps/web-antd/src/views/devicemanagement/deviceinfo/index.vue
View File

@ -184,7 +184,7 @@ const toStatusData = (row: Record<string, any>) => {
DeviceType: row.meterType,
DeviceId: row.meterId,
FocusAddress: row.focusAddress,
SystemName: row.businessSystemName,
DataBaseName: row.businessSystemName,
},
});
};

6
apps/web-antd/src/views/iotdbdatamanagement/ctwingLog/README.md
View File

@ -21,7 +21,7 @@ CTWing日志管理页面用于查看和管理CTWing物联网平台的设备数
DeviceType?: string, // 设备类型
DeviceId?: string, // 设备ID
FocusAddress?: string, // 集中器地址
SystemName?: string, // 系统名称
DataBaseName?: string, // 数据库名称
ProjectId?: string // 项目ID
}
```
@ -32,7 +32,7 @@ CTWing日志管理页面用于查看和管理CTWing物联网平台的设备数
{
items: [
{
systemName: string, // 系统名称
dataBaseName: string, // 数据库名称
projectId: string, // 项目ID
dataType: string, // 数据类型
deviceType: string, // 设备类型
@ -74,7 +74,7 @@ CTWing日志管理页面用于查看和管理CTWing物联网平台的设备数
| 字段名 | 显示名称 | 说明 |
| ---------------- | ---------- | ------------------ |
| systemName | 系统名称 | 所属系统 |
| dataBaseName | 数据库名称 | 所属数据库 |
| projectId | 项目编码 | 项目标识 |
| dataType | 数据类型 | 数据类型 |
| deviceType | 设备类型 | 设备类型 |

8
apps/web-antd/src/views/iotdbdatamanagement/ctwingLog/index.vue
View File

@ -140,7 +140,7 @@ const formOptions: VbenFormProps = {
'EndCreationTime',
'IoTDataType',
'StartCreationTime',
'SystemName',
'DataBaseName',
]);
const hasRelevantChange = changedFields.some((field) =>
relevantFields.has(field),
@ -184,7 +184,7 @@ const gridOptions: VxeGridProps<any> = {
// 获取选中的设备信息
let deviceId = currentFormValues.DeviceId || '';
let systemName = '';
let dataBaseName = '';
const deviceType = currentFormValues.DeviceType || '';
// 优先使用选中的设备信息
@ -195,7 +195,7 @@ const gridOptions: VxeGridProps<any> = {
: null);
if (deviceInfo) {
systemName = deviceInfo.businessSystemName || '';
dataBaseName = deviceInfo.businessSystemName || '';
// 根据设备类型获取正确的 id
if (Number(deviceType) === 10) {
// 集中器类型使用 focusId
@ -213,7 +213,7 @@ const gridOptions: VxeGridProps<any> = {
DeviceType: deviceType,
IoTDataType: currentFormValues.IoTDataType || '',
DeviceId: deviceId,
SystemName: systemName || currentFormValues.SystemName || '',
DataBaseName: dataBaseName || currentFormValues.DataBaseName || '',
StartCreationTime: formatDate(currentFormValues.StartCreationTime),
EndCreationTime: formatDate(currentFormValues.EndCreationTime),
FocusAddress: currentFormValues.FocusAddress || '',

21
apps/web-antd/src/views/iotdbdatamanagement/ctwingLog/schema.ts
View File

@ -4,19 +4,20 @@ import { computed } from 'vue';
import dayjs from 'dayjs';
import { getSelectResultList } from '#/api-client';
import { getCommonGetSelectList } from '#/api-client';
import { $t } from '#/locales';
export const querySchema = computed(() => [
{
component: 'ApiSelect',
fieldName: 'SystemName',
label: $t('abp.IoTDBBase.SystemName'),
fieldName: 'DataBaseName',
label: $t('abp.IoTDBBase.DataBaseName'),
componentProps: {
api: getSelectResultList,
api: getCommonGetSelectList,
params: {
query: {
TypeName: 'BusinessSystemEnum',
typeName: 'BusinessSystemEnum'
},
},
labelField: 'secondValue',
@ -46,10 +47,10 @@ export const querySchema = computed(() => [
fieldName: 'DeviceType',
label: $t('abp.IoTDBBase.DeviceType'),
componentProps: {
api: getSelectResultList,
api: getCommonGetSelectList,
params: {
query: {
TypeName: 'MeterTypeEnum',
typeName: 'MeterTypeEnum'
},
},
labelField: 'value',
@ -79,10 +80,12 @@ export const querySchema = computed(() => [
fieldName: 'IoTDataType',
label: $t('abp.IoTDBBase.IoTDataType'),
componentProps: {
api: getSelectResultList,
api: getCommonGetSelectList,
params: {
query: {
TypeName: 'IoTDBDataTypeConst',
input: {
typeName: 'IoTDBDataTypeConst',
},
},
},
labelField: 'value',

10
apps/web-antd/src/views/iotdbdatamanagement/deviceData/README.md
View File

@ -63,7 +63,7 @@ if (data?.items && data.items.length > 0) {
```typescript
// 在 dynamicColumns.ts 中添加字段映射
export const fieldNameMapping: FieldMapping = {
SystemName: '系统名称',
DataBaseName: '数据库名称',
ProjectId: '项目ID',
// 添加新的字段映射
CustomField: '自定义字段',
@ -96,7 +96,7 @@ export const fieldTypeConfig: FieldTypeConfig = {
| 字段名 | 显示名称 | 说明 |
|--------|----------|------|
| SystemName | 系统名称 | 系统名称字段 |
| DataBaseName | 数据库名称 | 数据库名称字段 |
| ProjectId | 项目ID | 项目标识符 |
| ProjectName | 项目名称 | 项目名称 |
| IoTDataType | IoT数据类型 | 数据类型标识 |
@ -124,7 +124,7 @@ export const fieldTypeConfig: FieldTypeConfig = {
// 固定列定义
const fixedColumns = computed(() => [
{ title: '序号', type: 'seq', width: 50 },
{ field: 'SystemName', title: '系统名称', width: 150 },
{ field: 'DataBaseName', title: '数据库名称', width: 150 },
]);
// 动态列
@ -142,9 +142,9 @@ const allColumns = computed(() => [
```typescript
import { sortFieldsByImportance } from './example';
const fields = ['CustomField', 'Timestamps', 'SystemName'];
const fields = ['CustomField', 'Timestamps', 'DataBaseName'];
const sortedFields = sortFieldsByImportance(fields);
// 结果: ['Timestamps', 'SystemName', 'CustomField']
// 结果: ['Timestamps', 'DataBaseName', 'CustomField']
```
### 3. 数据验证

8
apps/web-antd/src/views/iotdbdatamanagement/deviceData/dynamicColumns.ts
View File

@ -7,12 +7,12 @@ import type {
// 字段名映射配置
export const fieldNameMapping: FieldMapping = {
// SystemName: '系统名称',
// DataBaseName: '数据库名称',
// ProjectId: '项目ID',
// ProjectName: '项目名称',
IoTDataType: 'IoT数据类型',
DeviceType: '设备类型',
DeviceId: '设备ID',
DeviceAddress: '设备ID',
Timestamps: '时间戳',
// 可以根据需要添加更多映射
};
@ -34,10 +34,10 @@ export const fieldTypeConfig: FieldTypeConfig = {
// 固定字段列表 - 这些字段已经在固定列中定义，不需要在动态列中重复生成
const FIXED_FIELDS = [
// 'SystemName',
// 'DataBaseName',
'DeviceType',
'IoTDataType',
'DeviceId',
'DeviceAddress',
'Timestamps',
'FormattedTimestamps',
'DeviceAddress',

23
apps/web-antd/src/views/iotdbdatamanagement/deviceData/index.vue
View File

@ -68,7 +68,7 @@ const formatDate = (date: Date | string) => {
};
const route = useRoute();
const { DeviceType, DeviceId, FocusAddress, SystemName } = route.query;
const { DeviceType, DeviceId, FocusAddress, DataBaseName } = route.query;
// 动态列定义
const dynamicColumns = ref<any[]>([]);
@ -91,8 +91,8 @@ const fixedColumns = [
slots: {},
},
{
field: 'SystemName',
title: $t('abp.IoTDBBase.SystemName'),
field: 'DataBaseName',
title: $t('abp.IoTDBBase.DataBaseName'),
minWidth: 150,
showOverflow: true,
slots: {},
@ -111,13 +111,6 @@ const fixedColumns = [
showOverflow: true,
slots: {},
},
{
field: 'DeviceId',
title: $t('abp.IoTDBBase.DeviceId'),
minWidth: 150,
showOverflow: true,
slots: {},
},
{
field: 'DeviceAddress',
title: $t('abp.IoTDBBase.DeviceAddress'),
@ -170,7 +163,7 @@ const formOptions: VbenFormProps = {
FocusAddress: FocusAddress as string,
DeviceType: DeviceType ? Number(DeviceType) : undefined,
DeviceId: DeviceId as string,
SystemName: SystemName as string,
DataBaseName: DataBaseName as string,
},
// 禁用表单值变化时自动提交，使用自定义处理函数
submitOnChange: false,
@ -184,7 +177,7 @@ const formOptions: VbenFormProps = {
'FocusAddress',
'IoTDataType',
'StartCreationTime',
'SystemName',
'DataBaseName',
]);
const hasRelevantChange = changedFields.some((field) =>
relevantFields.has(field),
@ -336,7 +329,7 @@ const gridOptions: VxeGridProps<any> = {
DeviceId: finalDeviceId ? finalDeviceId.toString() : '',
FocusAddress: finalFocusAddress || FocusAddress || '',
// 添加其他表单参数
SystemName: currentFormValues.SystemName || SystemName,
DataBaseName: currentFormValues.DataBaseName || DataBaseName,
IoTDataType: ioTDataTypeValue || undefined,
// 添加日期范围参数
StartCreationTime: startCreationTime || undefined,
@ -443,7 +436,7 @@ const initializeGrid = async () => {
}
// 如果有路由参数，自动触发查询
if (DeviceType || DeviceId || FocusAddress || SystemName) {
if (DeviceType || DeviceId || FocusAddress || DataBaseName) {
// 延迟一下确保表格已完全初始化
setTimeout(() => {
if (gridApi) {
@ -458,7 +451,7 @@ const initializeGrid = async () => {
// 监听路由参数变化，当有路由参数时自动触发查询
watch(
() => [DeviceType, DeviceId, FocusAddress, SystemName],
() => [DeviceType, DeviceId, FocusAddress, DataBaseName],
async (newValues, oldValues) => {
// 如果有路由参数，等待设备信息加载完成后自动触发查询
if (newValues.some(Boolean) && gridApi && isGridInitialized.value) {

31
apps/web-antd/src/views/iotdbdatamanagement/deviceData/schema.ts
View File

@ -2,19 +2,19 @@ import type { VxeGridProps } from '#/adapter/vxe-table';
import { computed } from 'vue';
import { getSelectResultList } from '#/api-client';
import { getCommonGetSelectList } from '#/api-client';
import { $t } from '#/locales';
export const querySchema = computed(() => [
{
component: 'ApiSelect',
fieldName: 'SystemName',
label: $t('abp.IoTDBBase.SystemName'),
fieldName: 'DataBaseName',
label: $t('abp.IoTDBBase.DataBaseName'),
componentProps: {
api: getSelectResultList,
api: getCommonGetSelectList,
params: {
query: {
TypeName: 'BusinessSystemEnum',
typeName: 'BusinessSystemEnum',
},
},
labelField: 'secondValue',
@ -44,10 +44,10 @@ export const querySchema = computed(() => [
fieldName: 'DeviceType',
label: $t('abp.IoTDBBase.DeviceType'),
componentProps: {
api: getSelectResultList,
api: getCommonGetSelectList,
params: {
query: {
TypeName: 'MeterTypeEnum',
typeName: 'MeterTypeEnum'
},
},
labelField: 'value',
@ -77,10 +77,10 @@ export const querySchema = computed(() => [
fieldName: 'IoTDataType',
label: $t('abp.IoTDBBase.IoTDataType'),
componentProps: {
api: getSelectResultList,
api: getCommonGetSelectList,
params: {
query: {
TypeName: 'IoTDBDataTypeConst',
typeName: 'IoTDBDataTypeConst'
},
},
labelField: 'value',
@ -147,13 +147,8 @@ export const tableSchema: any = computed((): VxeGridProps['columns'] => [
minWidth: '150',
},
{
field: 'SystemName',
title: $t('abp.IoTDBBase.SystemName'),
minWidth: '150',
},
{
field: 'ProjectId',
title: $t('abp.IoTDBBase.ProjectId'),
field: 'DataBaseName',
title: $t('abp.IoTDBBase.DataBaseName'),
minWidth: '150',
},
{
@ -167,8 +162,8 @@ export const tableSchema: any = computed((): VxeGridProps['columns'] => [
minWidth: '150',
},
{
field: 'DeviceId',
title: $t('abp.IoTDBBase.DeviceId'),
field: 'DeviceAddress',
title: $t('abp.IoTDBBase.DeviceAddress'),
minWidth: '150',
},
]);

2
apps/web-antd/src/views/iotdbdatamanagement/deviceData/types.ts
View File

@ -1,6 +1,6 @@
// 基础设备数据类型
export interface BaseDeviceData {
SystemName?: string;
DataBaseName?: string;
ProjectId?: string;
ProjectName?: string;
IoTDataType?: string;

8
apps/web-antd/src/views/iotdbdatamanagement/onenetLog/index.vue
View File

@ -139,7 +139,7 @@ const formOptions: VbenFormProps = {
'EndCreationTime',
'IoTDataType',
'StartCreationTime',
'SystemName',
'DataBaseName',
]);
const hasRelevantChange = changedFields.some((field) =>
relevantFields.has(field),
@ -182,7 +182,7 @@ const gridOptions: VxeGridProps<any> = {
// 获取选中的设备信息
let deviceId = currentFormValues.DeviceId || '';
let systemName = '';
let dataBaseName = '';
const deviceType = currentFormValues.DeviceType || '';
// 优先使用选中的设备信息
@ -193,7 +193,7 @@ const gridOptions: VxeGridProps<any> = {
: null);
if (deviceInfo) {
systemName = deviceInfo.businessSystemName || '';
dataBaseName = deviceInfo.businessSystemName || '';
// 根据设备类型获取正确的 id
if (Number(deviceType) === 10) {
// 集中器类型使用 focusId
@ -212,7 +212,7 @@ const gridOptions: VxeGridProps<any> = {
DeviceType: deviceType,
IoTDataType: currentFormValues.IoTDataType || '',
DeviceId: deviceId,
SystemName: systemName || currentFormValues.SystemName || '',
DataBaseName: dataBaseName || currentFormValues.DataBaseName || '',
StartCreationTime: formatDate(currentFormValues.StartCreationTime),
EndCreationTime: formatDate(currentFormValues.EndCreationTime),
};

18
apps/web-antd/src/views/iotdbdatamanagement/onenetLog/schema.ts
View File

@ -4,19 +4,19 @@ import { computed } from 'vue';
import dayjs from 'dayjs';
import { getSelectResultList } from '#/api-client';
import { getCommonGetSelectList } from '#/api-client';
import { $t } from '#/locales';
export const querySchema = computed(() => [
{
component: 'ApiSelect',
fieldName: 'SystemName',
label: $t('abp.IoTDBBase.SystemName'),
fieldName: 'DataBaseName',
label: $t('abp.IoTDBBase.DataBaseName'),
componentProps: {
api: getSelectResultList,
api: getCommonGetSelectList,
params: {
query: {
TypeName: 'BusinessSystemEnum',
typeName: 'BusinessSystemEnum',
},
},
labelField: 'secondValue',
@ -46,10 +46,10 @@ export const querySchema = computed(() => [
fieldName: 'DeviceType',
label: $t('abp.IoTDBBase.DeviceType'),
componentProps: {
api: getSelectResultList,
api: getCommonGetSelectList,
params: {
query: {
TypeName: 'MeterTypeEnum',
typeName: 'MeterTypeEnum',
},
},
labelField: 'value',
@ -79,10 +79,10 @@ export const querySchema = computed(() => [
fieldName: 'IoTDataType',
label: $t('abp.IoTDBBase.IoTDataType'),
componentProps: {
api: getSelectResultList,
api: getCommonGetSelectList,
params: {
query: {
TypeName: 'IoTDBDataTypeConst',
typeName: 'IoTDBDataTypeConst',
},
},
labelField: 'value',

2
apps/web-antd/src/views/iotdbdatamanagement/telemetryLog/schema.ts
View File

@ -19,7 +19,7 @@ export const querySchema = computed(() => [
export const tableSchema: any = computed((): VxeGridProps['columns'] => [
{ title: $t('common.seq'), type: 'seq', width: 50 },
{ field: 'systemName', title: $t('abp.log.systemName'), minWidth: '150' },
{ field: 'dataBaseName', title: $t('abp.log.dataBaseName'), minWidth: '150' },
{
field: 'projectId',
title: $t('abp.log.projectId'),