Skip to content

黄嘉阳 / iot-platform-server

Go to a project
Commit da52f87e by 朱淼
Options

修改bug

parent 9114b029
Inline Side-by-side
Showing with 72 additions and 3 deletions
server-service/src/main/java/com/makeit/dto/platform/space/PlatRegionSettingDTO.java
...@@ -35,6 +35,9 @@ public class PlatRegionSettingDTO extends BaseIdDTO { ...@@ -35,6 +35,9 @@ public class PlatRegionSettingDTO extends BaseIdDTO {
@ApiModelProperty("设备ID") @ApiModelProperty("设备ID")
private String deviceId; private String deviceId;
@ApiModelProperty("原始设备ID")
private String oriDeviceId;
@ApiModelProperty("房间ID") @ApiModelProperty("房间ID")
private String roomId; private String roomId;
......
server-service/src/main/java/com/makeit/dto/platform/space/PlatSpaceVO.java
...@@ -25,6 +25,9 @@ public class PlatSpaceVO extends BaseIdDTO { ...@@ -25,6 +25,9 @@ public class PlatSpaceVO extends BaseIdDTO {
@ApiModelProperty("父级名称") @ApiModelProperty("父级名称")
private String parentName; private String parentName;
@ApiModelProperty("属性 1-居家 2-机构")
private String attribute;
@ApiModelProperty("子集") @ApiModelProperty("子集")
private List<PlatSpaceVO> children; private List<PlatSpaceVO> children;
} }
server-service/src/main/java/com/makeit/service/platform/dataScreen/impl/DataScreenServiceImpl.java
...@@ -76,6 +76,16 @@ public class DataScreenServiceImpl implements DataScreenService { ...@@ -76,6 +76,16 @@ public class DataScreenServiceImpl implements DataScreenService {
List<String> orgIds = orgs.stream().map(PlatOrg::getId).collect(Collectors.toList()); List<String> orgIds = orgs.stream().map(PlatOrg::getId).collect(Collectors.toList());
dto.setOrgIds(orgIds); dto.setOrgIds(orgIds);
}else {
//根据类型过滤数据
List<PlatOrg> platOrgs = platOrgService.list(new QueryWrapper<PlatOrg>().lambda()
.in(PlatOrg::getId, dto.getOrgIds())
.eq(PlatOrg::getType, dto.getType()));
if(platOrgs.isEmpty()){
return vo;
}
List<String> orgIdList = platOrgs.stream().map(PlatOrg::getId).collect(Collectors.toList());
dto.setOrgIds(orgIdList);
} }
List<PlatElder> elders = platElderService.list(new QueryWrapper<PlatElder>().lambda() List<PlatElder> elders = platElderService.list(new QueryWrapper<PlatElder>().lambda()
.in(PlatElder::getOrgId, dto.getOrgIds())); .in(PlatElder::getOrgId, dto.getOrgIds()));
...@@ -104,6 +114,16 @@ public class DataScreenServiceImpl implements DataScreenService { ...@@ -104,6 +114,16 @@ public class DataScreenServiceImpl implements DataScreenService {
List<String> orgIds = orgs.stream().map(PlatOrg::getId).collect(Collectors.toList()); List<String> orgIds = orgs.stream().map(PlatOrg::getId).collect(Collectors.toList());
dto.setOrgIds(orgIds); dto.setOrgIds(orgIds);
}else {
//根据类型过滤数据
List<PlatOrg> platOrgs = platOrgService.list(new QueryWrapper<PlatOrg>().lambda()
.in(PlatOrg::getId, dto.getOrgIds())
.eq(PlatOrg::getType, dto.getType()));
if(platOrgs.isEmpty()){
return vo;
}
List<String> orgIdList = platOrgs.stream().map(PlatOrg::getId).collect(Collectors.toList());
dto.setOrgIds(orgIdList);
} }
long manElderNumber = platElderService.count(new QueryWrapper<PlatElder>().lambda() long manElderNumber = platElderService.count(new QueryWrapper<PlatElder>().lambda()
.in(PlatElder::getOrgId, dto.getOrgIds()) .in(PlatElder::getOrgId, dto.getOrgIds())
...@@ -143,6 +163,16 @@ public class DataScreenServiceImpl implements DataScreenService { ...@@ -143,6 +163,16 @@ public class DataScreenServiceImpl implements DataScreenService {
List<String> orgIds = orgs.stream().map(PlatOrg::getId).collect(Collectors.toList()); List<String> orgIds = orgs.stream().map(PlatOrg::getId).collect(Collectors.toList());
dto.setOrgIds(orgIds); dto.setOrgIds(orgIds);
}else {
//根据类型过滤数据
List<PlatOrg> platOrgs = platOrgService.list(new QueryWrapper<PlatOrg>().lambda()
.in(PlatOrg::getId, dto.getOrgIds())
.eq(PlatOrg::getType, dto.getType()));
if(platOrgs.isEmpty()){
return vo;
}
List<String> orgIdList = platOrgs.stream().map(PlatOrg::getId).collect(Collectors.toList());
dto.setOrgIds(orgIdList);
} }
List<PlatDevice> devices = platDeviceService.list(new QueryWrapper<PlatDevice>().lambda() List<PlatDevice> devices = platDeviceService.list(new QueryWrapper<PlatDevice>().lambda()
.in(PlatDevice::getOrgId, dto.getOrgIds())); .in(PlatDevice::getOrgId, dto.getOrgIds()));
...@@ -176,6 +206,16 @@ public class DataScreenServiceImpl implements DataScreenService { ...@@ -176,6 +206,16 @@ public class DataScreenServiceImpl implements DataScreenService {
List<String> orgIds = orgs.stream().map(PlatOrg::getId).collect(Collectors.toList()); List<String> orgIds = orgs.stream().map(PlatOrg::getId).collect(Collectors.toList());
dto.setOrgIds(orgIds); dto.setOrgIds(orgIds);
}else {
//根据类型过滤数据
List<PlatOrg> platOrgs = platOrgService.list(new QueryWrapper<PlatOrg>().lambda()
.in(PlatOrg::getId, dto.getOrgIds())
.eq(PlatOrg::getType, dto.getType()));
if(platOrgs.isEmpty()){
return vo;
}
List<String> orgIdList = platOrgs.stream().map(PlatOrg::getId).collect(Collectors.toList());
dto.setOrgIds(orgIdList);
} }
List<PlatAlarmRecord> alarmRecords = platAlarmRecordService.list(new QueryWrapper<PlatAlarmRecord>().lambda() List<PlatAlarmRecord> alarmRecords = platAlarmRecordService.list(new QueryWrapper<PlatAlarmRecord>().lambda()
.between(PlatAlarmRecord::getAlarmDate,dto.getStartTime(),dto.getEndTime()) .between(PlatAlarmRecord::getAlarmDate,dto.getStartTime(),dto.getEndTime())
...@@ -247,7 +287,7 @@ public class DataScreenServiceImpl implements DataScreenService { ...@@ -247,7 +287,7 @@ public class DataScreenServiceImpl implements DataScreenService {
JoinUtil.join(list, platBedService, PlatElderListVO::getBedId, PlatBed::getId, (e, l) -> { JoinUtil.join(list, platBedService, PlatElderListVO::getBedId, PlatBed::getId, (e, l) -> {
e.setBedName(l.getName()); e.setBedName(l.getName());
}); });
Map<String, PlatElderListVO> map = list.stream().collect(Collectors.toMap(PlatElderListVO::getBedId, Function.identity())); Map<String, PlatElderListVO> map = list.stream().collect(Collectors.toMap(PlatElderListVO::getId, Function.identity()));
return map; return map;
} }
...@@ -263,6 +303,16 @@ public class DataScreenServiceImpl implements DataScreenService { ...@@ -263,6 +303,16 @@ public class DataScreenServiceImpl implements DataScreenService {
List<String> orgIds = orgs.stream().map(PlatOrg::getId).collect(Collectors.toList()); List<String> orgIds = orgs.stream().map(PlatOrg::getId).collect(Collectors.toList());
dto.setOrgIds(orgIds); dto.setOrgIds(orgIds);
}else {
//根据类型过滤数据
List<PlatOrg> platOrgs = platOrgService.list(new QueryWrapper<PlatOrg>().lambda()
.in(PlatOrg::getId, dto.getOrgIds())
.eq(PlatOrg::getType, dto.getType()));
if(platOrgs.isEmpty()){
return vo;
}
List<String> orgIdList = platOrgs.stream().map(PlatOrg::getId).collect(Collectors.toList());
dto.setOrgIds(orgIdList);
} }
List<PlatElder> elders = platElderService.list(new QueryWrapper<PlatElder>().lambda() List<PlatElder> elders = platElderService.list(new QueryWrapper<PlatElder>().lambda()
.in(PlatElder::getOrgId, dto.getOrgIds())); .in(PlatElder::getOrgId, dto.getOrgIds()));
...@@ -293,6 +343,16 @@ public class DataScreenServiceImpl implements DataScreenService { ...@@ -293,6 +343,16 @@ public class DataScreenServiceImpl implements DataScreenService {
List<String> orgIds = orgs.stream().map(PlatOrg::getId).collect(Collectors.toList()); List<String> orgIds = orgs.stream().map(PlatOrg::getId).collect(Collectors.toList());
dto.setOrgIds(orgIds); dto.setOrgIds(orgIds);
}else {
//根据类型过滤数据
List<PlatOrg> platOrgs = platOrgService.list(new QueryWrapper<PlatOrg>().lambda()
.in(PlatOrg::getId, dto.getOrgIds())
.eq(PlatOrg::getType, dto.getType()));
if(platOrgs.isEmpty()){
return list;
}
List<String> orgIdList = platOrgs.stream().map(PlatOrg::getId).collect(Collectors.toList());
dto.setOrgIds(orgIdList);
} }
List<PlatSpace> spaces = platSpaceService.list(new QueryWrapper<PlatSpace>().lambda() List<PlatSpace> spaces = platSpaceService.list(new QueryWrapper<PlatSpace>().lambda()
......
server-service/src/main/java/com/makeit/service/platform/space/impl/PlatRegionSettingServiceImpl.java
...@@ -110,11 +110,13 @@ public class PlatRegionSettingServiceImpl extends ServiceImpl<PlatRegionSettingM ...@@ -110,11 +110,13 @@ public class PlatRegionSettingServiceImpl extends ServiceImpl<PlatRegionSettingM
List<String> listDeviceIds = data.stream().map(item->item.getDeviceId()).collect(Collectors.toList()); List<String> listDeviceIds = data.stream().map(item->item.getDeviceId()).collect(Collectors.toList());
LambdaQueryWrapper<PlatDevice> queryWrapper1 = new LambdaQueryWrapper<>(); LambdaQueryWrapper<PlatDevice> queryWrapper1 = new LambdaQueryWrapper<>();
queryWrapper1.in(PlatDevice::getId,listDeviceIds); queryWrapper1.in(PlatDevice::getId,listDeviceIds);
queryWrapper1.select(PlatDevice::getId,PlatDevice::getName); queryWrapper1.select(PlatDevice::getId,PlatDevice::getName,PlatDevice::getOriDeviceId);
List<PlatDevice> devices = platDeviceService.list(queryWrapper1); List<PlatDevice> devices = platDeviceService.list(queryWrapper1);
Map<String,String> map = devices.stream().collect(Collectors.toMap(PlatDevice::getId,PlatDevice::getName,(k1,k2)->k1)); Map<String,String> map = devices.stream().collect(Collectors.toMap(PlatDevice::getId,PlatDevice::getName,(k1,k2)->k1));
Map<String,String> oriDeviceIdMap = devices.stream().collect(Collectors.toMap(PlatDevice::getId,PlatDevice::getOriDeviceId,(k1,k2)->k1));
data.forEach(item->{ data.forEach(item->{
item.setDeviceName(map.get(item.getDeviceId())); item.setDeviceName(map.get(item.getDeviceId()));
item.setOriDeviceId(oriDeviceIdMap.get(item.getDeviceId()));
}); });
} }
return data; return data;
......
server-service/src/main/java/com/makeit/service/platform/space/impl/PlatSpaceServiceImpl.java
...@@ -269,6 +269,7 @@ public class PlatSpaceServiceImpl extends ServiceImpl<PlatSpaceMapper, PlatSpace ...@@ -269,6 +269,7 @@ public class PlatSpaceServiceImpl extends ServiceImpl<PlatSpaceMapper, PlatSpace
vo.setName(space.getName()); vo.setName(space.getName());
vo.setParentId(space.getParentId()); vo.setParentId(space.getParentId());
vo.setId(space.getId()); vo.setId(space.getId());
vo.setAttribute(space.getAttribute());
return vo; return vo;
} }
......
server-service/src/main/resources/mappers/PlatBedMapper.xml
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
<select id="countByOrdIdsAndType" resultType="java.lang.Long"> <select id="countByOrdIdsAndType" resultType="java.lang.Long">
SELECT count(*) from plat_bed pb LEFT JOIN plat_space ps ON pb.space_id = ps.id SELECT count(*) from plat_bed pb LEFT JOIN plat_space ps ON pb.space_id = ps.id
<where> <where>
ps.del_flag = 0 pb.del_flag = 0
<if test="orgIds != null and orgIds.size() > 0 "> <if test="orgIds != null and orgIds.size() > 0 ">
AND ps.org_id IN AND ps.org_id IN
<foreach collection="orgIds" item="item" separator="," open="(" close=")" index=""> <foreach collection="orgIds" item="item" separator="," open="(" close=")" index="">
......
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