mirror of
https://gitee.com/pan648540858/wvp-GB28181-pro.git
synced 2026-05-26 23:17:50 +08:00
Compare commits
No commits in common. "93724bac98fd510538d9fcce53bbcf9db544832b" and "c11da964e2d2714478803564af6df302e3250f98" have entirely different histories.
93724bac98
...
c11da964e2
@ -81,6 +81,8 @@ public class PresetQueryResponseMessageHandler extends SIPRequestProcessorParent
|
|||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
Element sumNumElement = rootElement.element("SumNum");
|
||||||
|
int sumNum = Integer.parseInt(sumNumElement.getText());
|
||||||
int num = Integer.parseInt(presetListNumElement.attributeValue("Num"));
|
int num = Integer.parseInt(presetListNumElement.attributeValue("Num"));
|
||||||
List<Preset> presetQuerySipReqList = new ArrayList<>();
|
List<Preset> presetQuerySipReqList = new ArrayList<>();
|
||||||
if (num > 0) {
|
if (num > 0) {
|
||||||
@ -101,8 +103,14 @@ public class PresetQueryResponseMessageHandler extends SIPRequestProcessorParent
|
|||||||
presetQuerySipReqList.add(presetQuerySipReq);
|
presetQuerySipReqList.add(presetQuerySipReq);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// if (presetQuerySipReqList.size() == sumNum) {
|
||||||
|
// responseMessageHandler.handMessageEvent(rootElement, presetQuerySipReqList);
|
||||||
|
// }else {
|
||||||
|
// String sn = getText(element, "SN");
|
||||||
|
// addCatch(cmdType + "_" + sn, rootElement, presetQuerySipReqList);
|
||||||
|
// }
|
||||||
String sn = getText(element, "SN");
|
String sn = getText(element, "SN");
|
||||||
addCatch(cmdType + "_" + sn, num, rootElement, presetQuerySipReqList);
|
addCatch(cmdType + "_" + sn, sumNum, rootElement, presetQuerySipReqList);
|
||||||
try {
|
try {
|
||||||
responseAck(request, Response.OK);
|
responseAck(request, Response.OK);
|
||||||
} catch (InvalidArgumentException | ParseException | SipException e) {
|
} catch (InvalidArgumentException | ParseException | SipException e) {
|
||||||
|
|||||||
@ -499,6 +499,6 @@ create table IF NOT EXISTS wvp_jt_channel (
|
|||||||
name character varying(255),
|
name character varying(255),
|
||||||
update_time character varying(50) not null,
|
update_time character varying(50) not null,
|
||||||
create_time character varying(50) not null,
|
create_time character varying(50) not null,
|
||||||
constraint uk_jt_channel_id_device_id unique (terminal_db_id, channel_id)
|
constraint uk_jt_device_id_device_id unique (terminal_db_id, channel_id)
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
@ -499,6 +499,6 @@ create table IF NOT EXISTS wvp_jt_channel (
|
|||||||
name character varying(255),
|
name character varying(255),
|
||||||
update_time character varying(50) not null,
|
update_time character varying(50) not null,
|
||||||
create_time character varying(50) not null,
|
create_time character varying(50) not null,
|
||||||
constraint uk_jt_channel_id_device_id unique (terminal_db_id, channel_id)
|
constraint uk_jt_device_id_device_id unique (terminal_db_id, channel_id)
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
@ -32,7 +32,7 @@ create table IF NOT EXISTS wvp_jt_channel (
|
|||||||
name character varying(255),
|
name character varying(255),
|
||||||
update_time character varying(50) not null,
|
update_time character varying(50) not null,
|
||||||
create_time character varying(50) not null,
|
create_time character varying(50) not null,
|
||||||
constraint uk_jt_channel_id_device_id unique (terminal_db_id, channel_id)
|
constraint uk_jt_device_id_device_id unique (terminal_db_id, channel_id)
|
||||||
);
|
);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
@ -31,7 +31,7 @@ create table IF NOT EXISTS wvp_jt_channel (
|
|||||||
name character varying(255),
|
name character varying(255),
|
||||||
update_time character varying(50) not null,
|
update_time character varying(50) not null,
|
||||||
create_time character varying(50) not null,
|
create_time character varying(50) not null,
|
||||||
constraint uk_jt_channel_id_device_id unique (terminal_db_id, channel_id)
|
constraint uk_jt_device_id_device_id unique (terminal_db_id, channel_id)
|
||||||
);
|
);
|
||||||
|
|
||||||
ALTER table wvp_media_server ADD COLUMN IF NOT EXISTS jtt_proxy_port integer;
|
ALTER table wvp_media_server ADD COLUMN IF NOT EXISTS jtt_proxy_port integer;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user