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
946d14a0
authored
Jan 15, 2024
by
罗志长
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
demo:工作台统计
parent
214aae5d
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
43 additions
and
0 deletions
server-service/src/main/java/com/makeit/service/platform/workstation/impl/WorkStationServiceImpl.java
server-service/src/main/java/com/makeit/vo/platform/workstation/WorkStationHomeStatisticsVO.java
server-service/src/main/java/com/makeit/service/platform/workstation/impl/WorkStationServiceImpl.java
View file @
946d14a0
...
@@ -15,6 +15,7 @@ import com.makeit.entity.platform.auth.PlatOrg;
...
@@ -15,6 +15,7 @@ import com.makeit.entity.platform.auth.PlatOrg;
import
com.makeit.entity.platform.device.PlatDevice
;
import
com.makeit.entity.platform.device.PlatDevice
;
import
com.makeit.entity.platform.elder.PlatElder
;
import
com.makeit.entity.platform.elder.PlatElder
;
import
com.makeit.entity.platform.space.PlatBed
;
import
com.makeit.entity.platform.space.PlatBed
;
import
com.makeit.entity.platform.space.PlatRoom
;
import
com.makeit.entity.platform.space.PlatRoomBedDevice
;
import
com.makeit.entity.platform.space.PlatRoomBedDevice
;
import
com.makeit.entity.platform.space.PlatSpace
;
import
com.makeit.entity.platform.space.PlatSpace
;
import
com.makeit.entity.saas.analysis.SaasModelManage
;
import
com.makeit.entity.saas.analysis.SaasModelManage
;
...
@@ -23,6 +24,7 @@ import com.makeit.enums.platform.alarm.PlatAlarmConfigEnum;
...
@@ -23,6 +24,7 @@ import com.makeit.enums.platform.alarm.PlatAlarmConfigEnum;
import
com.makeit.enums.platform.alarm.PlatAlarmRecordEnum
;
import
com.makeit.enums.platform.alarm.PlatAlarmRecordEnum
;
import
com.makeit.enums.platform.auth.PlatOrgEnum
;
import
com.makeit.enums.platform.auth.PlatOrgEnum
;
import
com.makeit.enums.platform.space.PlatBedStatusEnum
;
import
com.makeit.enums.platform.space.PlatBedStatusEnum
;
import
com.makeit.enums.platform.space.PlatSpaceEnum
;
import
com.makeit.enums.platform.workstation.PlatAlarmRecordType
;
import
com.makeit.enums.platform.workstation.PlatAlarmRecordType
;
import
com.makeit.enums.platform.workstation.WorkStationStatusEnum
;
import
com.makeit.enums.platform.workstation.WorkStationStatusEnum
;
import
com.makeit.enums.saas.ModelManageTypeEnum
;
import
com.makeit.enums.saas.ModelManageTypeEnum
;
...
@@ -496,10 +498,39 @@ public class WorkStationServiceImpl implements WorkStationService {
...
@@ -496,10 +498,39 @@ public class WorkStationServiceImpl implements WorkStationService {
.
between
(
PlatAlarmRecord:
:
getDealDate
,
dto
.
getStartTime
(),
dto
.
getEndTime
())
.
between
(
PlatAlarmRecord:
:
getDealDate
,
dto
.
getStartTime
(),
dto
.
getEndTime
())
.
in
(
PlatAlarmRecord:
:
getOrgId
,
dto
.
getOrgIds
()));
.
in
(
PlatAlarmRecord:
:
getOrgId
,
dto
.
getOrgIds
()));
long
communityNumber
=
0
;
long
buildingNumber
=
0
;
long
unitNumber
=
0
;
long
floorNumber
=
0
;
List
<
PlatSpace
>
spaces
=
platSpaceService
.
list
(
new
QueryWrapper
<
PlatSpace
>().
lambda
().
in
(
PlatSpace:
:
getOrgId
,
dto
.
getOrgIds
()));
for
(
PlatSpace
space
:
spaces
)
{
if
(
PlatSpaceEnum
.
TypeEnum
.
COMMUNITY
.
getValue
().
equals
(
space
.
getType
()))
{
communityNumber
++;
}
if
(
PlatSpaceEnum
.
TypeEnum
.
BUILDING
.
getValue
().
equals
(
space
.
getType
()))
{
buildingNumber
++;
}
if
(
PlatSpaceEnum
.
TypeEnum
.
UNIT
.
getValue
().
equals
(
space
.
getType
()))
{
unitNumber
++;
}
if
(
PlatSpaceEnum
.
TypeEnum
.
FLOOR
.
getValue
().
equals
(
space
.
getType
()))
{
floorNumber
++;
}
}
List
<
String
>
spaceIds
=
StreamUtil
.
map
(
spaces
,
PlatSpace:
:
getId
);
long
roomNumber
=
platRoomService
.
count
(
new
QueryWrapper
<
PlatRoom
>().
lambda
().
in
(
PlatRoom:
:
getSpaceId
,
spaceIds
));
long
bedNumber
=
platBedService
.
count
(
new
QueryWrapper
<
PlatBed
>().
lambda
().
in
(
PlatBed:
:
getSpaceId
,
spaceIds
));
vo
.
setAlarmNumber
(
alarmNumber
);
vo
.
setAlarmNumber
(
alarmNumber
);
vo
.
setUnHandledNumber
(
unHandledNumber
);
vo
.
setUnHandledNumber
(
unHandledNumber
);
vo
.
setElderNumber
(
elderNumber
);
vo
.
setElderNumber
(
elderNumber
);
vo
.
setHandledNumber
(
handledNumber
);
vo
.
setHandledNumber
(
handledNumber
);
vo
.
setCommunityNumber
(
communityNumber
);
vo
.
setBuildingNumber
(
buildingNumber
);
vo
.
setUnitNumber
(
unitNumber
);
vo
.
setFloorNumber
(
floorNumber
);
vo
.
setRoomNumber
(
roomNumber
);
vo
.
setBedNumber
(
bedNumber
);
return
vo
;
return
vo
;
}
}
...
...
server-service/src/main/java/com/makeit/vo/platform/workstation/WorkStationHomeStatisticsVO.java
View file @
946d14a0
...
@@ -22,4 +22,16 @@ public class WorkStationHomeStatisticsVO {
...
@@ -22,4 +22,16 @@ public class WorkStationHomeStatisticsVO {
private
Long
handledNumber
;
private
Long
handledNumber
;
@ApiModelProperty
(
value
=
"长者数"
)
@ApiModelProperty
(
value
=
"长者数"
)
private
Long
elderNumber
;
private
Long
elderNumber
;
@ApiModelProperty
(
value
=
"小区数"
)
private
Long
communityNumber
;
@ApiModelProperty
(
value
=
"楼栋数"
)
private
Long
buildingNumber
;
@ApiModelProperty
(
value
=
"单元数"
)
private
Long
unitNumber
;
@ApiModelProperty
(
value
=
"楼层数"
)
private
Long
floorNumber
;
@ApiModelProperty
(
value
=
"房间数"
)
private
Long
roomNumber
;
@ApiModelProperty
(
value
=
"床位数"
)
private
Long
bedNumber
;
}
}
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