From e0987447f90913c7446b6342b2d6d3449b694ffb Mon Sep 17 00:00:00 2001 From: yx Date: Tue, 12 Jul 2022 13:31:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/code/camera/controller/CameraController.java | 4 ++-- ruoyi-code/src/main/java/utils/run_device_log_search.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ruoyi-code/src/main/java/com/ruoyi/code/camera/controller/CameraController.java b/ruoyi-code/src/main/java/com/ruoyi/code/camera/controller/CameraController.java index ca26f84..8cd9867 100644 --- a/ruoyi-code/src/main/java/com/ruoyi/code/camera/controller/CameraController.java +++ b/ruoyi-code/src/main/java/com/ruoyi/code/camera/controller/CameraController.java @@ -203,7 +203,7 @@ public class CameraController extends BaseController */ @RequestMapping("/setautocfg") public R setAutoCfg(@RequestBody Map params){ - String id = (String) params.get("id"); + int id = (Integer) params.get("id"); Camera camera = cameraService.getById(id); run_device_cfg cfg = new run_device_cfg(); @@ -229,7 +229,7 @@ public class CameraController extends BaseController run_device_log_search logSearch = new run_device_log_search(); List data = logSearch.logInfoSearchByTime(new NativeLong(Long.parseLong(camera.getLoginId())), startTime, endTime); - System.out.println(data); + return R.ok().put("data",data); } diff --git a/ruoyi-code/src/main/java/utils/run_device_log_search.java b/ruoyi-code/src/main/java/utils/run_device_log_search.java index 8d1c4e6..204c907 100644 --- a/ruoyi-code/src/main/java/utils/run_device_log_search.java +++ b/ruoyi-code/src/main/java/utils/run_device_log_search.java @@ -459,7 +459,7 @@ public class run_device_log_search implements ActionListener { String cClientType = DataUtils.sdk_data_byteArrayToString(stuLogInfo.stuLogDetail.cClientType, GlobalTool.getEncodeType()); logInfo.setCClientType(cClientType); - System.out.println(cClientType); + logInfoList.add(logInfo); }