diff --git a/src/apis/models/system/def-parameter.ts b/src/apis/models/system/def-parameter.ts index dada8f4..eb85039 100644 --- a/src/apis/models/system/def-parameter.ts +++ b/src/apis/models/system/def-parameter.ts @@ -15,4 +15,4 @@ export type DefParameterSaveVO = Partial>; export type DefParameterUpdateVO = Partial>; -export type DefParameterPageVO = Partial>; +export type DefParameterPageQuery = Partial>; diff --git a/src/apis/requests/device/ndm-camera.ts b/src/apis/requests/device/ndm-camera.ts index fa3ac56..5615d71 100644 --- a/src/apis/requests/device/ndm-camera.ts +++ b/src/apis/requests/device/ndm-camera.ts @@ -4,10 +4,21 @@ import type { NdmCameraPageQuery, NdmCameraResultVO, NdmCameraUpdateVO } from '@ import { ndmClient } from '@/apis/client'; export const postNdmCameraPage = async (stationCode: string, pageQuery: PageParams) => { - const resp = await ndmClient.post>(`${stationCode}/api/ndm/ndmCamera/page`, pageQuery); - return resp; + const prefix = stationCode ? `/${stationCode}` : ''; + const resp = await ndmClient.post>(`${prefix}/api/ndm/ndmCamera/page`, pageQuery); + const [err, ndmCameraData] = resp; + if (err || !ndmCameraData) { + throw err; + } + return ndmCameraData; }; + export const putNdmCamera = async (stationCode: string, updateVO: NdmCameraUpdateVO) => { - const resp = await ndmClient.put(`${stationCode}/api/ndm/ndmCamera`, updateVO); - return resp; + const prefix = stationCode ? `/${stationCode}` : ''; + const resp = await ndmClient.put(`${prefix}/api/ndm/ndmCamera`, updateVO); + const [err, ndmCamera] = resp; + if (err || !ndmCamera) { + throw err; + } + return ndmCamera; }; diff --git a/src/apis/requests/device/ndm-decoder.ts b/src/apis/requests/device/ndm-decoder.ts index 3848380..8f5ce0b 100644 --- a/src/apis/requests/device/ndm-decoder.ts +++ b/src/apis/requests/device/ndm-decoder.ts @@ -4,10 +4,21 @@ import type { NdmDecoderPageQuery, NdmDecoderResultVO, NdmDecoderUpdateVO } from import { ndmClient } from '@/apis/client'; export const postNdmDecoderPage = async (stationCode: string, pageQuery: PageParams) => { - const resp = await ndmClient.post>(`${stationCode}/api/ndm/ndmDecoder/page`, pageQuery); - return resp; + const prefix = stationCode ? `/${stationCode}` : ''; + const resp = await ndmClient.post>(`${prefix}/api/ndm/ndmDecoder/page`, pageQuery); + const [err, ndmDecoderData] = resp; + if (err || !ndmDecoderData) { + throw err; + } + return ndmDecoderData; }; + export const putNdmDecoder = async (stationCode: string, updateVO: NdmDecoderUpdateVO) => { - const resp = await ndmClient.put(`${stationCode}/api/ndm/ndmDecoder`, updateVO); - return resp; + const prefix = stationCode ? `/${stationCode}` : ''; + const resp = await ndmClient.put(`${prefix}/api/ndm/ndmDecoder`, updateVO); + const [err, ndmDecoder] = resp; + if (err || !ndmDecoder) { + throw err; + } + return ndmDecoder; }; diff --git a/src/apis/requests/device/ndm-keyboard.ts b/src/apis/requests/device/ndm-keyboard.ts index 0242180..3a4045b 100644 --- a/src/apis/requests/device/ndm-keyboard.ts +++ b/src/apis/requests/device/ndm-keyboard.ts @@ -4,10 +4,21 @@ import type { NdmKeyboardPageQuery, NdmKeyboardResultVO, NdmKeyboardUpdateVO } f import { ndmClient } from '@/apis/client'; export const postNdmKeyboardPage = async (stationCode: string, pageQuery: PageParams) => { - const resp = await ndmClient.post>(`${stationCode}/api/ndm/ndmKeyboard/page`, pageQuery); - return resp; + const prefix = stationCode ? `/${stationCode}` : ''; + const resp = await ndmClient.post>(`${prefix}/api/ndm/ndmKeyboard/page`, pageQuery); + const [err, ndmKeyboardData] = resp; + if (err || !ndmKeyboardData) { + throw err; + } + return ndmKeyboardData; }; + export const putNdmKeyboard = async (stationCode: string, updateVO: NdmKeyboardUpdateVO) => { - const resp = await ndmClient.put(`${stationCode}/api/ndm/ndmKeyboard`, updateVO); - return resp; + const prefix = stationCode ? `/${stationCode}` : ''; + const resp = await ndmClient.put(`${prefix}/api/ndm/ndmKeyboard`, updateVO); + const [err, ndmKeyboard] = resp; + if (err || !ndmKeyboard) { + throw err; + } + return ndmKeyboard; }; diff --git a/src/apis/requests/device/ndm-media-server.ts b/src/apis/requests/device/ndm-media-server.ts index 57c0659..e73e728 100644 --- a/src/apis/requests/device/ndm-media-server.ts +++ b/src/apis/requests/device/ndm-media-server.ts @@ -4,10 +4,21 @@ import type { NdmMediaServerPageQuery, NdmMediaServerResultVO, NdmMediaServerUpd import { ndmClient } from '@/apis/client'; export const postNdmMediaServerPage = async (stationCode: string, pageQuery: PageParams) => { - const resp = await ndmClient.post>(`${stationCode}/api/ndm/ndmMediaServer/page`, pageQuery); - return resp; + const prefix = stationCode ? `/${stationCode}` : ''; + const resp = await ndmClient.post>(`${prefix}/api/ndm/ndmMediaServer/page`, pageQuery); + const [err, ndmMediaServerData] = resp; + if (err || !ndmMediaServerData) { + throw err; + } + return ndmMediaServerData; }; + export const putNdmMediaServer = async (stationCode: string, updateVO: NdmMediaServerUpdateVO) => { - const resp = await ndmClient.put(`${stationCode}/api/ndm/ndmMediaServer`, updateVO); - return resp; + const prefix = stationCode ? `/${stationCode}` : ''; + const resp = await ndmClient.put(`${prefix}/api/ndm/ndmMediaServer`, updateVO); + const [err, ndmMediaServer] = resp; + if (err || !ndmMediaServer) { + throw err; + } + return ndmMediaServer; }; diff --git a/src/apis/requests/device/ndm-monitor.ts b/src/apis/requests/device/ndm-monitor.ts index c09dd22..3254ab7 100644 --- a/src/apis/requests/device/ndm-monitor.ts +++ b/src/apis/requests/device/ndm-monitor.ts @@ -1,6 +1,10 @@ import { ndmClient } from '@/apis/client'; export const resetMonitorSchedule = async (stationCode: string) => { - const resp = await ndmClient.get(`${stationCode}/api/ndm/ndmConstant/anyTenant/resetMonitorSchedule`); - return resp; + const prefix = stationCode ? `/${stationCode}` : ''; + const resp = await ndmClient.get(`${prefix}/api/ndm/ndmConstant/anyTenant/resetMonitorSchedule`); + const [err] = resp; + if (err) { + throw err; + } }; diff --git a/src/apis/requests/device/ndm-nvr.ts b/src/apis/requests/device/ndm-nvr.ts index eb8a165..0ffd342 100644 --- a/src/apis/requests/device/ndm-nvr.ts +++ b/src/apis/requests/device/ndm-nvr.ts @@ -6,35 +6,64 @@ import type { ClientChannel, NdmNvrPageQuery, NdmNvrResultVO, NdmNvrUpdateVO, Nd import { ndmClient } from '@/apis/client'; export const postNdmNvrPage = async (stationCode: string, pageQuery: PageParams) => { - const resp = await ndmClient.post>(`${stationCode}/api/ndm/ndmNvr/page`, pageQuery); - return resp; + const prefix = stationCode ? `/${stationCode}` : ''; + const resp = await ndmClient.post>(`${prefix}/api/ndm/ndmNvr/page`, pageQuery); + const [err, ndmNvrData] = resp; + if (err || !ndmNvrData) { + throw err; + } + return ndmNvrData; }; + export const putNdmNvr = async (stationCode: string, updateVO: NdmNvrUpdateVO) => { - const resp = await ndmClient.put(`${stationCode}/api/ndm/ndmNvr`, updateVO); - return resp; + const prefix = stationCode ? `/${stationCode}` : ''; + const resp = await ndmClient.put(`${prefix}/api/ndm/ndmNvr`, updateVO); + const [err, ndmNvr] = resp; + if (err || !ndmNvr) { + throw err; + } + return ndmNvr; }; + export const getChannelList = async (stationCode: string, ndmNvr: NdmNvrVO) => { - const resp = await ndmClient.post(`${stationCode}/api/ndm/ndmRecordCheck/getChannelList`, { + const prefix = stationCode ? `/${stationCode}` : ''; + const resp = await ndmClient.post(`${prefix}/api/ndm/ndmRecordCheck/getChannelList`, { code: ndmNvr.gbCode, time: '', }); - return resp; + const [err, channelList] = resp; + if (err || !channelList) { + throw err; + } + return channelList; }; + export const getRecordCheckByParentId = async (stationCode: string, ndmNvr: NdmNvrVO, lastDays: number, gbCodeList: string[] = []) => { + const prefix = stationCode ? `/${stationCode}` : ''; const endDateTime = dayjs(); const startDateTime = endDateTime.subtract(lastDays, 'day'); - const resp = await ndmClient.post(`${stationCode}/api/ndm/ndmRecordCheck/getRecordCheckByParentId`, { + const resp = await ndmClient.post(`${prefix}/api/ndm/ndmRecordCheck/getRecordCheckByParentId`, { start: startDateTime.format('YYYY-MM-DD'), end: endDateTime.format('YYYY-MM-DD'), parentId: ndmNvr.gbCode, gbCodeList, }); - return resp; + const [err, recordCheckList] = resp; + if (err || !recordCheckList) { + throw err; + } + return recordCheckList; }; + export const reloadRecordCheckByGbId = async (stationCode: string, channel: ClientChannel, dayOffset: number) => { - const resp = await ndmClient.post(`${stationCode}/api/ndm/ndmRecordCheck/reloadRecordCheckByGbId`, { + const prefix = stationCode ? `/${stationCode}` : ''; + const resp = await ndmClient.post(`${prefix}/api/ndm/ndmRecordCheck/reloadRecordCheckByGbId`, { ...channel, dayOffset, }); - return resp; + const [err, result] = resp; + if (err || !result) { + throw err; + } + return result; }; diff --git a/src/apis/requests/device/ndm-security-box.ts b/src/apis/requests/device/ndm-security-box.ts index 857fb4c..a935052 100644 --- a/src/apis/requests/device/ndm-security-box.ts +++ b/src/apis/requests/device/ndm-security-box.ts @@ -4,19 +4,36 @@ import type { NdmSecurityBoxPageQuery, NdmSecurityBoxResultVO, NdmSecurityBoxUpd import { ndmClient } from '@/apis/client'; export const postNdmSecurityBoxPage = async (stationCode: string, pageQuery: PageParams) => { - const resp = await ndmClient.post>(`${stationCode}/api/ndm/ndmSecurityBox/page`, pageQuery); - return resp; + const prefix = stationCode ? `/${stationCode}` : ''; + const resp = await ndmClient.post>(`${prefix}/api/ndm/ndmSecurityBox/page`, pageQuery); + const [err, ndmSecurityBoxData] = resp; + if (err || !ndmSecurityBoxData) { + throw err; + } + return ndmSecurityBoxData; }; + export const putNdmSecurityBox = async (stationCode: string, updateVO: NdmSecurityBoxUpdateVO) => { - const resp = await ndmClient.put(`${stationCode}/api/ndm/ndmSecurityBox`, updateVO); - return resp; + const prefix = stationCode ? `/${stationCode}` : ''; + const resp = await ndmClient.put(`${prefix}/api/ndm/ndmSecurityBox`, updateVO); + const [err, ndmSecurityBox] = resp; + if (err || !ndmSecurityBox) { + throw err; + } + return ndmSecurityBox; }; + export const turnStatus = async (stationCode: string, ipAddress: string, circuitIndex: number, status: number) => { - const resp = await ndmClient.post(`${stationCode}/api/ndm/ndmSecurityBox/turnStatus`, { + const prefix = stationCode ? `/${stationCode}` : ''; + const resp = await ndmClient.post(`${prefix}/api/ndm/ndmSecurityBox/turnStatus`, { community: 'public', ipAddress, circuit: `${circuitIndex}`, status, }); - return resp; + const [err, result] = resp; + if (err || !result) { + throw err; + } + return result; }; diff --git a/src/apis/requests/device/ndm-switch.ts b/src/apis/requests/device/ndm-switch.ts index ea263ed..1b0bc44 100644 --- a/src/apis/requests/device/ndm-switch.ts +++ b/src/apis/requests/device/ndm-switch.ts @@ -4,10 +4,21 @@ import type { NdmSwitchPageQuery, NdmSwitchResultVO, NdmSwitchUpdateVO } from '@ import { ndmClient } from '@/apis/client'; export const postNdmSwitchPage = async (stationCode: string, pageQuery: PageParams) => { - const resp = await ndmClient.post>(`${stationCode}/api/ndm/ndmSwitch/page`, pageQuery); - return resp; + const prefix = stationCode ? `/${stationCode}` : ''; + const resp = await ndmClient.post>(`${prefix}/api/ndm/ndmSwitch/page`, pageQuery); + const [err, ndmSwitchData] = resp; + if (err || !ndmSwitchData) { + throw err; + } + return ndmSwitchData; }; + export const putNdmSwitch = async (stationCode: string, updateVO: NdmSwitchUpdateVO) => { - const resp = await ndmClient.put(`${stationCode}/api/ndm/ndmSwitch`, updateVO); - return resp; + const prefix = stationCode ? `/${stationCode}` : ''; + const resp = await ndmClient.put(`${prefix}/api/ndm/ndmSwitch`, updateVO); + const [err, ndmSwitch] = resp; + if (err || !ndmSwitch) { + throw err; + } + return ndmSwitch; }; diff --git a/src/apis/requests/device/ndm-video-server.ts b/src/apis/requests/device/ndm-video-server.ts index ce15aea..c058266 100644 --- a/src/apis/requests/device/ndm-video-server.ts +++ b/src/apis/requests/device/ndm-video-server.ts @@ -4,10 +4,21 @@ import type { NdmVideoServerPageQuery, NdmVideoServerResultVO, NdmVideoServerUpd import { ndmClient } from '@/apis/client'; export const postNdmVideoServerPage = async (stationCode: string, pageQuery: PageParams) => { - const resp = await ndmClient.post>(`${stationCode}/api/ndm/ndmVideoServer/page`, pageQuery); - return resp; + const prefix = stationCode ? `/${stationCode}` : ''; + const resp = await ndmClient.post>(`${prefix}/api/ndm/ndmVideoServer/page`, pageQuery); + const [err, ndmVideoServerData] = resp; + if (err || !ndmVideoServerData) { + throw err; + } + return ndmVideoServerData; }; + export const putNdmVideoServer = async (stationCode: string, updateVO: NdmVideoServerUpdateVO) => { - const resp = await ndmClient.put(`${stationCode}/api/ndm/ndmVideoServer`, updateVO); - return resp; + const prefix = stationCode ? `/${stationCode}` : ''; + const resp = await ndmClient.put(`${prefix}/api/ndm/ndmVideoServer`, updateVO); + const [err, ndmVideoServer] = resp; + if (err || !ndmVideoServer) { + throw err; + } + return ndmVideoServer; }; diff --git a/src/apis/requests/index.ts b/src/apis/requests/index.ts index 2b8f3dc..588d1ac 100644 --- a/src/apis/requests/index.ts +++ b/src/apis/requests/index.ts @@ -8,8 +8,10 @@ export * from './device/ndm-security-box'; export * from './device/ndm-switch'; export * from './device/ndm-video-server'; -export * from './log/device-alarm-log'; -export * from './log/icmp-log'; -export * from './log/snmp-log'; +export * from './log/ndm-device-alarm-log'; +export * from './log/ndm-icmp-log'; +export * from './log/ndm-snmp-log'; + +export * from './station/ndm-verify'; export * from './system/def-parameter'; diff --git a/src/apis/requests/log/ndm-device-alarm-log.ts b/src/apis/requests/log/ndm-device-alarm-log.ts index 64817da..d2ba559 100644 --- a/src/apis/requests/log/ndm-device-alarm-log.ts +++ b/src/apis/requests/log/ndm-device-alarm-log.ts @@ -4,6 +4,7 @@ import type { NdmDeviceAlarmLogPageQuery, NdmDeviceAlarmLogResultVO } from '@/ap import { ndmClient } from '@/apis/client'; export const postNdmDeviceAlarmLogPage = async (stationCode: string, pageQuery: PageParams) => { - const resp = await ndmClient.post>(`${stationCode}/api/ndm/ndmDeviceAlarmLog/page`, pageQuery); + const prefix = stationCode ? `/${stationCode}` : ''; + const resp = await ndmClient.post>(`${prefix}/api/ndm/ndmDeviceAlarmLog/page`, pageQuery); return resp; }; diff --git a/src/apis/requests/log/ndm-icmp-log.ts b/src/apis/requests/log/ndm-icmp-log.ts index 0e6108c..5698ed2 100644 --- a/src/apis/requests/log/ndm-icmp-log.ts +++ b/src/apis/requests/log/ndm-icmp-log.ts @@ -4,6 +4,7 @@ import type { NdmIcmpLogPageQuery, NdmIcmpLogResultVO } from '@/apis/models/devi import { ndmClient } from '@/apis/client'; export const postIcmpLogPage = async (stationCode: string, pageQuery: PageParams) => { - const resp = await ndmClient.post>(`${stationCode}/api/ndm/ndmIcmpLog/page`, pageQuery); + const prefix = stationCode ? `/${stationCode}` : ''; + const resp = await ndmClient.post>(`${prefix}/api/ndm/ndmIcmpLog/page`, pageQuery); return resp; }; diff --git a/src/apis/requests/log/ndm-snmp-log.ts b/src/apis/requests/log/ndm-snmp-log.ts index 3b2f4c0..110ed13 100644 --- a/src/apis/requests/log/ndm-snmp-log.ts +++ b/src/apis/requests/log/ndm-snmp-log.ts @@ -4,6 +4,7 @@ import type { NdmSnmpLogPageQuery, NdmSnmpLogResultVO } from '@/apis/models/devi import { ndmClient } from '@/apis/client'; export const postSnmpLogPage = async (stationCode: string, pageQuery: PageParams) => { - const resp = await ndmClient.post>(`${stationCode}/api/ndm/ndmSnmpLog/page`, pageQuery); + const prefix = stationCode ? `/${stationCode}` : ''; + const resp = await ndmClient.post>(`${prefix}/api/ndm/ndmSnmpLog/page`, pageQuery); return resp; }; diff --git a/src/apis/requests/station/ndm-verify.ts b/src/apis/requests/station/ndm-verify.ts new file mode 100644 index 0000000..b81bc05 --- /dev/null +++ b/src/apis/requests/station/ndm-verify.ts @@ -0,0 +1,10 @@ +import { ndmClient } from '@/apis/client'; + +export const ndmVerify = async (stationCode: string) => { + const prefix = stationCode ? `/${stationCode}` : ''; + const resp = await ndmClient.post(`${prefix}/api/ndm/ndmKeepAlive/verify`, {}, { timeout: 5000 }); + const [err] = resp; + if (err) { + throw err; + } +}; diff --git a/src/apis/requests/system/def-parameter.ts b/src/apis/requests/system/def-parameter.ts index 7c54ef2..f4a9917 100644 --- a/src/apis/requests/system/def-parameter.ts +++ b/src/apis/requests/system/def-parameter.ts @@ -1,10 +1,22 @@ +import type { PageParams, PageResult } from '@/apis/models/base/page'; import type { Result } from '@/axios'; -import type { DefParameterResultVO, DefParameterUpdateVO } from '../../models/system'; +import type { DefParameterPageQuery, DefParameterResultVO, DefParameterUpdateVO } from '../../models/system'; import { ndmClient } from '../../client'; +export const postDefParameterPage = async (stationCode: string, pageQuery: PageParams) => { + const prefix = stationCode ? `/${stationCode}` : ''; + const resp = await ndmClient.post>(`${prefix}/api/system/defParameter/page`, pageQuery); + const [err, defParameterData] = resp; + if (err || !defParameterData) { + throw err; + } + return defParameterData; +}; + export const putDefParameter = async (stationCode: string, updateVO: DefParameterUpdateVO) => { - const resp = await ndmClient.put>(`${stationCode}/api/system/defParameter`, { ...updateVO }); + const prefix = stationCode ? `/${stationCode}` : ''; + const resp = await ndmClient.put>(`${prefix}/api/system/defParameter`, { ...updateVO }); return resp; };