Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
黄嘉阳
/
iot-platform-server
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
485fdf5c
authored
Oct 10, 2023
by
huangjy
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
fix:行为记录先造数据
parent
cb64927e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
2 deletions
server-service/src/main/java/com/makeit/service/platform/elder/PlatElderDayReportDayService.java
server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderDayReportDayServiceImpl.java
server-service/src/main/java/com/makeit/service/platform/elder/PlatElderDayReportDayService.java
View file @
485fdf5c
...
@@ -49,4 +49,5 @@ public interface PlatElderDayReportDayService {
...
@@ -49,4 +49,5 @@ public interface PlatElderDayReportDayService {
List
<
PlatElderBehaviorDistributionVO
>
behaviorDistribution
(
PlatElderReportDTO
platElderIdDTO
);
List
<
PlatElderBehaviorDistributionVO
>
behaviorDistribution
(
PlatElderReportDTO
platElderIdDTO
);
void
elderCoordinateListAnalysisTask
();
}
}
server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderDayReportDayServiceImpl.java
View file @
485fdf5c
...
@@ -26,6 +26,7 @@ import com.makeit.utils.time.LocalDateTimeUtils;
...
@@ -26,6 +26,7 @@ import com.makeit.utils.time.LocalDateTimeUtils;
import
com.makeit.vo.platform.elder.realtime.PlatElderCoordinateVO
;
import
com.makeit.vo.platform.elder.realtime.PlatElderCoordinateVO
;
import
com.makeit.vo.platform.elder.realtime.PlatElderRealTimeHeartRespiratoryVO
;
import
com.makeit.vo.platform.elder.realtime.PlatElderRealTimeHeartRespiratoryVO
;
import
com.makeit.vo.platform.elder.report.day.*
;
import
com.makeit.vo.platform.elder.report.day.*
;
import
org.apache.commons.lang3.RandomUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
...
@@ -353,6 +354,11 @@ public class PlatElderDayReportDayServiceImpl implements PlatElderDayReportDaySe
...
@@ -353,6 +354,11 @@ public class PlatElderDayReportDayServiceImpl implements PlatElderDayReportDaySe
}
}
@Override
@Override
public
void
elderCoordinateListAnalysisTask
()
{
}
@Override
public
List
<
PlatElderCoordinateVO
>
coordinateList
(
String
elderId
,
String
deviceId
,
LocalDateTime
start
,
LocalDateTime
end
)
{
public
List
<
PlatElderCoordinateVO
>
coordinateList
(
String
elderId
,
String
deviceId
,
LocalDateTime
start
,
LocalDateTime
end
)
{
List
<
PlatDevice
>
platDeviceList
=
platElderRealTimeService
.
getSpaceDevice
(
elderId
,
deviceId
);
List
<
PlatDevice
>
platDeviceList
=
platElderRealTimeService
.
getSpaceDevice
(
elderId
,
deviceId
);
...
@@ -362,8 +368,27 @@ public class PlatElderDayReportDayServiceImpl implements PlatElderDayReportDaySe
...
@@ -362,8 +368,27 @@ public class PlatElderDayReportDayServiceImpl implements PlatElderDayReportDaySe
List
<
PlatElderCoordinateVO
>
voList
=
new
ArrayList
<>(
10
);
List
<
PlatElderCoordinateVO
>
voList
=
new
ArrayList
<>(
10
);
int
count
=
20
;
for
(
PlatDevice
platDevice
:
platDeviceList
)
{
for
(
int
i
=
0
;
i
<
count
;
i
++)
{
PlatElderCoordinateVO
vo
=
new
PlatElderCoordinateVO
();
int
distance
=
RandomUtils
.
nextInt
(
0
,
1000
);
int
angle
=
RandomUtils
.
nextInt
(
0
,
60
)
-
120
;
vo
.
setX
(
new
BigDecimal
(
distance
).
multiply
(
new
BigDecimal
(
Math
.
cos
(
angle
)
+
""
)).
setScale
(
2
,
RoundingMode
.
HALF_UP
));
vo
.
setY
(
new
BigDecimal
(
distance
).
multiply
(
new
BigDecimal
(
Math
.
sin
(
angle
)
+
""
)).
setScale
(
2
,
RoundingMode
.
HALF_UP
));
vo
.
setDistance
(
distance
);
vo
.
setAngle
(
angle
);
vo
.
setDeviceId
(
platDevice
.
getId
());
vo
.
setOriDeviceId
(
platDevice
.
getOriDeviceId
());
voList
.
add
(
vo
);
}
}
/*
platDeviceList.forEach(e -> {
platDeviceList.forEach(e -> {
List
<
DeviceInfoContentSpace
>
spaceList
=
iotProductDeviceService
.
getDeviceLogByTimeRangeSpace
(
e
.
getOriDeviceId
(),
2
*
2
4
*
3600
,
start
,
end
);
List<DeviceInfoContentSpace> spaceList = iotProductDeviceService.getDeviceLogByTimeRangeSpace(e.getOriDeviceId(), 24 * 3600, start, end);
voList.addAll(StreamUtil.map(spaceList, i -> {
voList.addAll(StreamUtil.map(spaceList, i -> {
...
@@ -382,7 +407,7 @@ public class PlatElderDayReportDayServiceImpl implements PlatElderDayReportDaySe
...
@@ -382,7 +407,7 @@ public class PlatElderDayReportDayServiceImpl implements PlatElderDayReportDaySe
})
})
);
);
});
});
*/
return
voList
;
return
voList
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment