feat: 定义更多的联合设备类型

src/apis/model/biz/entity/index.ts

@@ -1,45 +1,21 @@
-import type { Nullable } from '@/types';
+import type { Nullable, Optional } from '@/types';
-import type { NdmAlarmHost, NdmAlarmHostPageQuery } from './alarm';
+import type { ReduceForPageQuery, ReduceForSaveVO, ReduceForUpdateVO } from '../../base';
-import type { NdmSecurityBox, NdmSecurityBoxPageQuery, NdmSwitch, NdmSwitchPageQuery } from './other';
+import type { NdmAlarmHost } from './alarm';
-import type { NdmNvr, NdmNvrPageQuery } from './storage';
+import type { NdmSecurityBox, NdmSwitch } from './other';
-import type {
+import type { NdmNvr } from './storage';
-  NdmCamera,
+import type { NdmCamera, NdmDecoder, NdmKeyboard, NdmMediaServer, NdmVideoServer } from './video';
-  NdmCameraPageQuery,
-  NdmDecoder,
-  NdmDecoderPageQuery,
-  NdmKeyboard,
-  NdmKeyboardPageQuery,
-  NdmMediaServer,
-  NdmMediaServerPageQuery,
-  NdmMediaServerResultVO,
-  NdmMediaServerSaveVO,
-  NdmMediaServerUpdateVO,
-  NdmVideoServer,
-  NdmVideoServerPageQuery,
-  NdmVideoServerResultVO,
-  NdmVideoServerSaveVO,
-  NdmVideoServerUpdateVO,
-} from './video';
 
 export type NdmDevice = NdmAlarmHost | NdmCamera | NdmDecoder | NdmKeyboard | NdmMediaServer | NdmNvr | NdmSecurityBox | NdmSwitch | NdmVideoServer;
-export type NdmDevicePageQuery =
-  | NdmAlarmHostPageQuery
-  | NdmCameraPageQuery
-  | NdmDecoderPageQuery
-  | NdmKeyboardPageQuery
-  | NdmMediaServerPageQuery
-  | NdmNvrPageQuery
-  | NdmSecurityBoxPageQuery
-  | NdmSwitchPageQuery
-  | NdmVideoServerPageQuery;
-
 export type NdmDeviceResultVO = Nullable<NdmDevice>;
+export type NdmDeviceSaveVO = Partial<Omit<NdmDevice, ReduceForSaveVO>>;
+export type NdmDeviceUpdateVO = Optional<Omit<NdmDevice, ReduceForUpdateVO>>;
+export type NdmDevicePageQuery = Partial<Omit<NdmDevice, ReduceForPageQuery>>;
 
 export type NdmServer = NdmMediaServer | NdmVideoServer;
-export type NdmServerResultVO = NdmMediaServerResultVO | NdmVideoServerResultVO;
+export type NdmServerResultVO = Nullable<NdmServer>;
-export type NdmServerSaveVO = NdmMediaServerSaveVO | NdmVideoServerSaveVO;
+export type NdmServerSaveVO = Partial<Omit<NdmServer, ReduceForSaveVO>>;
-export type NdmServerUpdateVO = NdmMediaServerUpdateVO | NdmVideoServerUpdateVO;
+export type NdmServerUpdateVO = Optional<Omit<NdmServer, ReduceForUpdateVO>>;
-export type NdmServerPageQuery = NdmMediaServerPageQuery | NdmVideoServerPageQuery;
+export type NdmServerPageQuery = Partial<Omit<NdmServer, ReduceForPageQuery>>;
 
 export * from './alarm';
 export * from './icmp';