Commit 32f0d21b by 朱淼

代码整理

parent 46379d7f
......@@ -2,7 +2,6 @@ package com.makeit.service.platform.dataScreen.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.makeit.dto.platform.dataScreen.PlatDataScreenQueryDTO;
import com.makeit.entity.platform.alarm.PlatAlarmConfig;
import com.makeit.entity.platform.alarm.PlatAlarmRecord;
import com.makeit.entity.platform.auth.PlatOrg;
import com.makeit.entity.platform.auth.PlatUser;
......@@ -15,8 +14,6 @@ import com.makeit.enums.platform.alarm.PlatAlarmRecordEnum;
import com.makeit.enums.platform.device.PlatDeviceEnum;
import com.makeit.enums.platform.elder.PlatElderEnum;
import com.makeit.module.iot.enums.DeviceState;
import com.makeit.module.system.entity.ChinaArea;
import com.makeit.module.system.service.ChinaAreaService;
import com.makeit.service.platform.alarm.PlatAlarmRecordService;
import com.makeit.service.platform.auth.PlatOrgService;
import com.makeit.service.platform.auth.PlatUserService;
......@@ -25,10 +22,8 @@ import com.makeit.service.platform.device.PlatDeviceService;
import com.makeit.service.platform.elder.PlatElderService;
import com.makeit.service.platform.space.PlatBedService;
import com.makeit.service.platform.space.PlatSpaceService;
import com.makeit.utils.area.AreaUtil;
import com.makeit.utils.area.ChinaAreaVO;
import com.makeit.utils.data.convert.BeanDtoVoUtils;
import com.makeit.utils.sql.CustomQueryWrapper;
import com.makeit.vo.platform.dataScreen.*;
import jodd.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -64,6 +59,19 @@ public class DataScreenServiceImpl implements DataScreenService {
@Override
public PlatAgeStatisticsVO ageStatistics(PlatDataScreenQueryDTO dto) {
PlatAgeStatisticsVO vo = new PlatAgeStatisticsVO();
if(dto.getOrgIds().isEmpty()){
//获取该账号的权限组织
PlatOrg param = new PlatOrg();
param.setType(dto.getType());
List<PlatOrg> orgs = platOrgService.belongToScopeList(param);
if(orgs.isEmpty()){
return vo;
}
List<String> orgIds = orgs.stream().map(PlatOrg::getId).collect(Collectors.toList());
dto.setOrgIds(orgIds);
}
List<PlatElder> elders = platElderService.list(new QueryWrapper<PlatElder>().lambda()
.in(PlatElder::getOrgId, dto.getOrgIds()));
long belowSixtyNumber = elders.stream().filter(t->t.getAge()!=null && t.getAge()<60).count();
......@@ -71,7 +79,6 @@ public class DataScreenServiceImpl implements DataScreenService {
long seventyOneToEightyNumber = elders.stream().filter(t->t.getAge()!=null && t.getAge()>70 && t.getAge()<=80).count();
long EightyOneToNinetyNumber = elders.stream().filter(t->t.getAge()!=null && t.getAge()>80 && t.getAge()<=90).count();
long aboveNinetyNumber = elders.stream().filter(t->t.getAge()!=null && t.getAge()>90).count();
PlatAgeStatisticsVO vo = new PlatAgeStatisticsVO();
vo.setBelowSixtyNumber(belowSixtyNumber);
vo.setSixtyToSeventyNumber(sixtyToSeventyNumber);
vo.setSeventyOneToEightyNumber(seventyOneToEightyNumber);
......@@ -82,6 +89,19 @@ public class DataScreenServiceImpl implements DataScreenService {
@Override
public PlatSexStatisticsVO sexStatistics(PlatDataScreenQueryDTO dto) {
PlatSexStatisticsVO vo = new PlatSexStatisticsVO();
if(dto.getOrgIds().isEmpty()){
//获取该账号的权限组织
PlatOrg param = new PlatOrg();
param.setType(dto.getType());
List<PlatOrg> orgs = platOrgService.belongToScopeList(param);
if(orgs.isEmpty()){
return vo;
}
List<String> orgIds = orgs.stream().map(PlatOrg::getId).collect(Collectors.toList());
dto.setOrgIds(orgIds);
}
long manElderNumber = platElderService.count(new QueryWrapper<PlatElder>().lambda()
.in(PlatElder::getOrgId, dto.getOrgIds())
.eq(PlatElder::getSex, PlatElderEnum.SexEnum.MAN.getValue()));
......@@ -89,7 +109,7 @@ public class DataScreenServiceImpl implements DataScreenService {
.in(PlatElder::getOrgId, dto.getOrgIds())
.eq(PlatElder::getSex, PlatElderEnum.SexEnum.WOMAN.getValue()));
long total = womanElderNumber + manElderNumber;
PlatSexStatisticsVO vo = new PlatSexStatisticsVO();
if(total>0){
BigDecimal manRate = new BigDecimal(manElderNumber).divide(new BigDecimal(total), 4, BigDecimal.ROUND_HALF_UP)
.multiply(new BigDecimal(100));
......@@ -110,6 +130,19 @@ public class DataScreenServiceImpl implements DataScreenService {
@Override
public PlatDeviceStatisticsVO deviceStatistics(PlatDataScreenQueryDTO dto) {
PlatDeviceStatisticsVO vo = new PlatDeviceStatisticsVO();
if(dto.getOrgIds().isEmpty()){
//获取该账号的权限组织
PlatOrg param = new PlatOrg();
param.setType(dto.getType());
List<PlatOrg> orgs = platOrgService.belongToScopeList(param);
if(orgs.isEmpty()){
return vo;
}
List<String> orgIds = orgs.stream().map(PlatOrg::getId).collect(Collectors.toList());
dto.setOrgIds(orgIds);
}
List<PlatDevice> devices = platDeviceService.list(new QueryWrapper<PlatDevice>().lambda()
.in(PlatDevice::getOrgId, dto.getOrgIds()));
long total = devices.size();
......@@ -119,7 +152,7 @@ public class DataScreenServiceImpl implements DataScreenService {
long heartNumber = devices.stream().filter(t-> PlatDeviceEnum.CategoryEnum.HEART.getValue().equals(t.getCategory())).count();
long fallNumber = devices.stream().filter(t-> PlatDeviceEnum.CategoryEnum.FALL.getValue().equals(t.getCategory())).count();
long spaceNumber = devices.stream().filter(t-> PlatDeviceEnum.CategoryEnum.SPACE.getValue().equals(t.getCategory())).count();
PlatDeviceStatisticsVO vo = new PlatDeviceStatisticsVO();
vo.setTotla(total);
vo.setOnlineNumber(onlineNumber);
vo.setOfflineNumber(offlineNumber);
......@@ -132,6 +165,19 @@ public class DataScreenServiceImpl implements DataScreenService {
@Override
public PlatAlarmStatisticsVO alarmStatistics(PlatDataScreenQueryDTO dto) {
PlatAlarmStatisticsVO vo = new PlatAlarmStatisticsVO();
if(dto.getOrgIds().isEmpty()){
//获取该账号的权限组织
PlatOrg param = new PlatOrg();
param.setType(dto.getType());
List<PlatOrg> orgs = platOrgService.belongToScopeList(param);
if(orgs.isEmpty()){
return vo;
}
List<String> orgIds = orgs.stream().map(PlatOrg::getId).collect(Collectors.toList());
dto.setOrgIds(orgIds);
}
List<PlatAlarmRecord> alarmRecords = platAlarmRecordService.list(new QueryWrapper<PlatAlarmRecord>().lambda()
.between(PlatAlarmRecord::getAlarmDate,dto.getStartTime(),dto.getEndTime())
.in(PlatAlarmRecord::getOrgId, dto.getOrgIds()));
......@@ -166,7 +212,7 @@ public class DataScreenServiceImpl implements DataScreenService {
list.add(listVo);
}
}
PlatAlarmStatisticsVO vo = new PlatAlarmStatisticsVO();
vo.setTotla(totla);
vo.setHandledNumber(handledNumber);
vo.setUnhandledNumber(unhandledNumber);
......@@ -176,6 +222,19 @@ public class DataScreenServiceImpl implements DataScreenService {
@Override
public PlatBaseInfoStatisticsVO baseInfoStatistics(PlatDataScreenQueryDTO dto) {
PlatBaseInfoStatisticsVO vo = new PlatBaseInfoStatisticsVO();
if(dto.getOrgIds().isEmpty()){
//获取该账号的权限组织
PlatOrg param = new PlatOrg();
param.setType(dto.getType());
List<PlatOrg> orgs = platOrgService.belongToScopeList(param);
if(orgs.isEmpty()){
return vo;
}
List<String> orgIds = orgs.stream().map(PlatOrg::getId).collect(Collectors.toList());
dto.setOrgIds(orgIds);
}
List<PlatElder> elders = platElderService.list(new QueryWrapper<PlatElder>().lambda()
.in(PlatElder::getOrgId, dto.getOrgIds()));
......@@ -185,7 +244,7 @@ public class DataScreenServiceImpl implements DataScreenService {
long userNumber = platUserService.count(new QueryWrapper<PlatUser>().lambda()
.in(PlatUser::getOrgId, dto.getOrgIds())
.eq(PlatUser::getStatus, CommonEnum.YES.getValue()));
PlatBaseInfoStatisticsVO vo = new PlatBaseInfoStatisticsVO();
vo.setElderNumber(elderNumber);
vo.setCurrentElderNumber(currentElderNumber);
vo.setBedNumber(bedNumber);
......@@ -196,6 +255,19 @@ public class DataScreenServiceImpl implements DataScreenService {
@Override
public List<PlatMapStatisticsVO> mapStatistics(PlatDataScreenQueryDTO dto) {
List<PlatMapStatisticsVO> list = new ArrayList<>();
if(dto.getOrgIds().isEmpty()){
//获取该账号的权限组织
PlatOrg param = new PlatOrg();
param.setType(dto.getType());
List<PlatOrg> orgs = platOrgService.belongToScopeList(param);
if(orgs.isEmpty()){
return new ArrayList<>();
}
List<String> orgIds = orgs.stream().map(PlatOrg::getId).collect(Collectors.toList());
dto.setOrgIds(orgIds);
}
List<PlatSpace> spaces = platSpaceService.list(new QueryWrapper<PlatSpace>().lambda()
.isNull(PlatSpace::getParentId)
.in(PlatSpace::getOrgId, dto.getOrgIds()));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment