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
606a1325
Commit
606a1325
authored
Oct 19, 2022
by
tianyiming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
25354746
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
SupervisionConfigureController.java
...quipmanage/controller/SupervisionConfigureController.java
+5
-1
FireFightingSystemMapper.xml
...ip/src/main/resources/mapper/FireFightingSystemMapper.xml
+2
-1
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/SupervisionConfigureController.java
View file @
606a1325
...
@@ -328,7 +328,11 @@ public class SupervisionConfigureController extends AbstractBaseController {
...
@@ -328,7 +328,11 @@ public class SupervisionConfigureController extends AbstractBaseController {
boolean
time
=
false
;
boolean
time
=
false
;
if
(!
ObjectUtils
.
isEmpty
(
stateMap
)
&&
stateMap
.
containsKey
(
"update_date"
)
&&
stateMap
.
containsKey
(
"equipment_index_name"
))
{
if
(!
ObjectUtils
.
isEmpty
(
stateMap
)
&&
stateMap
.
containsKey
(
"update_date"
)
&&
stateMap
.
containsKey
(
"equipment_index_name"
))
{
item
.
put
(
"update_time"
,
String
.
valueOf
(
stateMap
.
get
(
"update_date"
)).
replaceAll
(
"T"
,
" "
));
item
.
put
(
"update_time"
,
String
.
valueOf
(
stateMap
.
get
(
"update_date"
)).
replaceAll
(
"T"
,
" "
));
item
.
put
(
"equipment_index_name"
,
stateMap
.
get
(
"equipment_index_name"
));
if
(!
ObjectUtils
.
isEmpty
(
stateMap
.
get
(
"value"
))){
item
.
put
(
"equipment_index_name"
,
stateMap
.
get
(
"equipment_index_name"
));
}
else
{
item
.
put
(
"equipment_index_name"
,
"无信号"
);
}
if
(
"启动"
.
equals
(
stateMap
.
get
(
"equipment_index_name"
)))
{
if
(
"启动"
.
equals
(
stateMap
.
get
(
"equipment_index_name"
)))
{
long
update_time
=
0L
;
long
update_time
=
0L
;
try
{
try
{
...
...
amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml
View file @
606a1325
...
@@ -2805,7 +2805,8 @@
...
@@ -2805,7 +2805,8 @@
<select
id=
"queryPressureNowStateBySpecificId"
resultType=
"java.util.Map"
>
<select
id=
"queryPressureNowStateBySpecificId"
resultType=
"java.util.Map"
>
SELECT
SELECT
i.update_date,
i.update_date,
i.equipment_index_name
i.equipment_index_name,
value
FROM
FROM
wl_equipment_specific_index i
wl_equipment_specific_index i
WHERE
WHERE
...
...
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