不分页查询

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

@@ -86,15 +86,14 @@ public class CmcTemperatureController extends BaseController {
             QueryWrapper qw1 = getQW(temperature, Info);
             temperatureList = cmcTemperatureService.list(qw1);
             temperatureList.addAll(records);
-            if (channelSize > 30)
+            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 ++) {
+                        for (int j = i + 10; j < i + channelSize; j++) {
                             temperatureList.get(j).setDatetime(minTime);
                         }
-                    }
-                    else {
+                    } else {
                         if (temperatureList.get(i + 30).getDatetime().getTime() > minTime.getTime()) {
                             for (int j = i + 30; j < i + channelSize; j++) {
                                 temperatureList.get(j).setDatetime(minTime);
@@ -102,10 +101,66 @@ public class CmcTemperatureController extends BaseController {
                         }
                     }
                 }
+            }
+            if (temperatureList.size() >= page.getPageSize()) {
                 if (page.getPageNumber() > 1)
                     temperatureList.subList(0, (int) (page.getPageSize() * (page.getPageNumber() - 1))).clear();
                 else
-                    temperatureList.subList((int) page.getPageSize() * 1, temperatureList.size()).clear();
+                    temperatureList.subList((int) page.getPageSize(), temperatureList.size()).clear();
+            }
+        }
+        return getPageData(temperatureList).total(temperatureList.size() / channelSize);
+    }
+
+    /**
+     * 根据点位查询水温监测列表（不分页）
+     */
+    @Get
+    @Mapping("listAllByInfo")
+    public PageData<CmcTemperature> listAllByInfo(CmcTemperature cmcTemperature, String Info) {
+        CmcChannel channel = new CmcChannel();
+        channel.setInfo(Info);
+        int channelSize = cmcChannelService.listChannel(channel).size();
+        QueryWrapper qw = getQW(cmcTemperature, Info);
+        List<CmcTemperature> records = cmcTemperatureService.list(qw);
+        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);
     }

cmc-temperature-ui/src/api/monitoring/temperature.js

@@ -20,4 +20,11 @@ export function listByInfo(query) {
     method: 'get',
     params: query
   })
+}
+export function listAllByInfo(query) {
+  return request({
+    url: '/monitoring/temperature/listAllByInfo',
+    method: 'get',
+    params: query
+  })
 }