From 3e0287c48199585a5c90b50bdecb54987f5e7c90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=AF=85?= <97163845@qq.com>
Date: Fri, 18 Apr 2025 11:04:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=B0=E5=B0=BC=E9=A1=B9=E7=9B=AE-=E7=BA=A2?=
 =?UTF-8?q?=E5=A4=96=E6=95=B0=E6=8D=AE=E8=8E=B7=E5=8F=96=E5=8F=8A=E8=A7=84?=
 =?UTF-8?q?=E5=88=99=E8=AE=BE=E7=BD=AE=20=E5=A2=9E=E5=8A=A0=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ivs/controller/IvsDeviceController.java   | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/inspect-ivs/src/main/java/com/inspect/ivs/controller/IvsDeviceController.java b/inspect-ivs/src/main/java/com/inspect/ivs/controller/IvsDeviceController.java
index 394703d..a494eb0 100644
--- a/inspect-ivs/src/main/java/com/inspect/ivs/controller/IvsDeviceController.java
+++ b/inspect-ivs/src/main/java/com/inspect/ivs/controller/IvsDeviceController.java
@@ -119,10 +119,10 @@ public class IvsDeviceController {
         json.put("configItem", configItem);
         System.out.println(json);
         String message = JSON.toJSONString(json);
-        String resp = ivsCommonService.sendSSLPostString(address+"/device/setdeviceconfig", message);
+        String resp = ivsCommonService.sendSSLPostString(address + "/device/setdeviceconfig", message);
         JSONObject jsonObject = JSON.parseObject(resp);
         String resultCode = jsonObject.getString("resultCode");
-        if(resultCode.equals("0")){
+        if (resultCode.equals("0")) {
             return Response.ok();
         }
         return Response.fail();
@@ -131,22 +131,30 @@ public class IvsDeviceController {
 
     /**
      * 获取红外数据
+     *
      * @param
      * @return
      * @throws Exception
      */
     @PostMapping("/temper")
-    public String temper(@RequestBody Temp temp){
+    public String temper(@RequestBody Temp temp) {
         String cameraCode = temp.getCameraCode(); //cameraCode摄像机编码
         int presetId = temp.getPresetId();  //预设位ID
         int ruleId = 12; //规则ID 暂时写死取12就行
 //        int meterType = temp.getMeterType();
-        String requestMsg =  "presetId=" + presetId+ "&" + "ruleId=" + ruleId + "&" + "meterType=" + 3;
+        String requestMsg = "presetId=" + presetId + "&" + "ruleId=" + ruleId + "&" + "meterType=" + 3;
         //发送请求
-        String resp = ivsCommonService.sendsslGetCookie(address+"/device/radiometry-temper/"+cameraCode, requestMsg, "UTF-8");
+        String resp = ivsCommonService.sendsslGetCookie(address + "/device/radiometry-temper/" + cameraCode, requestMsg, "UTF-8");
+        log.info( "获取红外温度: {}", resp);
         JSONObject jsonObject = JSON.parseObject(resp);
         String resultCode = jsonObject.getString("resultCode");
-       return "0";
+        String temperMax = "";
+        if (resultCode.equals("0")) {
+            JSONObject  radiometryInfo = (JSONObject) jsonObject.get("radiometryInfo");
+            temperMax = radiometryInfo.getString("temperMax");
+            return temperMax;
+        }
+        return "0";
     }
 
     @GetMapping({"channelsnap"})
@@ -229,7 +237,7 @@ public class IvsDeviceController {
 
     public byte[] Ivs1800channelSnap(IvsDevChanSnapVo ivsDevChanSnapVo) throws Exception {
         log.info("++++++++++++++++++++++++执行1800channelsnap截图接口++++++++++++++++++++++++++++++");
-        String url = address+"/snapshot/manualsnapshot";
+        String url = address + "/snapshot/manualsnapshot";
         Map<String, Object> controlMap = new HashMap<>();
         controlMap.put("cameraCode", ivsDevChanSnapVo.getCameraCode());
         String requestMsg = JSON.toJSONString(controlMap);