分页APIbug修改

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/EmergencyTaskController.java

@@ -2,7 +2,7 @@ package com.yeejoin.amos.fas.business.controller;
 
 
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.data.domain.Page;
 import com.yeejoin.amos.fas.business.dao.mapper.EmergencyTaskMapper;
 import com.yeejoin.amos.fas.business.dao.mapper.EmergencyTaskRoleMapper;
 import com.yeejoin.amos.fas.business.feign.JcsFeign;

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/EmergencyTaskServiceImpl.java

@@ -2,7 +2,6 @@ package com.yeejoin.amos.fas.business.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.fas.business.action.model.ContingencyRo;
 import com.yeejoin.amos.fas.business.action.mq.WebMqttComponent;
 import com.yeejoin.amos.fas.business.dao.mapper.EmergencyTaskMapper;
@@ -24,6 +23,8 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateFormatUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
@@ -79,10 +80,8 @@ public class EmergencyTaskServiceImpl implements IEmergencyTaskService {
     public Page<EmergencyTaskContent> list(Long obligationId, String planType, CommonPageable pageable) {
         int total = emergencyTaskMapper.getEmergencyTaskCount(obligationId, planType);
         List<EmergencyTaskContent> emergencyTaskList = emergencyTaskMapper.getEmergencyTaskList(obligationId, pageable.getOffset(), pageable.getPageSize(), planType);
-        Page<EmergencyTaskContent> emergencyTaskRolePage = new Page<>(pageable.getPageNumber(), pageable.getPageSize());
-        emergencyTaskRolePage.setRecords(emergencyTaskList);
-        emergencyTaskRolePage.setTotal(total);
-        return emergencyTaskRolePage;
+        org.springframework.data.domain.Page<EmergencyTaskContent> result = new PageImpl<>(emergencyTaskList, pageable, total);
+        return result;
 
     }
 

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/intfc/IEmergencyTaskService.java

 package com.yeejoin.amos.fas.business.service.intfc;
 
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.fas.business.vo.EmergencyTaskContentVo;
 import com.yeejoin.amos.fas.core.common.request.CommonPageable;
 import com.yeejoin.amos.fas.dao.entity.EmergencyRelation;
 import com.yeejoin.amos.fas.dao.entity.EmergencyRelationTree;
 import com.yeejoin.amos.fas.dao.entity.EmergencyTaskContent;
+import org.springframework.data.domain.Page;
 
 import java.util.List;
 

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_emergency_task.xml

@@ -31,7 +31,7 @@
         FROM
             c_emergency_task_content
         <where>
-            <if test="_parameter != null ">
+            <if test="obligationId != null ">
                 obligation_id = #{obligationId}
             </if>
             <if test="planType != null ">