自动分页

cmc-temperature-back/cmc-monitoring/src/main/java/com/ruoyi/monitoring/controller/CmcChannelController.java

@@ -46,7 +46,7 @@ public class CmcChannelController extends BaseController {
                 if (!channel.getInfo().contains("-"))
                     channelInfoList.add(channel.getInfo());
                 else
-                    multiChannelInfoList.add(channel.getInfo().split("-")[0]);
+                    multiChannelInfoList.add(channel.getInfo().split("-")[0] + "-");
             }
         });
         channelInfoList.addAll(multiChannelInfoList.stream().distinct().collect(Collectors.toList()));

cmc-temperature-back/cmc-monitoring/src/main/java/com/ruoyi/monitoring/controller/CmcTemperatureController.java

@@ -1,7 +1,8 @@
 package com.ruoyi.monitoring.controller;
 
-import com.mybatisflex.core.query.QueryTable;
+import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryWrapper;
+import com.ruoyi.common.web.domain.PageData;
 import com.ruoyi.monitoring.domain.CmcChannel;
 import com.ruoyi.monitoring.domain.CmcTemperature;
 import com.ruoyi.monitoring.service.ICmcTemperatureService;
@@ -50,18 +51,19 @@ public class CmcTemperatureController extends BaseController {
      */
     @Get
     @Mapping("listByInfo")
-    public List<CmcTemperature> listByInfo(CmcTemperature cmcTemperature, String Info, Integer pageSize, Integer pageNum) {
-        QueryWrapper qw = getQW(cmcTemperature, Info, pageSize, pageNum);
-        return cmcTemperatureService.list(qw);
+    public PageData<CmcTemperature> listByInfo(Page<CmcTemperature> page, CmcTemperature cmcTemperature, String Info) {
+        QueryWrapper qw = getQW(cmcTemperature, Info);
+        Page<CmcTemperature> result = cmcTemperatureService.page(page, qw);
+        return getPageData(result);
     }
 
-    private QueryWrapper getQW(CmcTemperature cmcTemperature, String Info, Integer pageSize, Integer pageNum) {
+    private QueryWrapper getQW(CmcTemperature cmcTemperature, String Info) {
         QueryWrapper qw = QueryWrapper.create();
         qw.select(CmcTemperature::getId, CmcTemperature::getGroupNo, CmcTemperature::getSensorNo, CmcTemperature::getData, CmcTemperature::getVolt, CmcTemperature::getCSQ, CmcTemperature::getDatetime)
             .from(CmcTemperature.class)
             .leftJoin(CmcChannel.class)
             .on(CmcChannel::getSensorNo, CmcTemperature::getSensorNo)
-            .where(CmcChannel::getInfo).eq(Info)
+            .where(CmcChannel::getInfo).like(Info)
             .and(CmcTemperature::getId).eq(cmcTemperature.getId())
             .and(CmcTemperature::getGroupNo).eq(cmcTemperature.getGroupNo())
             .and(CmcTemperature::getSensorNo).eq(cmcTemperature.getSensorNo())
@@ -70,7 +72,8 @@ public class CmcTemperatureController extends BaseController {
             .and(CmcTemperature::getCSQ).eq(cmcTemperature.getCSQ())
             .and(CmcTemperature::getDatetime).ge(cmcTemperature.getStartTime())
             .and(CmcTemperature::getDatetime).le(cmcTemperature.getEndTime())
-            .orderBy(CmcTemperature::getDatetime).desc().limit((pageNum - 1) * pageSize, pageSize);
+            .orderBy(CmcTemperature::getSensorNo).desc()
+            .orderBy(CmcTemperature::getDatetime).desc();
         return qw;
     }