|
@@ -64,13 +64,15 @@ public class BaseDeviceServiceImpl extends AbstractCrudService<BaseDeviceMapper,
|
|
|
|
|
|
BaseDeviceVO baseDeviceVO = new BaseDeviceVO();
|
|
|
LambdaQueryWrapper<BaseDevice> queryWrapper = Wrappers.lambdaQuery();
|
|
|
- queryWrapper.eq(BaseDevice::getEnable,1);
|
|
|
+ queryWrapper.eq(BaseDevice::getEnable,1)
|
|
|
+ .in(BaseDevice::getDeviceType,"45","332","358","359","376","395","401","420","425","426","427","428","429","433","434");
|
|
|
Integer totalCount = this.count(queryWrapper);
|
|
|
baseDeviceVO.setDeviceCount(totalCount);
|
|
|
|
|
|
QueryWrapper<BaseDevice> queryWrapper1 = Wrappers.query();
|
|
|
queryWrapper1.select("device_type as deviceTypeCode","device_name as deviceTypeName","count(*) as deviceCount")
|
|
|
.eq("enable",1)
|
|
|
+ .in("device_type","45","332","358","359","376","395","401","420","425","426","427","428","429","433","434")
|
|
|
.groupBy("device_type");
|
|
|
List<Map<String,Object>> map = this.listMaps(queryWrapper1);
|
|
|
if(map.size() > 0){
|