按0时开始查询，如时间不一致，取相对较小值

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

@@ -10,6 +10,8 @@ import com.ruoyi.monitoring.service.ICmcTemperatureService;
 import com.ruoyi.common.web.controller.BaseController;
 import org.noear.solon.annotation.*;
 
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -59,9 +61,50 @@ public class CmcTemperatureController extends BaseController {
         CmcChannel channel = new CmcChannel();
         channel.setInfo(Info);
         int channelSize = cmcChannelService.listChannel(channel).size();
+        page.setPageSize(page.getPageSize() * channelSize);
         QueryWrapper qw = getQW(cmcTemperature, Info);
         Page<CmcTemperature> result = cmcTemperatureService.page(page, qw);
-        return getPageData(result).total(result.getRecords().size() / channelSize);
+        List<CmcTemperature> records = result.getRecords();
+        List<CmcTemperature> temperatureList = new ArrayList<>();
+        if (records.size() > 2) {
+            long diffInMillis;
+            // 第30条与第31条数据时间差 毫秒
+            if (channelSize > 30) {
+                diffInMillis = records.get(30).getDatetime().getTime() - records.get(29).getDatetime().getTime();
+                // 时间差超过15分钟，删最后10条数据
+                if (diffInMillis / 1000 / 60 > 15)
+                    records.subList(records.size() - channelSize + 30, records.size()).clear();
+            }
+            // 第1条数据与0时时间差 毫秒
+            diffInMillis = records.get(0).getDatetime().getTime() - cmcTemperature.getStartTime().getTime();
+            if (diffInMillis / 1000 / 60 > 15)
+                records.subList(records.size() - channelSize, records.size()).clear();
+            CmcTemperature temperature = new CmcTemperature();
+            long fifteenMinutesAgoMillis = cmcTemperature.getStartTime().getTime() - (15 * 60 * 1000);
+            Date fifteenMinutesAgo = new Date(fifteenMinutesAgoMillis);
+            temperature.setStartTime(fifteenMinutesAgo);
+            temperature.setEndTime(cmcTemperature.getStartTime());
+            QueryWrapper qw1 = getQW(temperature, Info);
+            temperatureList = cmcTemperatureService.list(qw1);
+            temperatureList.addAll(records);
+            if (channelSize > 30)
+                for (int i = 0; i < temperatureList.size() - channelSize + 1; i = i + channelSize) {
+                    Date minTime = temperatureList.get(i).getDatetime();
+                    if (temperatureList.get(i + 10).getDatetime().getTime() > minTime.getTime()) {
+                        for (int j = i + 10; j < i + channelSize; j ++) {
+                            temperatureList.get(j).setDatetime(minTime);
+                        }
+                    }
+                    else {
+                        if (temperatureList.get(i + 30).getDatetime().getTime() > minTime.getTime()) {
+                            for (int j = i + 30; j < i + channelSize; j++) {
+                                temperatureList.get(j).setDatetime(minTime);
+                            }
+                        }
+                    }
+                }
+        }
+        return getPageData(temperatureList).total(temperatureList.size() / channelSize);
     }
 
     private QueryWrapper getQW(CmcTemperature cmcTemperature, String Info) {
@@ -80,8 +123,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::getSensorNo).asc()
-            .orderBy(CmcTemperature::getDatetime).desc();
+            .orderBy(CmcTemperature::getDatetime).asc()
+            .orderBy(CmcTemperature::getSensorNo).asc();
         return qw;
     }