diff --git a/src/main/java/com/inspect/nvr/controller/CameraController.java b/src/main/java/com/inspect/nvr/controller/CameraController.java index 9f9f995..1dd1bd8 100644 --- a/src/main/java/com/inspect/nvr/controller/CameraController.java +++ b/src/main/java/com/inspect/nvr/controller/CameraController.java @@ -2,6 +2,8 @@ package com.inspect.nvr.controller; import com.inspect.nvr.domain.Infrared.Camera; +import com.inspect.nvr.domain.Infrared.TemperatureData; +import com.inspect.nvr.hikVision.utils.AjaxResult; import com.inspect.nvr.service.HikVisionService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -26,6 +28,14 @@ public class CameraController { return cameraService.cameraYzwHikVision(camera); } + //获取红外测温规则温度值 (需要先跳转到红外测温规则预置位) + @PostMapping("/hw/cameraHong") + @ResponseBody + public AjaxResult cameraHong(@RequestBody Camera camera) { + TemperatureData temperatureData = cameraService.StartRemote(camera); + + return AjaxResult.success().put("data", temperatureData); + } //同步相机信息 // @PostMapping("/getChannelList") // @ResponseBody 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 79fed0e..6abd618 100644 --- a/src/main/java/com/inspect/nvr/service/impl/IvsCameraServiceImpl.java +++ b/src/main/java/com/inspect/nvr/service/impl/IvsCameraServiceImpl.java @@ -66,7 +66,7 @@ public class IvsCameraServiceImpl implements IvsCameraService { camera.setChannel(4); camera.setPointNum(5); - //lUserID = (Integer) redisService.redisTemplate.opsForValue().get(camera.getIp() + "_userId"); + lUserID = (Integer) redisService.redisTemplate.opsForValue().get(camera.getIp() + "_userId"); if (ObjectUtil.isEmpty(lUserID)) { NvrInfo nvrInfo = new NvrInfo(); @@ -75,7 +75,7 @@ public class IvsCameraServiceImpl implements IvsCameraService { nvrInfo.setAccount(camera.getUserName()); nvrInfo.setPassword(camera.getPassword()); login_V40(nvrInfo); - //lUserID = (Integer) redisService.redisTemplate.opsForValue().get(camera.getIp() + "_userId"); + lUserID = (Integer) redisService.redisTemplate.opsForValue().get(camera.getIp() + "_userId"); }