Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
device-new-platform
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
赵啸非
device-new-platform
Commits
bd2e4d24
Commit
bd2e4d24
authored
Sep 23, 2024
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加巴中经开区windows shell
parent
921d79fb
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
37 additions
and
3647 deletions
+37
-3647
common-lib/src/main/java/com/mortals/xhx/common/pdu/site/SitePdu.java
...rc/main/java/com/mortals/xhx/common/pdu/site/SitePdu.java
+31
-3645
device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceAlarmInfoServiceImpl.java
...odule/device/service/impl/DeviceAlarmInfoServiceImpl.java
+3
-1
device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceStatServiceImpl.java
...xhx/module/device/service/impl/DeviceStatServiceImpl.java
+3
-1
No files found.
common-lib/src/main/java/com/mortals/xhx/common/pdu/site/SitePdu.java
View file @
bd2e4d24
This diff is collapsed.
Click to expand it.
device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceAlarmInfoServiceImpl.java
View file @
bd2e4d24
...
@@ -55,7 +55,9 @@ public class DeviceAlarmInfoServiceImpl extends AbstractCRUDServiceImpl<DeviceAl
...
@@ -55,7 +55,9 @@ public class DeviceAlarmInfoServiceImpl extends AbstractCRUDServiceImpl<DeviceAl
@Override
@Override
public
Rest
<
DeviceAlarmInfoEntity
>
alarmStats
(
DeviceAlarmInfoEntity
deviceAlarmInfo
,
Context
context
)
{
public
Rest
<
DeviceAlarmInfoEntity
>
alarmStats
(
DeviceAlarmInfoEntity
deviceAlarmInfo
,
Context
context
)
{
try
{
try
{
Rest
<
List
<
SitePdu
>>
rest
=
siteFeign
.
getFlatSitesBySiteId
(
new
SitePdu
().
id
(
deviceAlarmInfo
.
getSiteId
()));
SitePdu
sitePdu
=
new
SitePdu
();
sitePdu
.
setId
(
deviceAlarmInfo
.
getSiteId
());
Rest
<
List
<
SitePdu
>>
rest
=
siteFeign
.
getFlatSitesBySiteId
(
sitePdu
);
// Rest<RespData<List<SitePdu>>> rest = siteFeign.list(new SitePdu());
// Rest<RespData<List<SitePdu>>> rest = siteFeign.list(new SitePdu());
if
(
rest
.
getCode
()
==
YesNoEnum
.
NO
.
getValue
())
{
if
(
rest
.
getCode
()
==
YesNoEnum
.
NO
.
getValue
())
{
return
Rest
.
fail
(
"获取站点列表异常!"
);
return
Rest
.
fail
(
"获取站点列表异常!"
);
...
...
device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceStatServiceImpl.java
View file @
bd2e4d24
...
@@ -220,7 +220,9 @@ public class DeviceStatServiceImpl extends AbstractCRUDServiceImpl<DeviceStatDao
...
@@ -220,7 +220,9 @@ public class DeviceStatServiceImpl extends AbstractCRUDServiceImpl<DeviceStatDao
deviceStatEntity
.
setSiteTotalCount
(
list
.
size
());
deviceStatEntity
.
setSiteTotalCount
(
list
.
size
());
deviceStatEntity
.
setSiteAddCount
(
list
.
size
()
-
yesterdayDeviceStat
.
getSiteTotalCount
());
deviceStatEntity
.
setSiteAddCount
(
list
.
size
()
-
yesterdayDeviceStat
.
getSiteTotalCount
());
}
else
{
}
else
{
Rest
<
List
<
SitePdu
>>
resp
=
siteFeign
.
getFlatSitesBySiteId
(
new
SitePdu
().
id
(
siteId
));
SitePdu
sitePdu
=
new
SitePdu
();
sitePdu
.
setId
(
siteId
);
Rest
<
List
<
SitePdu
>>
resp
=
siteFeign
.
getFlatSitesBySiteId
(
sitePdu
);
if
(
resp
.
getCode
()
==
1
)
{
if
(
resp
.
getCode
()
==
1
)
{
List
<
SitePdu
>
sitePduList
=
resp
.
getData
();
List
<
SitePdu
>
sitePduList
=
resp
.
getData
();
deviceStatEntity
.
setSiteTotalCount
(
sitePduList
.
size
());
deviceStatEntity
.
setSiteTotalCount
(
sitePduList
.
size
());
...
...
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