Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
项目统一框架
amos-boot-biz
Commits
0966861c
Commit
0966861c
authored
Mar 17, 2023
by
高建强
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
item:修改启停间隔,redis数据失效统计bug
parent
e996f7ee
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
EmergencyServiceImpl.java
...eejoin/equipmanage/service/impl/EmergencyServiceImpl.java
+1
-1
PressurePumpServiceImpl.java
...oin/equipmanage/service/impl/PressurePumpServiceImpl.java
+1
-1
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EmergencyServiceImpl.java
View file @
0966861c
...
@@ -547,7 +547,7 @@ public class EmergencyServiceImpl implements IEmergencyService {
...
@@ -547,7 +547,7 @@ public class EmergencyServiceImpl implements IEmergencyService {
}
}
}
}
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
log
.
error
(
"getPressurePumpStatusChart-->获取稳压泵启停状态图失败:{}"
,
e
.
getMessage
());
log
.
error
(
"getPressurePumpStatus
Detail
Chart-->获取稳压泵启停状态图失败:{}"
,
e
.
getMessage
());
}
}
return
map
;
return
map
;
}
}
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/PressurePumpServiceImpl.java
View file @
0966861c
...
@@ -198,7 +198,7 @@ public class PressurePumpServiceImpl implements IPressurePumpService {
...
@@ -198,7 +198,7 @@ public class PressurePumpServiceImpl implements IPressurePumpService {
dataList
=
getIotData
(
pumpInfoList
,
top
,
nameKey
);
dataList
=
getIotData
(
pumpInfoList
,
top
,
nameKey
);
}
}
}
else
{
}
else
{
if
(
ObjectUtils
.
isEmpty
(
dataList
)
||
ObjectUtils
.
isEmpty
(
dataListFilterTrue
)
||
ObjectUtils
.
isEmpty
(
dataListFilterFalse
))
{
if
(
ObjectUtils
.
isEmpty
(
dataList
)
||
ObjectUtils
.
isEmpty
(
dataListFilterTrue
)
||
ObjectUtils
.
isEmpty
(
dataListFilterFalse
)
||
dataListFilterTrue
.
size
()
<
2
)
{
dataList
=
getIotData
(
pumpInfoList
,
top
,
nameKey
);
dataList
=
getIotData
(
pumpInfoList
,
top
,
nameKey
);
dataListFilterTrue
=
getDataListFilter
(
dataList
,
PressurePumpRelateEnum
.
IOT_INDEX_VALUE_TRUE
.
getValue
());
dataListFilterTrue
=
getDataListFilter
(
dataList
,
PressurePumpRelateEnum
.
IOT_INDEX_VALUE_TRUE
.
getValue
());
dataListFilterFalse
=
getDataListFilter
(
dataList
,
PressurePumpRelateEnum
.
IOT_INDEX_VALUE_FALSE
.
getValue
());
dataListFilterFalse
=
getDataListFilter
(
dataList
,
PressurePumpRelateEnum
.
IOT_INDEX_VALUE_FALSE
.
getValue
());
...
...
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