From 35b0425e221afdcd201c31cb34dc0761660f1dd3 Mon Sep 17 00:00:00 2001
From: hsc <2189661656@qq.com>
Date: Mon, 21 Jul 2025 16:21:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BE=9B=E7=BA=A2=E5=A4=96=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E8=8E=B7=E5=8F=96=E6=91=84=E5=83=8F=E5=A4=B4=E7=BA=A2?=
 =?UTF-8?q?=E5=A4=96=E6=B5=8B=E6=B8=A9=E8=A7=84=E5=88=99=E6=B8=A9=E5=BA=A6?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/inspect/nvr/controller/CameraController.java   | 10 ++++++++++
 .../inspect/nvr/service/impl/IvsCameraServiceImpl.java |  4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)

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");
         }