修复单通道设备编号一致时的判断
This commit is contained in:
@@ -23,7 +23,6 @@ import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommander;
|
|||||||
import com.genersoft.iot.vmp.gb28181.utils.SipUtils;
|
import com.genersoft.iot.vmp.gb28181.utils.SipUtils;
|
||||||
import com.genersoft.iot.vmp.service.bean.ErrorCallback;
|
import com.genersoft.iot.vmp.service.bean.ErrorCallback;
|
||||||
import com.genersoft.iot.vmp.service.redisMsg.IRedisRpcPlayService;
|
import com.genersoft.iot.vmp.service.redisMsg.IRedisRpcPlayService;
|
||||||
import com.genersoft.iot.vmp.service.bean.ErrorCallback;
|
|
||||||
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
|
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
|
||||||
import com.genersoft.iot.vmp.utils.DateUtil;
|
import com.genersoft.iot.vmp.utils.DateUtil;
|
||||||
import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
|
import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
|
||||||
@@ -41,9 +40,6 @@ import org.springframework.util.Assert;
|
|||||||
import org.springframework.util.CollectionUtils;
|
import org.springframework.util.CollectionUtils;
|
||||||
import org.springframework.util.ObjectUtils;
|
import org.springframework.util.ObjectUtils;
|
||||||
|
|
||||||
import javax.sip.InvalidArgumentException;
|
|
||||||
import javax.sip.SipException;
|
|
||||||
import java.text.ParseException;
|
|
||||||
import javax.sip.InvalidArgumentException;
|
import javax.sip.InvalidArgumentException;
|
||||||
import javax.sip.SipException;
|
import javax.sip.SipException;
|
||||||
import javax.sip.message.Response;
|
import javax.sip.message.Response;
|
||||||
@@ -442,7 +438,7 @@ public class DeviceChannelServiceImpl implements IDeviceChannelService {
|
|||||||
deviceMobilePositionMapper.insertNewPosition(mobilePosition);
|
deviceMobilePositionMapper.insertNewPosition(mobilePosition);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (deviceChannel.getDeviceId().equals(deviceChannel.getDeviceId())) {
|
if (deviceChannel.getDeviceId().equals(device.getDeviceId())) {
|
||||||
deviceChannel.setDeviceId(null);
|
deviceChannel.setDeviceId(null);
|
||||||
}
|
}
|
||||||
if (deviceChannel.getGpsTime() == null) {
|
if (deviceChannel.getGpsTime() == null) {
|
||||||
|
|||||||
Reference in New Issue
Block a user