diff --git a/src/main/java/com/inspect/nvr/service/impl/IvsCameraServiceImpl.java b/src/main/java/com/inspect/nvr/service/impl/IvsCameraServiceImpl.java index ec04d0f..20a7af1 100644 --- a/src/main/java/com/inspect/nvr/service/impl/IvsCameraServiceImpl.java +++ b/src/main/java/com/inspect/nvr/service/impl/IvsCameraServiceImpl.java @@ -80,12 +80,34 @@ public class IvsCameraServiceImpl implements IvsCameraService { Camera camera = new Camera(); //赋值 - camera.setIp("192.168.1.231"); - camera.setPort(8000); - camera.setUserName("admin"); - camera.setPassword("2016.h.BD"); - camera.setChannel(11); - camera.setPointNum(210); +// camera.setIp("192.168.1.231"); +// camera.setPort(8000); +// camera.setUserName("admin"); +// camera.setPassword("2016.h.BD"); +// camera.setChannel(11); +// camera.setPointNum(210); + + String ip = "192.168.1.231"; + int port = 8000; + int channel = 11; + int pointNum = 210; + String username = "admin"; + String password = "2016.h.BD"; + String[] splitArray = param.getAddress().split(":"); + if (splitArray.length == 4) { + log.info("PTZ_CONTROL CORRECT CONFIG"); + ip = splitArray[0]; + port = Integer.parseInt(splitArray[1]); + channel = Integer.parseInt(splitArray[2]); + pointNum = Integer.parseInt(splitArray[3]); + } + + camera.setIp(ip); + camera.setPort(port); + camera.setUserName(username); + camera.setPassword(password); + camera.setChannel(channel); + camera.setPointNum(pointNum); lUserID = (Integer) redisService.redisTemplate.opsForValue().get(camera.getIp() + "_userId"); diff --git a/src/main/java/com/inspect/nvr/utils/StringHexConverter.java b/src/main/java/com/inspect/nvr/utils/StringHexConverter.java index 0b17d44..be9569f 100644 --- a/src/main/java/com/inspect/nvr/utils/StringHexConverter.java +++ b/src/main/java/com/inspect/nvr/utils/StringHexConverter.java @@ -25,4 +25,10 @@ public class StringHexConverter { } return new String(bytes, StandardCharsets.UTF_8); } + + public static void main(String[] args) { + final String rawString = "3139322e3136382e312e3233313a383030303a31313a3231303a61646d696e3a323031362e682e4244"; + final String hex = fromHex(rawString); + log.info(hex); + } }