Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
self-service
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
廖旭伟
self-service
Commits
66b7366a
Commit
66b7366a
authored
Aug 25, 2023
by
廖旭伟
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
数据汇聚接口只查询当前月份汇聚结果
parent
90eada26
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
7 deletions
+4
-7
sst-manager/src/main/java/com/mortals/xhx/module/converge/service/impl/ConvergeSiteServiceImpl.java
...module/converge/service/impl/ConvergeSiteServiceImpl.java
+4
-7
No files found.
sst-manager/src/main/java/com/mortals/xhx/module/converge/service/impl/ConvergeSiteServiceImpl.java
View file @
66b7366a
package
com.mortals.xhx.module.converge.service.impl
;
package
com.mortals.xhx.module.converge.service.impl
;
import
com.mortals.framework.common.Rest
;
import
com.mortals.framework.common.Rest
;
import
com.mortals.framework.util.DateUtils
;
import
com.mortals.xhx.common.pdu.RespData
;
import
com.mortals.xhx.common.pdu.RespData
;
import
com.mortals.xhx.common.pdu.device.DevicePdu
;
import
com.mortals.xhx.common.pdu.device.DevicePdu
;
import
com.mortals.xhx.common.pdu.site.SitePdu
;
import
com.mortals.xhx.common.pdu.site.SitePdu
;
...
@@ -65,16 +66,12 @@ public class ConvergeSiteServiceImpl extends AbstractCRUDServiceImpl<ConvergeSit
...
@@ -65,16 +66,12 @@ public class ConvergeSiteServiceImpl extends AbstractCRUDServiceImpl<ConvergeSit
ConvergeAppsQuery
appsQuery
=
new
ConvergeAppsQuery
();
ConvergeAppsQuery
appsQuery
=
new
ConvergeAppsQuery
();
appsQuery
.
setSiteId
(
deviceEntity
.
getSiteId
());
appsQuery
.
setSiteId
(
deviceEntity
.
getSiteId
());
appsQuery
.
setEquipmentId
(
deviceEntity
.
getId
());
appsQuery
.
setEquipmentId
(
deviceEntity
.
getId
());
Map
<
String
,
String
>
orderCols
=
new
HashMap
<>();
appsQuery
.
setStatYearMonth
(
DateUtils
.
getCurrDateTime
(
"yyyy-MM"
));
orderCols
.
put
(
"statYearMonth"
,
"desc"
);
appsQuery
.
setOrderCols
(
orderCols
);
List
<
ConvergeAppsEntity
>
apps
=
convergeAppsService
.
find
(
appsQuery
);
List
<
ConvergeAppsEntity
>
apps
=
convergeAppsService
.
find
(
appsQuery
);
if
(
CollectionUtils
.
isEmpty
(
apps
)){
if
(
CollectionUtils
.
isEmpty
(
apps
)){
continue
;
continue
;
}
}
List
<
ConvergeAppsEntity
>
appsNew
=
new
ArrayList
<>();
for
(
ConvergeAppsEntity
item:
apps
){
appsNew
.
add
(
apps
.
get
(
0
));
for
(
ConvergeAppsEntity
item:
appsNew
){
ConvergeAppsInterfaceEntity
query
=
new
ConvergeAppsInterfaceEntity
();
ConvergeAppsInterfaceEntity
query
=
new
ConvergeAppsInterfaceEntity
();
query
.
setEcode
(
deviceEntity
.
getLogo
());
query
.
setEcode
(
deviceEntity
.
getLogo
());
query
.
setApplicationId
(
item
.
getAppEname
());
query
.
setApplicationId
(
item
.
getAppEname
());
...
@@ -84,7 +81,7 @@ public class ConvergeSiteServiceImpl extends AbstractCRUDServiceImpl<ConvergeSit
...
@@ -84,7 +81,7 @@ public class ConvergeSiteServiceImpl extends AbstractCRUDServiceImpl<ConvergeSit
}
}
item
.
setInterfaceEntityList
(
interfaceEntityList
);
item
.
setInterfaceEntityList
(
interfaceEntityList
);
}
}
equipmentVO
.
setAppStats
(
convertAppVO
(
apps
New
));
equipmentVO
.
setAppStats
(
convertAppVO
(
apps
));
equipments
.
add
(
equipmentVO
);
equipments
.
add
(
equipmentVO
);
}
}
branchVO
.
setEquipments
(
equipments
);
branchVO
.
setEquipments
(
equipments
);
...
...
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