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
1cc695a9
authored
Sep 21, 2023
by
朱淼
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
fix bug
parent
f820623c
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
0 deletions
server-service/src/main/java/com/makeit/service/platform/workstation/impl/WorkStationServiceImpl.java
server-service/src/main/java/com/makeit/service/platform/workstation/impl/WorkStationServiceImpl.java
View file @
1cc695a9
...
@@ -36,6 +36,8 @@ import jodd.util.StringUtil;
...
@@ -36,6 +36,8 @@ import jodd.util.StringUtil;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
java.time.LocalDateTime
;
import
java.time.LocalTime
;
import
java.util.*
;
import
java.util.*
;
import
java.util.stream.Collectors
;
import
java.util.stream.Collectors
;
...
@@ -65,6 +67,12 @@ public class WorkStationServiceImpl implements WorkStationService {
...
@@ -65,6 +67,12 @@ public class WorkStationServiceImpl implements WorkStationService {
@Override
@Override
public
WorkStationInstitutionStatisticsVO
institutionStatistics
(
WorkStationQueryDTO
dto
)
{
public
WorkStationInstitutionStatisticsVO
institutionStatistics
(
WorkStationQueryDTO
dto
)
{
WorkStationInstitutionStatisticsVO
vo
=
new
WorkStationInstitutionStatisticsVO
();
WorkStationInstitutionStatisticsVO
vo
=
new
WorkStationInstitutionStatisticsVO
();
if
(
dto
.
getStartTime
()
==
null
){
dto
.
setStartTime
(
LocalDateTime
.
of
(
LocalDateTime
.
now
().
toLocalDate
(),
LocalTime
.
MIN
));
}
if
(
dto
.
getEndTime
()
==
null
){
dto
.
setEndTime
(
LocalDateTime
.
of
(
LocalDateTime
.
now
().
toLocalDate
(),
LocalTime
.
MAX
));
}
if
(
dto
.
getOrgIds
().
isEmpty
())
{
if
(
dto
.
getOrgIds
().
isEmpty
())
{
//获取该账号的权限组织
//获取该账号的权限组织
List
<
PlatOrg
>
orgs
=
belongToScopeList
(
PlatOrgEnum
.
OrgTypeEnum
.
INSTITUTION
.
getValue
());
List
<
PlatOrg
>
orgs
=
belongToScopeList
(
PlatOrgEnum
.
OrgTypeEnum
.
INSTITUTION
.
getValue
());
...
@@ -268,6 +276,12 @@ public class WorkStationServiceImpl implements WorkStationService {
...
@@ -268,6 +276,12 @@ public class WorkStationServiceImpl implements WorkStationService {
@Override
@Override
public
WorkStationHomeStatisticsVO
homeStatistics
(
WorkStationQueryDTO
dto
)
{
public
WorkStationHomeStatisticsVO
homeStatistics
(
WorkStationQueryDTO
dto
)
{
if
(
dto
.
getStartTime
()
==
null
){
dto
.
setStartTime
(
LocalDateTime
.
of
(
LocalDateTime
.
now
().
toLocalDate
(),
LocalTime
.
MIN
));
}
if
(
dto
.
getEndTime
()
==
null
){
dto
.
setEndTime
(
LocalDateTime
.
of
(
LocalDateTime
.
now
().
toLocalDate
(),
LocalTime
.
MAX
));
}
WorkStationHomeStatisticsVO
vo
=
new
WorkStationHomeStatisticsVO
();
WorkStationHomeStatisticsVO
vo
=
new
WorkStationHomeStatisticsVO
();
if
(
dto
.
getOrgIds
().
isEmpty
())
{
if
(
dto
.
getOrgIds
().
isEmpty
())
{
//获取该账号的权限组织
//获取该账号的权限组织
...
...
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