From a4e99a6a39284643fdf2b04dbe55212e5954973c Mon Sep 17 00:00:00 2001
From: leutu <leutu@qq.com>
Date: 星期一, 20 五月 2024 17:37:25 +0800
Subject: [PATCH] firsh

---
 src/main/java/com/skyline/electricity/controller/DeviceController.java |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/skyline/electricity/controller/DeviceController.java b/src/main/java/com/skyline/electricity/controller/DeviceController.java
index 794b6e8..cb92449 100644
--- a/src/main/java/com/skyline/electricity/controller/DeviceController.java
+++ b/src/main/java/com/skyline/electricity/controller/DeviceController.java
@@ -34,7 +34,7 @@
     OutService outService;
     @Autowired
     private ConfigInfo configInfo;
-    
+
     @RequestMapping(value = { "/getCameraEntity" }, method = { RequestMethod.POST })
     @ApiOperation("鑾峰彇鎽勫儚澶村疄浣撳垪琛�")
     @ResponseBody
@@ -55,7 +55,7 @@
         final JSONObject jsonObjectResult = JSONObject.parseObject(body);
         return jsonObjectResult.get((Object)"data");
     }
-    
+
     @RequestMapping(value = { "/getCloudplatformInfo" }, method = { RequestMethod.POST })
     @ApiOperation("鑾峰彇鎽勫儚澶翠簯鍙版搷浣滀俊鎭�")
     @ResponseBody
@@ -76,7 +76,7 @@
         final ResponseEntity<String> responseEntity = (ResponseEntity<String>)restTemplate.postForEntity(this.configInfo.getDevice_ip()+   "/restapi/iot/iotinfomgr/service/invoke/cameras/ptzControl?apikey="  + this.configInfo.getApikey(), (Object)httpEntity, (Class)String.class, new Object[0]);
         return responseEntity.getBody();
     }
-    
+
     @RequestMapping(value = { "/getPreviewUrls" }, method = { RequestMethod.POST })
     @ApiOperation("鑾峰彇鎽勫儚澶磋幏鍙栭瑙堟祦url")
     @ResponseBody
@@ -102,7 +102,7 @@
 
         return json;
     }
-    
+
     @RequestMapping(value = { "/getDoorAccessEntity" }, method = { RequestMethod.POST })
     @ApiOperation("鑾峰彇闂ㄧ瀹炰綋鍒楄〃")
     @ResponseBody
@@ -123,7 +123,7 @@
         final JSONObject jsonObjectResult = JSONObject.parseObject(body);
         return jsonObjectResult.get((Object)"data");
     }
-    
+
     @RequestMapping(value = { "/getPlaybackURLs" }, method = { RequestMethod.POST })
     @ApiOperation("鎽勫儚澶磋幏鍙栧洖鏀炬祦url")
     @ResponseBody
@@ -146,7 +146,7 @@
         final JSON json = (JSON)JSON.parse((String)responseEntity.getBody());
         return json;
     }
-    
+
     @RequestMapping(value = { "/getHistoryDoorAccess" }, method = { RequestMethod.POST })
     @ApiOperation("鑾峰彇鍘嗗彶闂ㄧ淇℃伅")
     @ResponseBody
@@ -169,7 +169,7 @@
         final JSON json = (JSON)JSON.parse((String)responseEntity.getBody());
         return json;
     }
-    
+
     @RequestMapping(value = { "/getEquipmentInfo" }, method = { RequestMethod.POST })
     @ApiOperation("璁惧淇℃伅鑾峰彇")
     @ResponseBody
@@ -182,7 +182,7 @@
         final JSON json = (JSON)JSON.parse((String)responseEntity.getBody());
         return json;
     }
-    
+
     @RequestMapping(value = { "/getReconditionInfo" }, method = { RequestMethod.POST })
     @ApiOperation("鑾峰彇璁惧鐨勬淇巻鍙�")
     @ResponseBody
@@ -195,7 +195,7 @@
         final JSON json = (JSON)JSON.parse((String)responseEntity.getBody());
         return json;
     }
-    
+
     @RequestMapping(value = { "/getDeviceKKSInfo" }, method = { RequestMethod.POST })
     @ApiOperation("鑾峰彇璁惧鐨凨KS淇℃伅")
     @ResponseBody
@@ -223,7 +223,7 @@
         map.put("list", deviceList);
         return map;
     }
-    
+
     @RequestMapping(value = { "/getDuty" }, method = { RequestMethod.POST })
     @ApiOperation("鑾峰彇褰撳�煎�奸暱")
     @ResponseBody
@@ -233,11 +233,11 @@
         final Map<String, Object> map = new HashMap<String, Object>();
         final String dzzzresponse = (String)template.getForObject(this.configInfo.getDzzzUrl(), (Class)String.class, new Object[0]);
         final JSONObject json = JSONObject.parseObject(dzzzresponse);
-        System.out.println(json.getJSONObject("data").getString("id"));
+        //System.out.println(json.getJSONObject("data").getString("id"));
         DeviceController.log.warn(dzzzresponse.toString());
         return dzzzresponse;
     }
-    
+
     @RequestMapping(value = { "/getOutPeople" }, method = { RequestMethod.GET })
     @ApiOperation("鑾峰彇澶栧寘浜哄憳")
     @ResponseBody
@@ -246,7 +246,7 @@
         DeviceController.log.warn(list.toString());
         return list;
     }
-    
+
     static {
         DeviceController.log = LoggerFactory.getLogger((Class)DeviceController.class);
     }

--
Gitblit v1.9.3