Merge branch 'master' into dev/springBoot3

# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/controller/MediaController.java
#	src/main/java/com/genersoft/iot/vmp/jt1078/config/JT1078Controller.java
This commit is contained in:
lin
2025-09-24 08:38:29 +08:00
476 changed files with 33561 additions and 3579 deletions

View File

@@ -28,14 +28,14 @@ export function queryListByData(params) {
}
export function loadRecord(params) {
const { app, stream, date } = params
const { app, stream, cloudRecordId } = params
return request({
method: 'get',
url: `/api/cloud/record/loadRecord`,
params: {
app: app,
stream: stream,
date: date
cloudRecordId: cloudRecordId
}
})
}

View File

@@ -63,7 +63,7 @@ export function getList(params) {
const { page, count, query, online, hasRecordPlan, channelType } = params
return request({
method: 'get',
url: `/api/common/channel/list`,
url: '/api/common/channel/list',
params: {
page: page,
count: count,
@@ -79,7 +79,7 @@ export function getCivilCodeList(params) {
const { page, count, channelType, query, online, civilCode } = params
return request({
method: 'get',
url: `/api/common/channel/civilcode/list`,
url: '/api/common/channel/civilcode/list',
params: {
page: page,
count: count,
@@ -95,7 +95,7 @@ export function getUnusualCivilCodeList(params) {
const { page, count, channelType, query, online } = params
return request({
method: 'get',
url: `/api/common/channel/civilCode/unusual/list`,
url: '/api/common/channel/civilCode/unusual/list',
params: {
page: page,
count: count,
@@ -110,7 +110,7 @@ export function getUnusualParentList(params) {
const { page, count, channelType, query, online } = params
return request({
method: 'get',
url: `/api/common/channel/parent/unusual/list`,
url: '/api/common/channel/parent/unusual/list',
params: {
page: page,
count: count,
@@ -125,7 +125,7 @@ export function clearUnusualCivilCodeList(params) {
const { all, channelIds } = params
return request({
method: 'post',
url: `/api/common/channel/civilCode/unusual/clear`,
url: '/api/common/channel/civilCode/unusual/clear',
data: {
all: all,
channelIds: channelIds
@@ -137,7 +137,7 @@ export function clearUnusualParentList(params) {
const { all, channelIds } = params
return request({
method: 'post',
url: `/api/common/channel/parent/unusual/clear`,
url: '/api/common/channel/parent/unusual/clear',
data: {
all: all,
channelIds: channelIds
@@ -149,7 +149,7 @@ export function getParentList(params) {
const { page, count, channelType, query, online, groupDeviceId } = params
return request({
method: 'get',
url: `/api/common/channel/parent/list`,
url: '/api/common/channel/parent/list',
params: {
page: page,
count: count,
@@ -165,7 +165,7 @@ export function addToRegion(params) {
const { civilCode, channelIds } = params
return request({
method: 'post',
url: `/api/common/channel/region/add`,
url: '/api/common/channel/region/add',
data: {
civilCode: civilCode,
channelIds: channelIds
@@ -176,7 +176,7 @@ export function addToRegion(params) {
export function deleteFromRegion(channels) {
return request({
method: 'post',
url: `/api/common/channel/region/delete`,
url: '/api/common/channel/region/delete',
data: {
channelIds: channels
}
@@ -187,7 +187,7 @@ export function addDeviceToRegion(params) {
const { civilCode, deviceIds } = params
return request({
method: 'post',
url: `/api/common/channel/region/device/add`,
url: '/api/common/channel/region/device/add',
data: {
civilCode: civilCode,
deviceIds: deviceIds
@@ -198,7 +198,7 @@ export function addDeviceToRegion(params) {
export function deleteDeviceFromRegion(deviceIds) {
return request({
method: 'post',
url: `/api/common/channel/region/device/delete`,
url: '/api/common/channel/region/device/delete',
data: {
deviceIds: deviceIds
}
@@ -209,7 +209,7 @@ export function addToGroup(params) {
const { parentId, businessGroup, channelIds } = params
return request({
method: 'post',
url: `/api/common/channel/group/add`,
url: '/api/common/channel/group/add',
data: {
parentId: parentId,
businessGroup: businessGroup,
@@ -221,7 +221,7 @@ export function addToGroup(params) {
export function deleteFromGroup(channels) {
return request({
method: 'post',
url: `/api/common/channel/group/delete`,
url: '/api/common/channel/group/delete',
data: {
channelIds: channels
}
@@ -232,7 +232,7 @@ export function addDeviceToGroup(params) {
const { parentId, businessGroup, deviceIds } = params
return request({
method: 'post',
url: `/api/common/channel/group/device/add`,
url: '/api/common/channel/group/device/add',
data: {
parentId: parentId,
businessGroup: businessGroup,
@@ -244,7 +244,7 @@ export function addDeviceToGroup(params) {
export function deleteDeviceFromGroup(deviceIds) {
return request({
method: 'post',
url: `/api/common/channel/group/device/delete`,
url: '/api/common/channel/group/device/delete',
data: {
deviceIds: deviceIds
}
@@ -260,3 +260,329 @@ export function playChannel(channelId) {
}
})
}
export function stopPlayChannel(channelId) {
return request({
method: 'get',
url: '/api/common/channel/play/stop',
params: {
channelId: channelId
}
})
}
// 前端控制
export function setSpeedForScan({ channelId, scanId, speed }) {
return request({
method: 'get',
url: '/api/common/channel/front-end/scan/set/speed',
params: {
channelId: channelId,
scanId: scanId,
speed: speed
}
})
}
export function setLeftForScan({ channelId, scanId }) {
return request({
method: 'get',
url: '/api/common/channel/front-end/scan/set/left',
params: {
channelId: channelId,
scanId: scanId
}
})
}
export function setRightForScan({ channelId, scanId }) {
return request({
method: 'get',
url: '/api/common/channel/front-end/scan/set/right',
params: {
channelId: channelId,
scanId: scanId
}
})
}
export function startScan({ channelId, scanId }) {
return request({
method: 'get',
url: '/api/common/channel/front-end/scan/start',
params: {
channelId: channelId,
scanId: scanId
}
})
}
export function stopScan({ channelId, scanId }) {
return request({
method: 'get',
url: '/api/common/channel/front-end/scan/stop',
params: {
channelId: channelId,
scanId: scanId
}
})
}
export function queryPreset(channelId) {
return request({
method: 'get',
url: '/api/common/channel/front-end/preset/query',
params: {
channelId: channelId
}
})
}
export function addPointForCruise({ channelId, tourId, presetId }) {
return request({
method: 'get',
url: '/api/common/channel/front-end/tour/point/add',
params: {
channelId: channelId,
tourId: tourId,
presetId: presetId
}
})
}
export function deletePointForCruise({ channelId, tourId, presetId }) {
return request({
method: 'get',
url: '/api/common/channel/front-end/tour/point/delete',
params: {
channelId: channelId,
tourId: tourId,
presetId: presetId
}
})
}
export function setCruiseSpeed({ channelId, tourId, presetId , speed }) {
return request({
method: 'get',
url: '/api/common/channel/front-end/tour/speed',
params: {
channelId: channelId,
tourId: tourId,
presetId: presetId,
speed: speed
}
})
}
export function setCruiseTime({ channelId, tourId, presetId, time }) {
return request({
method: 'get',
url: '/api/common/channel/front-end/tour/time',
params: {
channelId: channelId,
tourId: tourId,
presetId: presetId,
time: time
}
})
}
export function startCruise({ channelId, tourId }) {
return request({
method: 'get',
url: '/api/common/channel/front-end/tour/start',
params: {
channelId: channelId,
tourId: tourId
}
})
}
export function stopCruise({ channelId, tourId }) {
return request({
method: 'get',
url: '/api/common/channel/front-end/tour/stop',
params: {
channelId: channelId,
tourId: tourId
}
})
}
export function addPreset({ channelId, presetId, presetName }) {
return request({
method: 'get',
url: '/api/common/channel/front-end/preset/add',
params: {
channelId: channelId,
presetId: presetId,
presetName: presetName
}
})
}
export function callPreset({ channelId, presetId }) {
return request({
method: 'get',
url: '/api/common/channel/front-end/preset/call',
params: {
channelId: channelId,
presetId: presetId
}
})
}
export function deletePreset({ channelId, presetId }) {
return request({
method: 'get',
url: '/api/common/channel/front-end/preset/delete',
params: {
channelId: channelId,
presetId: presetId
}
})
}
/**
* command: on 开启, off 关闭
*/
export function auxiliary({ channelId, command, auxiliaryId }) {
return request({
method: 'get',
url: '/api/common/channel/front-end/auxiliary',
params: {
channelId: channelId,
command: command,
auxiliaryId: auxiliaryId
}
})
}
/**
* command: on 开启, off 关闭
*/
export function wiper({ channelId, command }) {
return request({
method: 'get',
url: '/api/common/channel/front-end/wiper',
params: {
channelId: channelId,
command: command
}
})
}
export function ptz({ channelId, command, panSpeed, tiltSpeed, zoomSpeed }) {
return request({
method: 'get',
url: '/api/common/channel/front-end/ptz',
params: {
channelId: channelId,
command: command,
panSpeed: panSpeed,
tiltSpeed: tiltSpeed,
zoomSpeed: zoomSpeed
}
})
}
export function iris({ channelId, command, speed }) {
return request({
method: 'get',
url: '/api/common/channel/front-end/fi/iris',
params: {
channelId: channelId,
command: command,
speed: speed
}
})
}
export function focus({ channelId, command, speed }) {
return request({
method: 'get',
url: '/api/common/channel/front-end/fi/focus',
params: {
channelId: channelId,
command: command,
speed: speed
}
})
}
export function queryRecord({ channelId, startTime, endTime }) {
return request({
method: 'get',
url: '/api/common/channel/playback/query',
params: {
channelId: channelId,
startTime: startTime,
endTime: endTime
}
})
}
export function playback({ channelId, startTime, endTime }) {
return request({
method: 'get',
url: '/api/common/channel/playback',
params: {
channelId: channelId,
startTime: startTime,
endTime: endTime
}
})
}
export function stopPlayback({ channelId, stream }) {
return request({
method: 'get',
url: '/api/common/channel/playback/stop',
params: {
channelId: channelId,
stream: stream
}
})
}
export function pausePlayback({ channelId, stream}) {
return request({
method: 'get',
url: '/api/common/channel/playback/pause',
params: {
channelId: channelId,
stream: stream
}
})
}
export function resumePlayback({ channelId, stream}) {
return request({
method: 'get',
url: '/api/common/channel/playback/resume',
params: {
channelId: channelId,
stream: stream
}
})
}
export function seekPlayback({ channelId, stream, seekTime}) {
return request({
method: 'get',
url: '/api/common/channel/playback/seek',
params: {
channelId: channelId,
stream: stream,
seekTime: seekTime
}
})
}
export function speedPlayback({ channelId, stream, speed}) {
return request({
method: 'get',
url: '/api/common/channel/playback/speed',
params: {
channelId: channelId,
stream: stream,
speed: speed
}
})
}

View File

@@ -47,14 +47,22 @@ export function updateDeviceTransport(deviceId, streamMode) {
export function setGuard(deviceId) {
return request({
method: 'get',
url: `/api/device/control/guard/${deviceId}/SetGuard`
url: `/api/device/control/guard`,
params: {
deviceId: deviceId,
guardCmd: 'SetGuard'
}
})
}
export function resetGuard(deviceId) {
return request({
method: 'get',
url: `/api/device/control/guard/${deviceId}/ResetGuard`
url: `/api/device/control/guard`,
params: {
deviceId: deviceId,
guardCmd: 'ResetGuard'
}
})
}
@@ -118,6 +126,19 @@ export function queryChannels(deviceId, params) {
})
}
export function queryHasStreamChannels(params) {
const {page, count, query} = params
return request({
method: 'get',
url: `/api/device/query/streams`,
params: {
page: page,
count: count,
query: query
}
})
}
export function deviceRecord(params) {
const { deviceId, channelId, recordCmdStr } = params
return request({
@@ -172,12 +193,13 @@ export function changeChannelAudio(params) {
}
export function updateChannelStreamIdentification(params) {
const { deviceDbId, streamIdentification } = params
const { deviceDbId, streamIdentification, id } = params
return request({
method: 'post',
url: `/api/device/query/channel/stream/identification/update/`,
params: {
deviceDbId: deviceDbId,
id: id,
streamIdentification: streamIdentification
}
})

View File

@@ -48,3 +48,15 @@ export function getPath(params) {
}
})
}
export function queryTree(params) {
const { page, count, query } = params
return request({
method: 'get',
url: `/api/group/tree/query`,
params: {
query: query,
page: page,
count: count
}
})
}

371
web/src/api/jtDevice.js Normal file
View File

@@ -0,0 +1,371 @@
import request from '@/utils/request'
// 部标设备API
export function queryDevices({ page, count, query, online }) {
return request({
method: 'get',
url: '/api/jt1078/terminal/list',
params: {
page: page,
count: count,
query: query,
online: online
}
})
}
export function queryDeviceById(deviceId) {
return request({
method: 'get',
url: '/api/jt1078/terminal/query',
params: {
deviceId: deviceId
}
})
}
export function update(form) {
return request({
method: 'post',
url: '/api/jt1078/terminal/update',
params: form
})
}
export function add(form) {
return request({
method: 'post',
url: '/api/jt1078/terminal/add',
params: form
})
}
export function deleteDevice(phoneNumber) {
return request({
method: 'delete',
url: '/api/jt1078/terminal/delete',
params: {
phoneNumber: phoneNumber
}
})
}
export function queryChannels(params) {
const { page, count, query, deviceId } = params
return request({
method: 'get',
url: '/api/jt1078/terminal/channel/list',
params: {
page: page,
count: count,
query: query,
deviceId: deviceId
}
})
}
export function play(params) {
const { phoneNumber, channelId, type } = params
return request({
method: 'get',
url: '/api/jt1078/live/start',
params: {
phoneNumber: phoneNumber,
channelId: channelId,
type: type
}
})
}
export function stopPlay(params) {
const { phoneNumber, channelId } = params
return request({
method: 'get',
url: '/api/jt1078/live/stop',
params: {
phoneNumber: phoneNumber,
channelId: channelId
}
})
}
export function updateChannel(data) {
return request({
method: 'post',
url: '/api/jt1078/terminal/channel/update',
data: data
})
}
export function addChannel(data) {
return request({
method: 'post',
url: '/api/jt1078/terminal/channel/add',
data: data
})
}
export function ptz(params) {
const { phoneNumber, channelId, command, speed } = params
return request({
method: 'get',
url: '/api/jt1078/ptz',
params: {
phoneNumber: phoneNumber,
channelId: channelId,
command: command,
speed: speed
}
})
}
export function wiper(params) {
const { phoneNumber, channelId, command } = params
return request({
method: 'get',
url: '/api/jt1078/wiper',
params: {
phoneNumber: phoneNumber,
channelId: channelId,
command: command
}
})
}
export function fillLight(params) {
const { phoneNumber, channelId, command } = params
return request({
method: 'get',
url: '/api/jt1078/fill-light',
params: {
phoneNumber: phoneNumber,
channelId: channelId,
command: command
}
})
}
export function queryRecordList(params) {
const { phoneNumber, channelId, startTime, endTime } = params
return request({
method: 'get',
url: '/api/jt1078/record/list',
params: {
phoneNumber: phoneNumber,
channelId: channelId,
startTime: startTime,
endTime: endTime
}
})
}
export function startPlayback(params) {
const { phoneNumber, channelId, startTime, endTime, type, rate, playbackType, playbackSpeed } = params
return request({
method: 'get',
url: '/api/jt1078/playback/start/',
params: {
phoneNumber: phoneNumber,
channelId: channelId,
startTime: startTime,
endTime: endTime,
type: type,
rate: rate,
playbackType: playbackType,
playbackSpeed: playbackSpeed
}
})
}
export function getRecordTempUrl({ phoneNumber, channelId, startTime, endTime, alarmSign, mediaType, streamType, storageType }) {
return request({
method: 'get',
url: '/api/jt1078/playback/downloadUrl',
params: {
phoneNumber: phoneNumber,
channelId: channelId,
startTime: startTime,
endTime: endTime,
alarmSign: alarmSign,
mediaType: mediaType,
streamType: streamType,
storageType: storageType
}
})
}
export function controlPlayback(params) {
const { phoneNumber, channelId, command, playbackSpeed, time } = params
return request({
method: 'get',
url: '/api/jt1078/playback/control',
params: {
phoneNumber: phoneNumber,
channelId: channelId,
command: command,
playbackSpeed: playbackSpeed,
time: time
}
})
}
export function stopPlayback(params) {
const { phoneNumber, channelId, streamId } = params
return request({
method: 'get',
url: '/api/jt1078/playback/stop/',
params: {
phoneNumber: phoneNumber,
channelId: channelId,
streamId: streamId
}
})
}
export function queryConfig(phoneNumber) {
return request({
method: 'get',
url: '/api/jt1078/config/get',
params: {
phoneNumber: phoneNumber
}
})
}
export function setConfig(data) {
return request({
method: 'post',
url: '/api/jt1078/config/set',
data: data
})
}
export function queryAttribute(phoneNumber) {
return request({
method: 'get',
url: '/api/jt1078/attribute',
params: {
phoneNumber: phoneNumber
}
})
}
export function linkDetection(phoneNumber) {
return request({
method: 'get',
url: '/api/jt1078/link-detection',
params: {
phoneNumber: phoneNumber
}
})
}
export function queryPosition(phoneNumber) {
return request({
method: 'get',
url: '/api/jt1078/position-info',
params: {
phoneNumber: phoneNumber
}
})
}
export function sendTextMessage(data) {
return request({
method: 'post',
url: '/api/jt1078/text-msg',
data: data
})
}
export function telephoneCallback({ phoneNumber, sign, destPhoneNumber }) {
return request({
method: 'get',
url: '/api/jt1078/telephone-callback',
params: {
phoneNumber: phoneNumber,
sign: sign,
destPhoneNumber: destPhoneNumber
}
})
}
export function queryDriverInfo(phoneNumber) {
return request({
method: 'get',
url: '/api/jt1078/driver-information',
params: {
phoneNumber: phoneNumber
}
})
}
export function factoryReset(phoneNumber) {
return request({
method: 'post',
url: '/api/jt1078/control/factory-reset',
params: {
phoneNumber: phoneNumber
}
})
}
export function reset(phoneNumber) {
return request({
method: 'post',
url: '/api/jt1078/control/reset',
params: {
phoneNumber: phoneNumber
}
})
}
export function connection(data) {
return request({
method: 'post',
url: '/api/jt1078/control/connection',
data: data
})
}
export function controlDoor({ phoneNumber, open}) {
return request({
method: 'get',
url: '/api/jt1078/control/door',
params: {
phoneNumber: phoneNumber,
open: open
}
})
}
export function queryMediaAttribute(phoneNumber) {
return request({
method: 'get',
url: '/api/jt1078/media/attribute',
params: {
phoneNumber: phoneNumber
}
})
}
export function queryMediaData(data) {
return request({
method: 'post',
url: '/api/jt1078/media/list',
data: data
})
}
export function setPhoneBook(data) {
return request({
method: 'post',
url: '/api/jt1078/set-phone-book',
data: data
})
}
export function shooting(data) {
return request({
method: 'post',
url: '/api/jt1078/shooting',
data: data
})
}
export function startTalk({ phoneNumber, channelId }) {
return request({
method: 'get',
url: '/api/jt1078/talk/start',
params: {
phoneNumber: phoneNumber,
channelId: channelId
}
})
}
export function stopTalk({ phoneNumber, channelId }) {
return request({
method: 'get',
url: '/api/jt1078/talk/stop',
params: {
phoneNumber: phoneNumber,
channelId: channelId
}
})
}

View File

@@ -81,4 +81,16 @@ export function queryPath(deviceId) {
}
})
}
export function queryTree(params) {
const { page, count, query } = params
return request({
method: 'get',
url: `/api/region/tree/query`,
params: {
query: query,
page: page,
count: count
}
})
}