分页修改

fiveep-controller/src/main/java/com/bizmatics/controller/web/DeviceAnalogVariableListController.java

@@ -93,19 +93,19 @@ public class DeviceAnalogVariableListController {
         return ApiResult.success(deviceAnalogVariableListService.variableListone(deviceAnalogVariableListVo));
     }
 
-    /**
-     * 监控设备-变量列表-新增
-     *
-     * @param deviceAnalogVariableListId 变量列表ID 英文逗号隔开
-     * @param monitoringEquipmentId      监控设备ID
-     * @return
-     */
-    @GetMapping("variableListAddOne")
-    public ApiResult<Void> variableListAddOne(@RequestParam String deviceAnalogVariableListId,
-                                              @RequestParam Integer monitoringEquipmentId) {
-        deviceAnalogVariableListService.variableListAddOne(deviceAnalogVariableListId, monitoringEquipmentId);
-        return ApiResult.success();
-    }
+//    /**
+//     * 监控设备-变量列表-新增
+//     *
+//     * @param deviceAnalogVariableListId 变量列表ID 英文逗号隔开
+//     * @param monitoringEquipmentId      监控设备ID
+//     * @return
+//     */
+//    @GetMapping("variableListAddOne")
+//    public ApiResult<Void> variableListAddOne(@RequestParam String deviceAnalogVariableListId,
+//                                              @RequestParam Integer monitoringEquipmentId) {
+//        deviceAnalogVariableListService.variableListAddOne(deviceAnalogVariableListId, monitoringEquipmentId);
+//        return ApiResult.success();
+//    }
 
     /**
      * 站点管理-变量列表-（监控设备为零）变量下拉框

fiveep-controller/src/main/java/com/bizmatics/controller/web/DeviceController.java

@@ -156,8 +156,8 @@ public class DeviceController {
     @GetMapping("videoMonitoringDeviceList")
     public ApiResult<CommonPage<Device>> videoMonitoringDeviceList(@RequestParam Integer siteId,
                                                                    @RequestParam(required = false) String deviceName,
-                                                                   @RequestParam(value = "size", required = false, defaultValue = "1") Integer size,
-                                                                   @RequestParam(value = "current", required = false, defaultValue = "10") Integer current,
+                                                                   @RequestParam(value = "size", required = false, defaultValue = "10") Integer size,
+                                                                   @RequestParam(value = "current", required = false, defaultValue = "2") Integer current,
                                                                    @RequestParam(value = "deviceType", required = false, defaultValue = "2") Integer deviceType
     ) {
         return ApiResult.success(deviceService.videoMonitoringDeviceList(deviceName, deviceType, siteId, size, current));

fiveep-service/src/main/java/com/bizmatics/service/impl/DeviceServiceImpl.java

@@ -211,7 +211,7 @@ public class DeviceServiceImpl extends AbstractCrudService<DeviceMapper, Device>
 
     @Override
     public CommonPage<Device> videoMonitoringDeviceList(String deviceName, Integer deviceType, Integer siteId, Integer size, Integer current) {
-        IPage<Device> page = new Page<Device>(size, current);
+        IPage<Device> page = new Page<Device>(current,size );
         LambdaQueryWrapper<Device> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(Device::getSiteId, siteId).eq(Device::getEnable, 1);
         if (deviceType != null && deviceType != 0) {
@@ -223,7 +223,7 @@ public class DeviceServiceImpl extends AbstractCrudService<DeviceMapper, Device>
 
         page = this.page(page, queryWrapper);
         this.ToCommonPage(page);
-        return new CommonPage<>(page.getRecords(), page.getTotal(), page.getCurrent(), page.getSize());
+        return new CommonPage<>(page.getRecords(), page.getTotal(), page.getSize(),page.getCurrent() );
     }
 
     @Override