添加分页

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resources/mapper/warning/McbWarningMapper.xml

@@ -159,7 +159,7 @@
         </where>
         ORDER BY
             log.CREATE_DATE DESC
-        LIMIT #{start}, #{offset}
+        LIMIT #{start}, #{size}
     </select>
 
     <select id="queryWarningCount" resultType="java.lang.Long">

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/mcbwarningmapper/McbWarningMapper.java

@@ -36,7 +36,7 @@ public interface McbWarningMapper extends BaseMapper {
      */
     List<Map<String, Object>> queryWarningList(
             @Param("start") Long start,
-            @Param("offset") Long offset,
+            @Param("size") Long size,
             @Param("projectOrgCodes") List<String> projectOrgCodes,
             @Param("processingStatus") Integer processingStatus,
             @Param("eventLevel") String eventLevel,

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/McbWarningServiceImpl.java

@@ -77,12 +77,12 @@ public class McbWarningServiceImpl implements IMcbWarningService {
 	public Page<Map<String, Object>> queryWarningPage(Page<Map<String, Object>> page, Integer processingStatus,
 			String eventLevel, String createDate,String startTime,String endTime, String warningSourceType,String objectName, String overView) {
 		List<String> projectOrgCodes = this.getProjectOrgCodes();
-		long start = page.getCurrent() - 1;
-		long offset = page.getSize() * page.getCurrent();
+		long start = (page.getCurrent() - 1) * page.getSize();
+		long size = page.getSize();
 		if (projectOrgCodes.isEmpty()) {
 			projectOrgCodes.add("NULL");
 		}
-		List<Map<String, Object>> records = mcbWarningMapper.queryWarningList(start, offset, projectOrgCodes,
+		List<Map<String, Object>> records = mcbWarningMapper.queryWarningList(start, size, projectOrgCodes,
 				processingStatus, eventLevel, createDate,startTime,endTime, warningSourceType,objectName, overView);
 		Long total = mcbWarningMapper.queryWarningCount(projectOrgCodes, processingStatus, eventLevel, createDate,startTime,endTime,
 				warningSourceType,objectName, overView);