|
@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
|
|
import com.ruoyi.common.utils.PageUtils; |
|
|
import com.ruoyi.common.utils.PageUtils; |
|
|
import com.zc.business.domain.*; |
|
|
import com.zc.business.domain.*; |
|
|
|
|
|
import com.zc.business.enums.DeviceTypeEnum; |
|
|
import com.zc.business.mapper.DcOperLogMapper; |
|
|
import com.zc.business.mapper.DcOperLogMapper; |
|
|
import com.zc.business.service.*; |
|
|
import com.zc.business.service.*; |
|
|
import org.springframework.stereotype.Service; |
|
|
import org.springframework.stereotype.Service; |
|
@ -56,7 +57,16 @@ public class DcOperLogServiceImpl extends ServiceImpl<DcOperLogMapper, DcOperLog |
|
|
queryWrapper.select("COUNT(dc_device_type) as deviceCount", "dc_device_type") |
|
|
queryWrapper.select("COUNT(dc_device_type) as deviceCount", "dc_device_type") |
|
|
.ne("dc_device_type", "") |
|
|
.ne("dc_device_type", "") |
|
|
.groupBy("dc_device_type"); |
|
|
.groupBy("dc_device_type"); |
|
|
return listMaps(queryWrapper); |
|
|
List<Map<String, Object>> list = listMaps(queryWrapper); |
|
|
|
|
|
list.forEach(map -> { |
|
|
|
|
|
String typeName = Arrays.stream(DeviceTypeEnum.values()) |
|
|
|
|
|
.filter(deviceTypeEnum -> deviceTypeEnum.getCode() == Integer.parseInt(map.get("dc_device_type").toString())) |
|
|
|
|
|
.findFirst() |
|
|
|
|
|
.map(DeviceTypeEnum::getInfo) |
|
|
|
|
|
.orElse("其他"); |
|
|
|
|
|
map.put("typeName",typeName); |
|
|
|
|
|
}); |
|
|
|
|
|
return list; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private static LambdaQueryWrapper<DcOperLog> getDcOperLogLambdaQueryWrapper(DcOperLog dcOperLog, Date endTime, Date startTime) { |
|
|
private static LambdaQueryWrapper<DcOperLog> getDcOperLogLambdaQueryWrapper(DcOperLog dcOperLog, Date endTime, Date startTime) { |
|
|