修改bug

iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/DeviceInfoDataImpl.java

@@ -466,6 +466,11 @@ public class DeviceInfoDataImpl implements IDeviceInfoData, IJPACommData<DeviceI
        Long noRegistResult =  jpaQueryFactory.select(tbDeviceInfo.id.count()).from(tbDeviceInfo).where(tbDeviceInfo.state.eq("offline")
                 .and(tbDeviceInfo.onlineTime.isNull())).fetchOne();
         resultMap.put("unactivated",noRegistResult);
+        //
+        Long offlineNum = resultMap.get("offline");
+        if(Objects.nonNull(offlineNum)){
+            resultMap.put("offline",offlineNum-noRegistResult);
+        }
        return resultMap;
     }
 

iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/HomeController.java

@@ -86,7 +86,7 @@ public class HomeController {
         Date todayZero = todayZeroTime();
         if(CollectionUtil.isNotEmpty(categoryVos)){
             dataMap.put("categoryAllNum",categoryVos.size());
-            Integer categoryTodayNum = categoryVos.stream().map(item->new Date(item.getCreateAt()).compareTo(todayZero)>0)
+            Integer categoryTodayNum = categoryVos.stream().filter(item->item.getCreateAt().compareTo(todayZero.getTime())>0)
                     .collect(Collectors.toList()).size();
             dataMap.put("categoryTodayNum",categoryTodayNum);
         }
@@ -101,7 +101,7 @@ public class HomeController {
         List<ProductVo> productVos = productService.selectProductList();
         if(CollectionUtil.isNotEmpty(productVos)){
             dataMap.put("productAllNum",productVos.size());
-            Integer productTodayNum = productVos.stream().map(item->new Date(item.getCreateAt()).compareTo(todayZero)>0)
+            Integer productTodayNum = productVos.stream().filter(item->item.getCreateAt().compareTo(todayZero.getTime())>0)
                     .collect(Collectors.toList()).size();
             dataMap.put("productTodayNum",productTodayNum);
         }
@@ -152,7 +152,7 @@ public class HomeController {
                 }
             }
         }
-        dataMap.put("设备总数",allNum);
+//        dataMap.put("设备总数",allNum);
         return  dataMap;
     }