guzijian / wvp-GB28181-pro · Commits

Commit 8b2b5c03ba852e7b965d208ac29d3fa64ea9ecfe

Authored by Lawrence
1 parent 24cd9158

改正xml空字段转换为数字的错误

Inline Side-by-side
Showing 1 changed file with 38 additions and 22 deletions
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java
  View file @8b2b5c0
@@ -197,45 +197,57 @@ public class MessageRequestProcessor extends SIPRequestAbstractProcessor { @@ -197,45 +197,57 @@ public class MessageRequestProcessor extends SIPRequestAbstractProcessor {
197 deviceChannel.setCivilCode(XmlUtil.getText(itemDevice, "CivilCode")); 197 deviceChannel.setCivilCode(XmlUtil.getText(itemDevice, "CivilCode"));
198 deviceChannel.setBlock(XmlUtil.getText(itemDevice, "Block")); 198 deviceChannel.setBlock(XmlUtil.getText(itemDevice, "Block"));
199 deviceChannel.setAddress(XmlUtil.getText(itemDevice, "Address")); 199 deviceChannel.setAddress(XmlUtil.getText(itemDevice, "Address"));
200 - deviceChannel.setParental(itemDevice.element("Parental") == null ? 0  
201 - : Integer.parseInt(XmlUtil.getText(itemDevice, "Parental"))); 200 + if (XmlUtil.getText(itemDevice, "Parental") == null || XmlUtil.getText(itemDevice, "Parental") == "") {
  201 + deviceChannel.setParental(0);
  202 + } else {
  203 + deviceChannel.setParental(Integer.parseInt(XmlUtil.getText(itemDevice, "Parental")));
  204 + }
202 deviceChannel.setParentId(XmlUtil.getText(itemDevice, "ParentID")); 205 deviceChannel.setParentId(XmlUtil.getText(itemDevice, "ParentID"));
203 - deviceChannel.setSafetyWay(itemDevice.element("SafetyWay") == null ? 0  
204 - : Integer.parseInt(XmlUtil.getText(itemDevice, "SafetyWay")));  
205 - deviceChannel.setRegisterWay(itemDevice.element("RegisterWay") == null ? 1  
206 - : Integer.parseInt(XmlUtil.getText(itemDevice, "RegisterWay"))); 206 + if (XmlUtil.getText(itemDevice, "SafetyWay") == null || XmlUtil.getText(itemDevice, "SafetyWay")== "") {
  207 + deviceChannel.setSafetyWay(0);
  208 + } else {
  209 + deviceChannel.setSafetyWay(Integer.parseInt(XmlUtil.getText(itemDevice, "SafetyWay")));
  210 + }
  211 + if (XmlUtil.getText(itemDevice, "RegisterWay") == null || XmlUtil.getText(itemDevice, "RegisterWay") =="") {
  212 + deviceChannel.setRegisterWay(1);
  213 + } else {
  214 + deviceChannel.setRegisterWay(Integer.parseInt(XmlUtil.getText(itemDevice, "RegisterWay")));
  215 + }
207 deviceChannel.setCertNum(XmlUtil.getText(itemDevice, "CertNum")); 216 deviceChannel.setCertNum(XmlUtil.getText(itemDevice, "CertNum"));
208 - deviceChannel.setCertifiable(itemDevice.element("Certifiable") == null ? 0  
209 - : Integer.parseInt(XmlUtil.getText(itemDevice, "Certifiable")));  
210 - deviceChannel.setErrCode(itemDevice.element("ErrCode") == null ? 0  
211 - : Integer.parseInt(XmlUtil.getText(itemDevice, "ErrCode"))); 217 + if (XmlUtil.getText(itemDevice, "Certifiable") == null || XmlUtil.getText(itemDevice, "Certifiable") == "") {
  218 + deviceChannel.setCertifiable(0);
  219 + } else {
  220 + deviceChannel.setCertifiable(Integer.parseInt(XmlUtil.getText(itemDevice, "Certifiable")));
  221 + }
  222 + if (XmlUtil.getText(itemDevice, "ErrCode") == null || XmlUtil.getText(itemDevice, "ErrCode") == "") {
  223 + deviceChannel.setErrCode(0);
  224 + } else {
  225 + deviceChannel.setErrCode(Integer.parseInt(XmlUtil.getText(itemDevice, "ErrCode")));
  226 + }
212 deviceChannel.setEndTime(XmlUtil.getText(itemDevice, "EndTime")); 227 deviceChannel.setEndTime(XmlUtil.getText(itemDevice, "EndTime"));
213 deviceChannel.setSecrecy(XmlUtil.getText(itemDevice, "Secrecy")); 228 deviceChannel.setSecrecy(XmlUtil.getText(itemDevice, "Secrecy"));
214 deviceChannel.setIpAddress(XmlUtil.getText(itemDevice, "IPAddress")); 229 deviceChannel.setIpAddress(XmlUtil.getText(itemDevice, "IPAddress"));
215 - deviceChannel.setPort(itemDevice.element("Port") == null ? 0  
216 - : Integer.parseInt(XmlUtil.getText(itemDevice, "Port"))); 230 + if (XmlUtil.getText(itemDevice, "Port") == null || XmlUtil.getText(itemDevice, "Port") =="") {
  231 + deviceChannel.setPort(0);
  232 + } else {
  233 + deviceChannel.setPort(Integer.parseInt(XmlUtil.getText(itemDevice, "Port")));
  234 + }
217 deviceChannel.setPassword(XmlUtil.getText(itemDevice, "Password")); 235 deviceChannel.setPassword(XmlUtil.getText(itemDevice, "Password"));
218 - if (itemDevice.element("Longitute")==null) { 236 + if (XmlUtil.getText(itemDevice, "Longitude") == null || XmlUtil.getText(itemDevice, "Longitude") == "") {
219 deviceChannel.setLongitude(0.00); 237 deviceChannel.setLongitude(0.00);
220 } else { 238 } else {
221 deviceChannel.setLongitude(Double.parseDouble(XmlUtil.getText(itemDevice, "Longitude"))); 239 deviceChannel.setLongitude(Double.parseDouble(XmlUtil.getText(itemDevice, "Longitude")));
222 } 240 }
223 - if (itemDevice.element("Latitute") == null) { 241 + if (XmlUtil.getText(itemDevice, "Latitude") == null || XmlUtil.getText(itemDevice, "Latitude") =="") {
224 deviceChannel.setLatitude(0.00); 242 deviceChannel.setLatitude(0.00);
225 } else { 243 } else {
226 deviceChannel.setLatitude(Double.parseDouble(XmlUtil.getText(itemDevice, "Latitude"))); 244 deviceChannel.setLatitude(Double.parseDouble(XmlUtil.getText(itemDevice, "Latitude")));
227 } 245 }
228 - if (itemDevice.element("PTZType") == null) { 246 + if (XmlUtil.getText(itemDevice, "PTZType") == null || XmlUtil.getText(itemDevice, "PTZType") == "") {
229 deviceChannel.setPTZType(0); 247 deviceChannel.setPTZType(0);
230 } else { 248 } else {
231 deviceChannel.setPTZType(Integer.parseInt(XmlUtil.getText(itemDevice, "PTZType"))); 249 deviceChannel.setPTZType(Integer.parseInt(XmlUtil.getText(itemDevice, "PTZType")));
232 } 250 }
233 - // deviceChannel.setLongitude(itemDevice.element("Longitude") == null ? 0.00  
234 - // : Double.parseDouble(XmlUtil.getText(itemDevice, "Longitude")));  
235 - // deviceChannel.setLatitude(itemDevice.element("Latitude") == null ? 0.00  
236 - // : Double.parseDouble(XmlUtil.getText(itemDevice, "Latitude")));  
237 - // deviceChannel.setPTZType(itemDevice.element("PTZType") == null ? 0  
238 - // : Integer.parseInt(XmlUtil.getText(itemDevice, "PTZType")));  
239 deviceChannel.setHasAudio(true); // 默认含有音频，播放时再检查是否有音频及是否AAC 251 deviceChannel.setHasAudio(true); // 默认含有音频，播放时再检查是否有音频及是否AAC
240 storager.updateChannel(device.getDeviceId(), deviceChannel); 252 storager.updateChannel(device.getDeviceId(), deviceChannel);
241 } 253 }
@@ -328,7 +340,11 @@ public class MessageRequestProcessor extends SIPRequestAbstractProcessor { @@ -328,7 +340,11 @@ public class MessageRequestProcessor extends SIPRequestAbstractProcessor {
328 String deviceId = deviceIdElement.getText().toString(); 340 String deviceId = deviceIdElement.getText().toString();
329 recordInfo.setDeviceId(deviceId); 341 recordInfo.setDeviceId(deviceId);
330 recordInfo.setName(XmlUtil.getText(rootElement, "Name")); 342 recordInfo.setName(XmlUtil.getText(rootElement, "Name"));
331 - recordInfo.setSumNum(Integer.parseInt(XmlUtil.getText(rootElement, "SumNum"))); 343 + if (XmlUtil.getText(rootElement, "SumNum")== null || XmlUtil.getText(rootElement, "SumNum") =="") {
  344 + recordInfo.setSumNum(0);
  345 + } else {
  346 + recordInfo.setSumNum(Integer.parseInt(XmlUtil.getText(rootElement, "SumNum")));
  347 + }
332 String sn = XmlUtil.getText(rootElement, "SN"); 348 String sn = XmlUtil.getText(rootElement, "SN");
333 Element recordListElement = rootElement.element("RecordList"); 349 Element recordListElement = rootElement.element("RecordList");
334 if (recordListElement == null || recordInfo.getSumNum() == 0) { 350 if (recordListElement == null || recordInfo.getSumNum() == 0) {