Commit 5c9d7b6e by huangjy

fix: 修复bug

parent 15a53ef6
...@@ -3,6 +3,7 @@ package com.makeit.service.platform.elder.impl; ...@@ -3,6 +3,7 @@ package com.makeit.service.platform.elder.impl;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.google.common.collect.Lists;
import com.makeit.common.entity.BaseEntity; import com.makeit.common.entity.BaseEntity;
import com.makeit.dto.platform.elder.PlatElderIdDTO; import com.makeit.dto.platform.elder.PlatElderIdDTO;
import com.makeit.entity.platform.device.PlatDevice; import com.makeit.entity.platform.device.PlatDevice;
...@@ -13,6 +14,7 @@ import com.makeit.module.iot.enums.DeviceInfoContentFallEnum; ...@@ -13,6 +14,7 @@ import com.makeit.module.iot.enums.DeviceInfoContentFallEnum;
import com.makeit.module.iot.enums.DeviceInfoContentSpaceEnum; import com.makeit.module.iot.enums.DeviceInfoContentSpaceEnum;
import com.makeit.module.iot.enums.DeviceState; import com.makeit.module.iot.enums.DeviceState;
import com.makeit.module.iot.service.IotProductDeviceService; import com.makeit.module.iot.service.IotProductDeviceService;
import com.makeit.module.iot.vo.DeviceInfo;
import com.makeit.module.iot.vo.breathe.DeviceInfoContentBreathe; import com.makeit.module.iot.vo.breathe.DeviceInfoContentBreathe;
import com.makeit.module.iot.vo.fall.DeviceInfoContentFall; import com.makeit.module.iot.vo.fall.DeviceInfoContentFall;
import com.makeit.module.iot.vo.space.DeviceInfoContentSpace; import com.makeit.module.iot.vo.space.DeviceInfoContentSpace;
...@@ -532,7 +534,7 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService { ...@@ -532,7 +534,7 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService {
JSONObject jsonObject = JSON.parseObject(spaceResult); JSONObject jsonObject = JSON.parseObject(spaceResult);
vo.setDeviceId(platDevice.getId()); vo.setDeviceId(platDevice.getId());
vo.setOriDeviceId(platDevice.getOriDeviceId()); vo.setOriDeviceId(platDevice.getOriDeviceId());
vo.setTrack((List<Integer>) jsonObject.get("track")); //vo.setTrack((List<Integer>) jsonObject.get("track"));
voList.add(vo); voList.add(vo);
} }
} }
...@@ -540,8 +542,6 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService { ...@@ -540,8 +542,6 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService {
return voList; return voList;
} }
int count = 20; int count = 20;
for (PlatDevice platDevice : deviceListSpace) { for (PlatDevice platDevice : deviceListSpace) {
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
...@@ -606,6 +606,5 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService { ...@@ -606,6 +606,5 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService {
} }
} }
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