aunix/wvp-GB28181-pro
1
0
Fork 0
mirror of https://gitee.com/pan648540858/wvp-GB28181-pro.git synced 2026-05-24 05:57:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1929 from XiaoQiTong/wvp-28181-2.0

Browse Source 
修复一些实际使用中的bug
This commit is contained in:
648540858 2025-07-28 14:58:15 +08:00 committed by GitHub
commit c2d42d67c0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/genersoft/iot/vmp/gb28181/dao/DeviceMapper.java
View File

@ -252,6 +252,7 @@ public interface DeviceMapper {
"mobile_position_submission_interval,"+ "mobile_position_submission_interval,"+
"subscribe_cycle_for_alarm,"+ "subscribe_cycle_for_alarm,"+
"ssrc_check,"+ "ssrc_check,"+
"media_server_id,"+
"as_message_channel,"+ "as_message_channel,"+
"broadcast_push_after_ack,"+ "broadcast_push_after_ack,"+
"geo_coord_sys,"+ "geo_coord_sys,"+

2
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
View File

@ -1139,7 +1139,7 @@ public class SIPCommander implements ISIPCommander {
MessageEvent<Object> messageEvent = MessageEvent.getInstance(cmdType, sn + "", channelId, 4000L, callback); MessageEvent<Object> messageEvent = MessageEvent.getInstance(cmdType, sn + "", channelId, 4000L, callback);
messageSubscribe.addSubscribe(messageEvent); messageSubscribe.addSubscribe(messageEvent);
log.info("[预置位查询] 设备编号： {}， 通道编号： {}， SN： {}", device.getDeviceId(), channelId, sn); log.info("[预置位查询] 设备编号： {}， 通道编号： {}， SN： {}", device.getDeviceId(), channelId, sn);
Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, SipUtils.getNewFromTag(), null,sipSender.getNewCallIdHeader(sipLayer.getLocalIp(device.getLocalIp()),device.getTransport())); Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null,sipSender.getNewCallIdHeader(sipLayer.getLocalIp(device.getLocalIp()),device.getTransport()));
sipSender.transmitRequest(sipLayer.getLocalIp(device.getLocalIp()), request, eventResult -> { sipSender.transmitRequest(sipLayer.getLocalIp(device.getLocalIp()), request, eventResult -> {
messageSubscribe.removeSubscribe(messageEvent.getKey()); messageSubscribe.removeSubscribe(messageEvent.getKey());
callback.run(ErrorCode.ERROR100.getCode(), "失败，" + eventResult.msg, null); callback.run(ErrorCode.ERROR100.getCode(), "失败，" + eventResult.msg, null);

2
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/PresetQueryResponseMessageHandler.java
View File

@ -136,7 +136,7 @@ public class PresetQueryResponseMessageHandler extends SIPRequestProcessorParent
List<Preset> data = messageResponseTask.getData(); List<Preset> data = messageResponseTask.getData();
data.addAll(presetQuerySipReqList); data.addAll(presetQuerySipReqList);
if (data.size() == sumNum) { if (data.size() == sumNum) {
responseMessageHandler.handMessageEvent(rootElement, presetQuerySipReqList); responseMessageHandler.handMessageEvent(rootElement, data);
mesageMap.remove(key); mesageMap.remove(key);
boolean remove = delayQueue.remove(messageResponseTask); boolean remove = delayQueue.remove(messageResponseTask);
if (!remove) { if (!remove) {

3
web/src/api/device.js
View File

@ -185,12 +185,13 @@ export function changeChannelAudio(params) {
} }
export function updateChannelStreamIdentification(params) { export function updateChannelStreamIdentification(params) {
const { deviceDbId, streamIdentification } = params const { deviceDbId, streamIdentification, id } = params
return request({ return request({
method: 'post', method: 'post',
url: `/api/device/query/channel/stream/identification/update/`, url: `/api/device/query/channel/stream/identification/update/`,
params: { params: {
deviceDbId: deviceDbId, deviceDbId: deviceDbId,
id: id,
streamIdentification: streamIdentification streamIdentification: streamIdentification
} }
}) })

8
web/src/views/device/channel/index.vue
View File

@ -55,8 +55,8 @@
<el-option label="streamnumber:1(子码流-2022)" value="streamnumber:1" /> <el-option label="streamnumber:1(子码流-2022)" value="streamnumber:1" />
<el-option label="streamprofile:0(主码流-大华)" value="streamprofile:0" /> <el-option label="streamprofile:0(主码流-大华)" value="streamprofile:0" />
<el-option label="streamprofile:1(子码流-大华)" value="streamprofile:1" /> <el-option label="streamprofile:1(子码流-大华)" value="streamprofile:1" />
<el-option label="streamMode:main(主码流-水星+TP-LINK)" value="streamMode:main" /> <el-option label="streamMode:MAIN(主码流-水星+TP-LINK)" value="streamMode:MAIN" />
<el-option label="streamMode:sub(子码流-水星+TP-LINK)" value="streamMode:sub" /> <el-option label="streamMode:SUB(子码流-水星+TP-LINK)" value="streamMode:SUB" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item style="float: right;"> <el-form-item style="float: right;">
@ -123,8 +123,8 @@
<el-option label="streamnumber:1(子码流-2022)" value="streamnumber:1" /> <el-option label="streamnumber:1(子码流-2022)" value="streamnumber:1" />
<el-option label="streamprofile:0(主码流-大华)" value="streamprofile:0" /> <el-option label="streamprofile:0(主码流-大华)" value="streamprofile:0" />
<el-option label="streamprofile:1(子码流-大华)" value="streamprofile:1" /> <el-option label="streamprofile:1(子码流-大华)" value="streamprofile:1" />
<el-option label="streamMode:main(主码流-水星+TP-LINK)" value="streamMode:main" /> <el-option label="streamMode:MAIN(主码流-水星+TP-LINK)" value="streamMode:MAIN" />
<el-option label="streamMode:sub(子码流-水星+TP-LINK)" value="streamMode:sub" /> <el-option label="streamMode:SUB(子码流-水星+TP-LINK)" value="streamMode:SUB" />
</el-select> </el-select>
</template> </template>
</el-table-column> </el-table-column>