修改地址IP取值

src/main/java/com/inspect/nvr/service/impl/IvsCameraServiceImpl.java

@@ -142,7 +142,7 @@ public class IvsCameraServiceImpl implements IvsCameraService {
 
 
         String[] addressArray = param.getAddress().split(":");
-        final String pictureUrl = "http://" + addressArray[0] + ":" + addressArray[1] + "/downloadfile?filesessionid=" + hexString;
+        final String pictureUrl = "http://" + param.getHost() + ":" + param.getPort() + "/downloadfile?filesessionid=" + hexString;
         log.info("GET_SNAPSHOT_LIST rawString: {}, hexString: {}, pictureUrl: {}", rawString, hexString, pictureUrl);
         infoList.add(
                 SnapshotInfoListResult.SnapshotInfo.builder()
@@ -190,7 +190,7 @@ public class IvsCameraServiceImpl implements IvsCameraService {
 //        camera.setPassword("2016.h.BD");
 //        camera.setChannel(11);
 
-        log.info("DOWNLOAD_FILE ip: {}, port: {}, username: {}, password: {}, channel: {}, pointName: {}",
+        log.info("DOWNLOAD_FILE host: {}, port: {}, channel: {}, pointName: {}, username: {}, password: {}",
                 cameraAddressInfos[0],
                 cameraAddressInfos[1],
                 cameraAddressInfos[2],
@@ -199,10 +199,10 @@ public class IvsCameraServiceImpl implements IvsCameraService {
                 cameraAddressInfos[5]);
         camera.setIp(cameraAddressInfos[0]);
         camera.setPort(Integer.parseInt(cameraAddressInfos[1]));
-        camera.setUserName(cameraAddressInfos[2]);
-        camera.setPassword(cameraAddressInfos[3]);
-        camera.setChannel(Integer.parseInt(cameraAddressInfos[4]));
-        camera.setPointNum(Integer.parseInt(cameraAddressInfos[5]));
+        camera.setChannel(Integer.parseInt(cameraAddressInfos[2]));
+        camera.setPointNum(Integer.parseInt(cameraAddressInfos[3]));
+        camera.setUserName(cameraAddressInfos[4]);
+        camera.setPassword(cameraAddressInfos[5]);
 
         //从redis中获取lUserID(存在时间200)
         lUserID = (Integer) redisService.redisTemplate.opsForValue().get(camera.getIp() + "_userId");