修改接口分页方式

src/main/java/com/sky/ioc/service/data/impl/TemplateServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.sky.ioc.entity.domain.data.Template;
+import com.sky.ioc.entity.domain.log.Log;
 import com.sky.ioc.mapper.data.TemplateMapper;
 import com.sky.ioc.service.data.TemplateService;
 import com.sky.ioc.tool.ReturnMsg;
@@ -83,8 +84,11 @@ public class TemplateServiceImpl implements TemplateService {
             queryWrapper.eq("report_type",report_type);
         }
         List<Template> lists = templateMapper.selectList(queryWrapper);
-
-        return ReturnMsg.ok(new PageInfo<>(lists));
+        ReturnMsg<Object> ok = ReturnMsg.ok();
+        PageInfo<Template> pageInfo = PageInfo.of(lists);
+        ok.setData(lists);
+        ok.setTotal(pageInfo.getTotal());
+        return ok;
     }
 
     @Override

src/main/java/com/sky/ioc/service/device/impl/DeviceMessageServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.sky.ioc.entity.domain.data.Template;
 import com.sky.ioc.entity.domain.device.DeviceMessage;
 import com.sky.ioc.mapper.device.DeviceMessageMapper;
 import com.sky.ioc.service.device.DeviceMessageService;
@@ -38,7 +39,11 @@ public class DeviceMessageServiceImpl implements DeviceMessageService {
         if(StringUtils.isNotBlank(type)){
             PageHelper.startPage(page,page_size);
             List<DeviceMessage> lists = deviceMessageMapper.selectList(new LambdaQueryWrapper<DeviceMessage>().eq(DeviceMessage::getType,type));
-            return ReturnMsg.ok(new PageInfo<>(lists));
+            ReturnMsg<Object> ok = ReturnMsg.ok();
+            PageInfo<DeviceMessage> pageInfo = PageInfo.of(lists);
+            ok.setData(lists);
+            ok.setTotal(pageInfo.getTotal());
+            return ok;
         }else{
             return ReturnMsg.fail("告警类别不能为空");
         }

src/main/java/com/sky/ioc/service/device/impl/DeviceTypeServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.sky.ioc.entity.domain.device.DeviceMessage;
 import com.sky.ioc.entity.domain.device.DeviceType;
 import com.sky.ioc.entity.domain.device.SecurityDevice;
 import com.sky.ioc.mapper.device.DeviceTypeMapper;
@@ -51,7 +52,11 @@ public class DeviceTypeServiceImpl implements DeviceTypeService {
         List<String> ids = typeList.stream().map(DeviceType::getDevice_ids).collect(Collectors.toList());
         List<SecurityDevice> list = securityDeviceMapper.selectList(new LambdaQueryWrapper<SecurityDevice>().in(SecurityDevice::getDevice_id,ids));
         PageHelper.startPage(page,page_size);
-        return ReturnMsg.ok(new PageInfo<>(list));
+        ReturnMsg<Object> ok = ReturnMsg.ok();
+        PageInfo<SecurityDevice> pageInfo = PageInfo.of(list);
+        ok.setData(list);
+        ok.setTotal(pageInfo.getTotal());
+        return ok;
     }
 
     @Override

src/main/java/com/sky/ioc/service/information/impl/StaffConfigurationStaffServiceImpl.java

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.sky.ioc.entity.domain.device.DeviceMessage;
 import com.sky.ioc.entity.domain.information.StaffConfigurationStaff;
 import com.sky.ioc.mapper.information.StaffConfigurationStaffMapper;
 import com.sky.ioc.service.information.StaffConfigurationStaffService;
@@ -65,7 +66,11 @@ public class StaffConfigurationStaffServiceImpl implements StaffConfigurationSta
         }else{
             PageHelper.startPage(page,page_size);
             List<StaffConfigurationStaff> lists = staffConfigurationStaffMapper.getListByConfigurationId(configuration_id);
-            return ReturnMsg.ok(new PageInfo<>(lists));
+            ReturnMsg<Object> ok = ReturnMsg.ok();
+            PageInfo<StaffConfigurationStaff> pageInfo = PageInfo.of(lists);
+            ok.setData(lists);
+            ok.setTotal(pageInfo.getTotal());
+            return ok;
         }
 
     }
@@ -77,7 +82,11 @@ public class StaffConfigurationStaffServiceImpl implements StaffConfigurationSta
         }else{
             PageHelper.startPage(page,page_size);
             List<StaffConfigurationStaff> lists = staffConfigurationStaffMapper.getHistoryListByConfigurationId(configuration_id);
-            return ReturnMsg.ok(new PageInfo<>(lists));
+            ReturnMsg<Object> ok = ReturnMsg.ok();
+            PageInfo<StaffConfigurationStaff> pageInfo = PageInfo.of(lists);
+            ok.setData(lists);
+            ok.setTotal(pageInfo.getTotal());
+            return ok;
         }
 
     }

src/main/java/com/sky/ioc/service/organization/impl/CompanyServiceImpl.java

@@ -3,6 +3,7 @@ package com.sky.ioc.service.organization.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.sky.ioc.entity.domain.device.DeviceMessage;
 import com.sky.ioc.entity.domain.organization.Company;
 import com.sky.ioc.entity.domain.organization.Department;
 import com.sky.ioc.mapper.organization.CompanyMapper;
@@ -37,7 +38,11 @@ public class CompanyServiceImpl implements CompanyService {
     public ReturnMsg getAllCompany(int page, int page_size) {
         PageHelper.startPage(page,page_size);
         List<Company> companyList = companyMapper.selectList(null);
-        return ReturnMsg.ok(new PageInfo<>(companyList));
+        ReturnMsg<Object> ok = ReturnMsg.ok();
+        PageInfo<Company> pageInfo = PageInfo.of(companyList);
+        ok.setData(companyList);
+        ok.setTotal(pageInfo.getTotal());
+        return ok;
     }
 
     @Override