|
|
@@ -1228,6 +1228,7 @@ public class ProjectService {
|
|
|
public HttpResult dataScreening(String projectId) {
|
|
|
DataScreeningVO vo = new DataScreeningVO();
|
|
|
LambdaQueryWrapper<KwsProject> wrapper = new LambdaQueryWrapper<>();
|
|
|
+ LambdaQueryWrapper<KwsProjectArea> wrapperProjectArea = new LambdaQueryWrapper<>();
|
|
|
if (org.apache.commons.lang3.StringUtils.isNotBlank(projectId)) {
|
|
|
wrapper.eq(KwsProject::getId, Long.parseLong(projectId));
|
|
|
}
|
|
|
@@ -1235,6 +1236,10 @@ public class ProjectService {
|
|
|
vo.setProjectTotal(count);
|
|
|
int deviceCount = deviceMapper.selectCountByProject(projectId);
|
|
|
vo.setDeviceTotal(deviceCount);
|
|
|
+ //统计全部面积
|
|
|
+ BigDecimal area = projectAreaMapper.selectList(wrapperProjectArea.eq(KwsProjectArea::getDelFlag, 0)).stream().map(KwsProjectArea::getArea).reduce(BigDecimal.ZERO,
|
|
|
+ BigDecimal::add);
|
|
|
+ vo.setProjectTotalArea(area);
|
|
|
/**仅统计设备在线的数据*/
|
|
|
int deviceOnline = deviceMapper.selectDeviceOnlineRateCountByProject(projectId);
|
|
|
BigDecimal deviceOnlineRate = new BigDecimal("0.00");
|