Merge branch 'master' of http://81.69.34.200:3000/467010279/water-monitor-api

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<String, Object> 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<LogInfo> data = logSearch.logInfoSearchByTime(new NativeLong(Long.parseLong(camera.getLoginId())), startTime, endTime);
-        System.out.println(data);
+
         return R.ok().put("data",data);
 
     }

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