修改接口

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

@@ -463,6 +463,9 @@ public class DeviceInfoDataImpl implements IDeviceInfoData, IJPACommData<DeviceI
         Map<String,Long> resultMap = new HashMap();
        List<Tuple> result =  jpaQueryFactory.select(tbDeviceInfo.id.count(),tbDeviceInfo.state).from(tbDeviceInfo).groupBy(tbDeviceInfo.state).fetch();
        for(Tuple tuple: result){ resultMap.put(tuple.get(1,String.class),tuple.get(0,Long.class)); }
+       Long noRegistResult =  jpaQueryFactory.select(tbDeviceInfo.id.count()).from(tbDeviceInfo).where(tbDeviceInfo.state.eq("offline")
+                .and(tbDeviceInfo.onlineTime.isNull())).fetchOne();
+        resultMap.put("unactivated",noRegistResult);
        return resultMap;
     }
 

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

@@ -43,7 +43,7 @@ import org.springframework.web.multipart.MultipartFile;
 import java.util.*;
 import java.util.stream.Collectors;
 
-@Api(tags = {""})
+@Api(tags = {"首页"})
 @Slf4j
 @RestController
 @RequestMapping("/home")
@@ -78,7 +78,7 @@ public class HomeController {
         return  dataMap;
     }
 
-    @ApiOperation("pnglei")
+    @ApiOperation("品类")
     @PostMapping("/category")
     public Map categoryData() {
         Map<String,Object> dataMap = new HashMap<>();
@@ -93,7 +93,7 @@ public class HomeController {
         return  dataMap;
     }
 
-    @ApiOperation("shangpin")
+    @ApiOperation("商品")
     @PostMapping("/product")
     public Map productData() {
         Map<String,Object> dataMap = new HashMap<>();
@@ -108,26 +108,25 @@ public class HomeController {
         return  dataMap;
     }
 
-    @ApiOperation("shebei")
+    @ApiOperation("设备")
     @PostMapping("/device")
     public Map deviceData() {
         Map statisMap = deviceServiceImpl.countMap();
         return  statisMap;
     }
 
-    @ApiOperation("deviceStates")
+    @ApiOperation("设备状态")
     @PostMapping("/deviceStates")
     public Map deviceStates() {
         Map statisMap = deviceServiceImpl.countStateMap();
         return  statisMap;
     }
 
-    @ApiOperation("deviceCategory")
+    @ApiOperation("设备类别")
     @PostMapping("/deviceCategory")
     public Map deviceCategory() {
         Map<String,Long> dataMap = new HashMap<>();
         List<CategoryVo> categoryVos = productService.selectCategoryList();
-        Date todayZero = todayZeroTime();
         Map<String,String> categoryMap = new HashMap<>();
         if(CollectionUtil.isNotEmpty(categoryVos)){
             categoryMap = categoryVos.stream().collect(Collectors.toMap(CategoryVo::getId,CategoryVo::getName));
@@ -144,11 +143,12 @@ public class HomeController {
             Long tmpNum = (Long)statisMap.get(key);
             allNum = allNum+tmpNum;
             if(Strings.isNotEmpty(category)){
-                Long num = dataMap.get(category);
+                String categoryName = categoryMap.get(category);
+                Long num = dataMap.get(categoryName);
               if(Objects.nonNull(num)){
-                    dataMap.put(category,num+tmpNum);
+                    dataMap.put(categoryName,num+tmpNum);
                 }else{
-                    dataMap.put(category,tmpNum);
+                    dataMap.put(categoryName,tmpNum);
                 }
             }
         }