Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0

panlinlin

2021-01-12 b6137471535fc88ba3b2a9e8beec9bb01850f4b3

Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0

 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java

@@ -526,7 +526,10 @@
            Pattern p = Pattern.compile("(\\d+\\.\\d+\\.\\d+\\.\\d+)\\:(\\d+)");

            Matcher matcher = p.matcher(vh);

            if (matcher.find()) {

                byeURI.setHost(matcher.group(1));

                String ip = matcher.group(1);

                byeURI.setHost(ip);

                String port = matcher.group(2);

                byeURI.setPort(Integer.parseInt(port));

            }

            ViaHeader viaHeader = (ViaHeader) byeRequest.getHeader(ViaHeader.NAME);

            String protocol = viaHeader.getTransport().toUpperCase();


 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java

@@ -342,7 +342,7 @@
        try {

            // 回复200 OK

            responseAck(evt);

            String seqNo = String.valueOf(System.currentTimeMillis());

            String uuid = UUID.randomUUID().toString().replace("-", "");

            RecordInfo recordInfo = new RecordInfo();

            Element rootElement = getRootElement(evt);

            Element deviceIdElement = rootElement.element("DeviceID");

@@ -398,7 +398,7 @@
                    // 为防止连续请求该设备的录像数据，返回数据错乱，特增加sn进行区分

                    String cacheKey = CACHE_RECORDINFO_KEY + deviceId + sn;



                    redis.set(cacheKey + "_" + seqNo, recordList, 90);

                    redis.set(cacheKey + "_" + uuid, recordList, 90);

                    List<Object> cacheKeys = redis.scan(cacheKey + "_*");

                    List<RecordItem> totalRecordList = new ArrayList<RecordItem>();

                    for (int i = 0; i < cacheKeys.size(); i++) {