diff --git a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml index ef0fc53..fd2be35 100644 --- a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml +++ b/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml @@ -73,7 +73,7 @@ ) dg LEFT JOIN ( - SELECT id, group_id AS "groupId" + SELECT count(id) AS "deviceCount",group_id as groupId FROM device d WHERE VALID = 1 GROUP BY group_id diff --git a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml index ef0fc53..fd2be35 100644 --- a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml +++ b/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml @@ -73,7 +73,7 @@ ) dg LEFT JOIN ( - SELECT id, group_id AS "groupId" + SELECT count(id) AS "deviceCount",group_id as groupId FROM device d WHERE VALID = 1 GROUP BY group_id diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceDataServiceImpl.java b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceDataServiceImpl.java index 2c04b71..5a442cc 100644 --- a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceDataServiceImpl.java +++ b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceDataServiceImpl.java @@ -37,7 +37,7 @@ DictCodeUtils.convertDictCodeToName(deviceDataListVO); } page.setRecords(deviceListVOList); - return null; + return page; } } diff --git a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml index ef0fc53..fd2be35 100644 --- a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml +++ b/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml @@ -73,7 +73,7 @@ ) dg LEFT JOIN ( - SELECT id, group_id AS "groupId" + SELECT count(id) AS "deviceCount",group_id as groupId FROM device d WHERE VALID = 1 GROUP BY group_id diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceDataServiceImpl.java b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceDataServiceImpl.java index 2c04b71..5a442cc 100644 --- a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceDataServiceImpl.java +++ b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceDataServiceImpl.java @@ -37,7 +37,7 @@ DictCodeUtils.convertDictCodeToName(deviceDataListVO); } page.setRecords(deviceListVOList); - return null; + return page; } } diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceGroupServiceImpl.java b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceGroupServiceImpl.java index f3402f1..191b75f 100644 --- a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceGroupServiceImpl.java +++ b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceGroupServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.impl; -import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import com.alibaba.excel.EasyExcel; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -27,6 +26,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.ObjectUtils; import java.util.List; import java.util.Map; @@ -57,6 +57,12 @@ Map deptMap = deptList.stream() .collect(Collectors.toMap(e -> (Long) e.get("id"), e -> (String) e.get("simpleName"))); for (DeviceGroupListVO deviceGroupListVO : deviceGroupListVOList) { + if(ObjectUtils.isEmpty(deviceGroupListVO.getDeviceCount())){ + deviceGroupListVO.setDeviceCount(0); + } + if(ObjectUtils.isEmpty(deviceGroupListVO.getSubscribeCount())){ + deviceGroupListVO.setSubscribeCount(0); + } if (ObjectUtil.isNotEmpty(deviceGroupListVO.getDeptid()) && deptMap.containsKey(deviceGroupListVO.getDeptid())) { deviceGroupListVO.setDeptName(deptMap.get(deviceGroupListVO.getDeptid())); } @@ -133,7 +139,7 @@ deviceGroup.setDeptName(deptMap.get(deviceGroup.getDeptid())); } //是否展示订阅ids - return this.baseMapper.selectById(id); + return deviceGroup; } diff --git a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml index ef0fc53..fd2be35 100644 --- a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml +++ b/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml @@ -73,7 +73,7 @@ ) dg LEFT JOIN ( - SELECT id, group_id AS "groupId" + SELECT count(id) AS "deviceCount",group_id as groupId FROM device d WHERE VALID = 1 GROUP BY group_id diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceDataServiceImpl.java b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceDataServiceImpl.java index 2c04b71..5a442cc 100644 --- a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceDataServiceImpl.java +++ b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceDataServiceImpl.java @@ -37,7 +37,7 @@ DictCodeUtils.convertDictCodeToName(deviceDataListVO); } page.setRecords(deviceListVOList); - return null; + return page; } } diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceGroupServiceImpl.java b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceGroupServiceImpl.java index f3402f1..191b75f 100644 --- a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceGroupServiceImpl.java +++ b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceGroupServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.impl; -import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import com.alibaba.excel.EasyExcel; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -27,6 +26,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.ObjectUtils; import java.util.List; import java.util.Map; @@ -57,6 +57,12 @@ Map deptMap = deptList.stream() .collect(Collectors.toMap(e -> (Long) e.get("id"), e -> (String) e.get("simpleName"))); for (DeviceGroupListVO deviceGroupListVO : deviceGroupListVOList) { + if(ObjectUtils.isEmpty(deviceGroupListVO.getDeviceCount())){ + deviceGroupListVO.setDeviceCount(0); + } + if(ObjectUtils.isEmpty(deviceGroupListVO.getSubscribeCount())){ + deviceGroupListVO.setSubscribeCount(0); + } if (ObjectUtil.isNotEmpty(deviceGroupListVO.getDeptid()) && deptMap.containsKey(deviceGroupListVO.getDeptid())) { deviceGroupListVO.setDeptName(deptMap.get(deviceGroupListVO.getDeptid())); } @@ -133,7 +139,7 @@ deviceGroup.setDeptName(deptMap.get(deviceGroup.getDeptid())); } //是否展示订阅ids - return this.baseMapper.selectById(id); + return deviceGroup; } diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java index a998cf3..d871b6c 100644 --- a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java +++ b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java @@ -110,7 +110,7 @@ public Device deviceDetail(Long id) throws Exception { Device device=this.baseMapper.selectById(id); DictCodeUtils.convertDictCodeToName(device); - return this.baseMapper.selectById(id); + return device; } @Override