Merge branch 'master' of http://git.ht-atia.cn/qinyanlei/inspect-nvr

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

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

@@ -78,14 +78,14 @@ public class IvsCameraServiceImpl implements IvsCameraService {
 
         Camera camera = new Camera();
         //赋值
-        camera.setIp("192.168.1.249");
+        camera.setIp("192.168.1.231");
         camera.setPort(8000);
         camera.setUserName("admin");
-        camera.setPassword("htjc2018");
-        camera.setChannel(39);
-        camera.setPointNum(1);
+        camera.setPassword("2016.h.BD");
+        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();
@@ -94,16 +94,19 @@ 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");
         }
 
 
         //参数：登录令牌,通道号,预置位跳转,跳转的预置位码
         boolean gotoPreset = hcNetSDK.NET_DVR_PTZPreset_Other(lUserID, camera.getChannel(), HCNetSDK.GOTO_PRESET, camera.getPointNum());
         if (!gotoPreset) {
-
             log.error("海康-获取设备预置位跳转设备参数失败，错误码：" + hcNetSDK.NET_DVR_GetLastError());
 
+            return PtzControlResult.builder()
+                    .resultCode("-1")
+                    .build();
+
         } else {
             log.info("海康-成功跳转到预置位！");
         }