Commit d94135c9cd8b12fc511055af4398ad3a584a44d6
Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
Showing
4 changed files
with
9 additions
and
7 deletions
.gitignore
| ... | ... | @@ -9,7 +9,7 @@ |
| 9 | 9 | |
| 10 | 10 | # Mobile Tools for Java (J2ME) |
| 11 | 11 | .mtj.tmp/ |
| 12 | - | |
| 12 | +src/main/resources/application-*.yml | |
| 13 | 13 | # Package Files # |
| 14 | 14 | #*.jar |
| 15 | 15 | *.war |
| ... | ... | @@ -18,7 +18,7 @@ |
| 18 | 18 | *.zip |
| 19 | 19 | *.tar.gz |
| 20 | 20 | *.rar |
| 21 | - | |
| 21 | +*.iml | |
| 22 | 22 | # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml |
| 23 | 23 | hs_err_pid* |
| 24 | 24 | /.idea/* | ... | ... |
src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java
| ... | ... | @@ -121,7 +121,9 @@ public class SipLayer implements SipListener { |
| 121 | 121 | logger.debug(evt.getRequest().toString()); |
| 122 | 122 | // 由于jainsip是单线程程序，为提高性能并发处理 |
| 123 | 123 | processThreadPool.execute(() -> { |
| 124 | - processorFactory.createRequestProcessor(evt).process(); | |
| 124 | + if (processorFactory != null) { | |
| 125 | + processorFactory.createRequestProcessor(evt).process(); | |
| 126 | + } | |
| 125 | 127 | }); |
| 126 | 128 | } |
| 127 | 129 | ... | ... |
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
| ... | ... | @@ -119,7 +119,7 @@ public class VideoManagerStoragerImpl implements IVideoManagerStorager { |
| 119 | 119 | @Override |
| 120 | 120 | public PageInfo queryChannelsByDeviceId(String deviceId, String query, Boolean hasSubChannel, Boolean online, int page, int count) { |
| 121 | 121 | // 获取到所有正在播放的流 |
| 122 | - PageHelper.startPage(page, count); | |
| 122 | + PageHelper.startPage(page+1, count); | |
| 123 | 123 | List<DeviceChannel> all = deviceChannelMapper.queryChannelsByDeviceId(deviceId, null, query, hasSubChannel, online); |
| 124 | 124 | return new PageInfo<>(all); |
| 125 | 125 | } |
| ... | ... | @@ -131,7 +131,7 @@ public class VideoManagerStoragerImpl implements IVideoManagerStorager { |
| 131 | 131 | |
| 132 | 132 | @Override |
| 133 | 133 | public PageInfo<DeviceChannel> querySubChannels(String deviceId, String parentChannelId, String query, Boolean hasSubChannel, String online, int page, int count) { |
| 134 | - PageHelper.startPage(page, count); | |
| 134 | + PageHelper.startPage(page+1, count); | |
| 135 | 135 | List<DeviceChannel> all = deviceChannelMapper.queryChannelsByDeviceId(deviceId, parentChannelId, null, null, null); |
| 136 | 136 | return new PageInfo<>(all); |
| 137 | 137 | } |
| ... | ... | @@ -151,7 +151,7 @@ public class VideoManagerStoragerImpl implements IVideoManagerStorager { |
| 151 | 151 | */ |
| 152 | 152 | @Override |
| 153 | 153 | public PageInfo<Device> queryVideoDeviceList(int page, int count) { |
| 154 | - PageHelper.startPage(page, count); | |
| 154 | + PageHelper.startPage(page+1, count); | |
| 155 | 155 | List<Device> all = deviceMapper.getDevices(); |
| 156 | 156 | return new PageInfo<>(all); |
| 157 | 157 | } | ... | ... |
web_src/src/components/channelList.vue