Skip to content

黄嘉阳 / iot-platform-server

Go to a project
Commit 8394ca14 by 罗志长
Options

fix：区域设置固化

parent aa3f63ea
Inline Side-by-side
Showing with 52 additions and 34 deletions
server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderCoordinateRecordServiceImpl.java
...@@ -81,6 +81,11 @@ public class PlatElderCoordinateRecordServiceImpl extends ServiceImpl<PlatElderC ...@@ -81,6 +81,11 @@ public class PlatElderCoordinateRecordServiceImpl extends ServiceImpl<PlatElderC
Set<String> deviceIdSet = Sets.newHashSet(); Set<String> deviceIdSet = Sets.newHashSet();
List<PlatElderCoordinateRecord> list = Lists.newArrayList(); List<PlatElderCoordinateRecord> list = Lists.newArrayList();
for (PlatElderCoordinateVO vo : elderCoordinateVOList) { for (PlatElderCoordinateVO vo : elderCoordinateVOList) {
if (vo.getTimestamp() == null) {
// 过滤空数据
deviceIdSet.add(vo.getDeviceId());
continue;
}
platElderCoordinateRecord = new PlatElderCoordinateRecord(); platElderCoordinateRecord = new PlatElderCoordinateRecord();
BeanUtils.copyProperties(vo,platElderCoordinateRecord); BeanUtils.copyProperties(vo,platElderCoordinateRecord);
if (CollectionUtils.isNotEmpty(vo.getTrack())) { if (CollectionUtils.isNotEmpty(vo.getTrack())) {
...@@ -93,7 +98,6 @@ public class PlatElderCoordinateRecordServiceImpl extends ServiceImpl<PlatElderC ...@@ -93,7 +98,6 @@ public class PlatElderCoordinateRecordServiceImpl extends ServiceImpl<PlatElderC
platElderCoordinateRecord.setElderId(platElder.getId()); platElderCoordinateRecord.setElderId(platElder.getId());
platElderCoordinateRecord.setTenantId(platElder.getTenantId()); platElderCoordinateRecord.setTenantId(platElder.getTenantId());
list.add(platElderCoordinateRecord); list.add(platElderCoordinateRecord);
deviceIdSet.add(vo.getDeviceId());
} }
saveBatch(list); saveBatch(list);
......
server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderDayReportDayServiceImpl.java
...@@ -469,44 +469,58 @@ public class PlatElderDayReportDayServiceImpl implements PlatElderDayReportDaySe ...@@ -469,44 +469,58 @@ public class PlatElderDayReportDayServiceImpl implements PlatElderDayReportDaySe
platDeviceListSpace.forEach(e -> { platDeviceListSpace.forEach(e -> {
List<DeviceInfoContentSpace> spaceList = iotProductDeviceService.getDeviceLogByTimeRangeSpace(e.getOriDeviceId(), 24 * 3600, start, end); List<DeviceInfoContentSpace> spaceList = iotProductDeviceService.getDeviceLogByTimeRangeSpace(e.getOriDeviceId(), 24 * 3600, start, end);
if (CollectionUtils.isNotEmpty(spaceList)) {
voList.addAll(StreamUtil.map(spaceList, i -> { voList.addAll(StreamUtil.map(spaceList, i -> {
PlatElderCoordinateVO vo = new PlatElderCoordinateVO(); PlatElderCoordinateVO vo = new PlatElderCoordinateVO();
vo.setTimestamp(i.getTimestamp()); vo.setTimestamp(i.getTimestamp());
vo.setDistance(i.getProperties().getDistance()); vo.setDistance(i.getProperties().getDistance());
vo.setAngle(i.getProperties().getAngle()); vo.setAngle(i.getProperties().getAngle());
vo.setType(1); vo.setType(1);
vo.setPersonState(i.getProperties().getPersonState()); vo.setPersonState(i.getProperties().getPersonState());
vo.setMount(i.getProperties().getMount()); vo.setMount(i.getProperties().getMount());
vo.setDeviceId(e.getId()); vo.setDeviceId(e.getId());
vo.setOriDeviceId(e.getOriDeviceId()); vo.setOriDeviceId(e.getOriDeviceId());
return vo; return vo;
}) })
); );
} else {
// 没有上报数据也把设备返回
PlatElderCoordinateVO platElderCoordinateVO = new PlatElderCoordinateVO();
platElderCoordinateVO.setDeviceId(e.getId());
platElderCoordinateVO.setOriDeviceId(e.getOriDeviceId());
voList.add(platElderCoordinateVO);
}
}); });
platDeviceListFall.forEach(e -> { platDeviceListFall.forEach(e -> {
List<DeviceInfoContentFall> fallList = iotProductDeviceService.getDeviceLogByTimeRangeFall(e.getOriDeviceId(), 2 * 24 * 3600, start, end); List<DeviceInfoContentFall> fallList = iotProductDeviceService.getDeviceLogByTimeRangeFall(e.getOriDeviceId(), 2 * 24 * 3600, start, end);
if (CollectionUtils.isNotEmpty(fallList)) {
voList.addAll(StreamUtil.map(fallList, i -> { voList.addAll(StreamUtil.map(fallList, i -> {
PlatElderCoordinateVO vo = new PlatElderCoordinateVO(); PlatElderCoordinateVO vo = new PlatElderCoordinateVO();
vo.setTimestamp(i.getTimestamp()); vo.setTimestamp(i.getTimestamp());
vo.setTrack(i.getProperties().getTrack()); vo.setTrack(i.getProperties().getTrack());
vo.setDeviceId(e.getId()); vo.setDeviceId(e.getId());
vo.setType(2); vo.setType(2);
vo.setPersonState(i.getProperties().getPersonState()); vo.setPersonState(i.getProperties().getPersonState());
vo.setMount(i.getProperties().getMount()); vo.setMount(i.getProperties().getMount());
vo.setOriDeviceId(e.getOriDeviceId()); vo.setOriDeviceId(e.getOriDeviceId());
return vo; return vo;
}) })
); );
} else {
// 没有上报数据也把设备返回
PlatElderCoordinateVO platElderCoordinateVO = new PlatElderCoordinateVO();
platElderCoordinateVO.setDeviceId(e.getId());
platElderCoordinateVO.setOriDeviceId(e.getOriDeviceId());
voList.add(platElderCoordinateVO);
}
}); });
return voList; return voList;
......
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