修改设备在线状态定时任务

fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/timer/QxtrTask.java

@@ -73,8 +73,7 @@ public class QxtrTask {
         for (Device item : deviceList) {
             MaWatereleRecord maWatereleRecord = new MaWatereleRecord();
             maWatereleRecord.setDevSn(item.getSerialNumber());
-            TableDataInfo tableDataInfo = watereleRecordService.selectMaWatereleRecordList(maWatereleRecord);
+            List<MaWatereleRecord> list  = watereleRecordService.getList(maWatereleRecord);
-            List<MaWatereleRecord> list = (List<MaWatereleRecord>) tableDataInfo.getRows();
             int status = 4;
             if(list.size() > 0){
                 MaWatereleRecord record = list.get(0);
@@ -87,6 +86,8 @@ public class QxtrTask {
         }
     }
 
+
+
     /**
      * 定时任务 流量计设备
      */

fastbee-service/fastbee-waterele-service/src/main/java/com/fastbee/waterele/service/IMaWatereleRecordService.java

@@ -31,6 +31,7 @@ public interface IMaWatereleRecordService
      */
     public TableDataInfo selectMaWatereleRecordList(MaWatereleRecord maWatereleRecord);
 
+    List<MaWatereleRecord> getList(MaWatereleRecord maWatereleRecord);
     /**
      * 新增水电双计数据记录
      * 

fastbee-service/fastbee-waterele-service/src/main/java/com/fastbee/waterele/service/impl/MaWatereleRecordServiceImpl.java

@@ -1,6 +1,7 @@
 package com.fastbee.waterele.service.impl;
 
 import java.util.*;
+import java.util.function.Function;
 
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.http.HttpUtil;
@@ -51,7 +52,28 @@ public class MaWatereleRecordServiceImpl implements IMaWatereleRecordService
     @Override
     public TableDataInfo  selectMaWatereleRecordList(MaWatereleRecord maWatereleRecord)
     {
-        //
+        List<MaWatereleRecord> list = getList(maWatereleRecord);
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
+        List<MaWatereleRecord> subList = new ArrayList<>();
+        if(list.size() > (pageNum-1)*pageSize){
+            if(list.size() < pageNum*pageSize){
+                subList = list.subList((pageNum-1)*pageSize, list.size());
+            }else{
+                subList = list.subList((pageNum-1)*pageSize, pageNum*pageSize);
+            }
+        }
+        TableDataInfo tableDataInfo = new TableDataInfo();
+        tableDataInfo.setMsg("获取成功");
+        tableDataInfo.setTotal(list.size());
+        tableDataInfo.setRows(subList);
+        tableDataInfo.setCode(200);
+        return tableDataInfo;
+    }
+
+    @Override
+    public List<MaWatereleRecord> getList(MaWatereleRecord maWatereleRecord){
         Long endTime = 0L;
         Long startTime = 0L;
         if(null == maWatereleRecord.getParams()){
@@ -124,24 +146,7 @@ public class MaWatereleRecordServiceImpl implements IMaWatereleRecordService
                 }
             }
         }
-        //
+        return list;
-        PageDomain pageDomain = TableSupport.buildPageRequest();
-        Integer pageNum = pageDomain.getPageNum();
-        Integer pageSize = pageDomain.getPageSize();
-        List<MaWatereleRecord> subList = new ArrayList<>();
-        if(list.size() > (pageNum-1)*pageSize){
-            if(list.size() < pageNum*pageSize){
-                subList = list.subList((pageNum-1)*pageSize, list.size());
-            }else{
-                subList = list.subList((pageNum-1)*pageSize, pageNum*pageSize);
-            }
-        }
-        TableDataInfo tableDataInfo = new TableDataInfo();
-        tableDataInfo.setMsg("获取成功");
-        tableDataInfo.setTotal(list.size());
-        tableDataInfo.setRows(subList);
-        tableDataInfo.setCode(200);
-        return tableDataInfo;
     }
 
     /**