Merge remote-tracking branch 'origin/develop' into develop

gather-app/src/main/java/com/ruoyi/business/controller/BigScreenController.java

@@ -304,7 +304,7 @@ public class BigScreenController extends BaseController {
 
     @PostMapping("/realTimeAlarmSituation")
     @ApiOperation("实时警情")
-    public AjaxResult realTimeAlarmSituation(@ApiParam @Param("时间") @RequestParam String time) {
+    public AjaxResult realTimeAlarmSituation(@ApiParam("时间") @RequestParam String time) {
         try {
             if (0 == NumKit.checkInt(time)) {
                 time = "30";

gather-app/src/main/java/com/ruoyi/business/controller/PerceptionDeviceController.java

@@ -103,7 +103,7 @@ public class PerceptionDeviceController extends BaseController {
 
     @GetMapping("/allHumanTrafficStatistics")
     @ApiOperation("人流量统计（前7天）(全数)")
-    public AjaxResult allHumanTrafficStatistics(TransitUserRecord transitUserRecord, DevopsDeviceInfo devopsDeviceInfo) {
+    public AjaxResult allHumanTrafficStatistics(TransitUserRecord transitUserRecord) {
         try {
             // 获取当前日期
             LocalDate currentDate = LocalDate.now();
@@ -113,7 +113,7 @@ public class PerceptionDeviceController extends BaseController {
             for (int i = 1; i <= 7; i++) {
                 LocalDate date = currentDate.minusDays(i);
                 // 构造查询条件
-                QueryWrapper<DevopsDeviceInfo> deviceInfoQueryWrapper = new QueryWrapper<>(devopsDeviceInfo);
+                QueryWrapper<DevopsDeviceInfo> deviceInfoQueryWrapper = new QueryWrapper<>();
                 deviceInfoQueryWrapper.eq("parent_monitoring_type", 1);
                 List<DevopsDeviceInfo> list = devopsDeviceInfoService.list(deviceInfoQueryWrapper);
 
@@ -139,7 +139,7 @@ public class PerceptionDeviceController extends BaseController {
     }
     @GetMapping("/allVehicleTrafficStatistics")
     @ApiOperation("车流量统计（前7天）(全数)")
-    public AjaxResult allVehicleTrafficStatistics(TransitVehicleRecord transitVehicleRecord,DevopsDeviceInfo devopsDeviceInfo) {
+    public AjaxResult allVehicleTrafficStatistics(TransitVehicleRecord transitVehicleRecord) {
         try {
             // 获取当前日期
             LocalDate currentDate = LocalDate.now();
@@ -149,7 +149,7 @@ public class PerceptionDeviceController extends BaseController {
             for (int i = 1; i <= 7; i++) {
                 LocalDate date = currentDate.minusDays(i);
                 // 构造查询条件
-                QueryWrapper<DevopsDeviceInfo> deviceInfoQueryWrapper = new QueryWrapper<>(devopsDeviceInfo);
+                QueryWrapper<DevopsDeviceInfo> deviceInfoQueryWrapper = new QueryWrapper<>();
                 deviceInfoQueryWrapper.eq("parent_monitoring_type", 1);
                 List<DevopsDeviceInfo> list = devopsDeviceInfoService.list(deviceInfoQueryWrapper);