guzijian / wvp-GB28181-pro · Commits

Commit b16923d175812707e2e6db5f1ebfc7c6a7fc39ab

Authored by 648540858
1 parent cefdce5e

优化报警时间

Inline Side-by-side
Showing 2 changed files with 3 additions and 4 deletions
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
  View file @b16923d
@@ -29,7 +29,6 @@ import org.springframework.beans.factory.annotation.Autowired; @@ -29,7 +29,6 @@ import org.springframework.beans.factory.annotation.Autowired;
29 import org.springframework.context.annotation.DependsOn; 29 import org.springframework.context.annotation.DependsOn;
30 import org.springframework.stereotype.Component; 30 import org.springframework.stereotype.Component;
31 import org.springframework.util.ObjectUtils; 31 import org.springframework.util.ObjectUtils;
32 -import org.springframework.util.StringUtils;  
33 32
34 import javax.sip.InvalidArgumentException; 33 import javax.sip.InvalidArgumentException;
35 import javax.sip.ResponseEvent; 34 import javax.sip.ResponseEvent;
@@ -1389,7 +1388,7 @@ public class SIPCommander implements ISIPCommander { @@ -1389,7 +1388,7 @@ public class SIPCommander implements ISIPCommander {
1389 deviceStatusXml.append("<DeviceID>" + deviceAlarm.getChannelId() + "</DeviceID>\r\n"); 1388 deviceStatusXml.append("<DeviceID>" + deviceAlarm.getChannelId() + "</DeviceID>\r\n");
1390 deviceStatusXml.append("<AlarmPriority>" + deviceAlarm.getAlarmPriority() + "</AlarmPriority>\r\n"); 1389 deviceStatusXml.append("<AlarmPriority>" + deviceAlarm.getAlarmPriority() + "</AlarmPriority>\r\n");
1391 deviceStatusXml.append("<AlarmMethod>" + deviceAlarm.getAlarmMethod() + "</AlarmMethod>\r\n"); 1390 deviceStatusXml.append("<AlarmMethod>" + deviceAlarm.getAlarmMethod() + "</AlarmMethod>\r\n");
1392 - deviceStatusXml.append("<AlarmTime>" + deviceAlarm.getAlarmTime() + "</AlarmTime>\r\n"); 1391 + deviceStatusXml.append("<AlarmTime>" + DateUtil.yyyy_MM_dd_HH_mm_ssToISO8601(deviceAlarm.getAlarmTime()) + "</AlarmTime>\r\n");
1393 deviceStatusXml.append("<AlarmDescription>" + deviceAlarm.getAlarmDescription() + "</AlarmDescription>\r\n"); 1392 deviceStatusXml.append("<AlarmDescription>" + deviceAlarm.getAlarmDescription() + "</AlarmDescription>\r\n");
1394 deviceStatusXml.append("<Longitude>" + deviceAlarm.getLongitude() + "</Longitude>\r\n"); 1393 deviceStatusXml.append("<Longitude>" + deviceAlarm.getLongitude() + "</Longitude>\r\n");
1395 deviceStatusXml.append("<Latitude>" + deviceAlarm.getLatitude() + "</Latitude>\r\n"); 1394 deviceStatusXml.append("<Latitude>" + deviceAlarm.getLatitude() + "</Latitude>\r\n");
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
  View file @b16923d
@@ -413,8 +413,8 @@ public class SIPCommanderFroPlatform implements ISIPCommanderForPlatform { @@ -413,8 +413,8 @@ public class SIPCommanderFroPlatform implements ISIPCommanderForPlatform {
413 .append("<DeviceID>" + deviceAlarm.getChannelId() + "</DeviceID>\r\n") 413 .append("<DeviceID>" + deviceAlarm.getChannelId() + "</DeviceID>\r\n")
414 .append("<AlarmPriority>" + deviceAlarm.getAlarmPriority() + "</AlarmPriority>\r\n") 414 .append("<AlarmPriority>" + deviceAlarm.getAlarmPriority() + "</AlarmPriority>\r\n")
415 .append("<AlarmMethod>" + deviceAlarm.getAlarmMethod() + "</AlarmMethod>\r\n") 415 .append("<AlarmMethod>" + deviceAlarm.getAlarmMethod() + "</AlarmMethod>\r\n")
416 - .append("<AlarmTime>" + deviceAlarm.getAlarmTime() + "</AlarmTime>\r\n")  
417 - .append("<AlarmDescription>" + DateUtil.yyyy_MM_dd_HH_mm_ssToISO8601(deviceAlarm.getAlarmDescription()) + "</AlarmDescription>\r\n") 416 + .append("<AlarmTime>" + DateUtil.yyyy_MM_dd_HH_mm_ssToISO8601(deviceAlarm.getAlarmTime()) + "</AlarmTime>\r\n")
  417 + .append("<AlarmDescription>" + deviceAlarm.getAlarmDescription() + "</AlarmDescription>\r\n")
418 .append("<Longitude>" + deviceAlarm.getLongitude() + "</Longitude>\r\n") 418 .append("<Longitude>" + deviceAlarm.getLongitude() + "</Longitude>\r\n")
419 .append("<Latitude>" + deviceAlarm.getLatitude() + "</Latitude>\r\n") 419 .append("<Latitude>" + deviceAlarm.getLatitude() + "</Latitude>\r\n")
420 .append("<info>\r\n") 420 .append("<info>\r\n")