Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
AmosBankRoot
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
1
Merge Requests
1
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
bank
AmosBankRoot
Commits
b3b0d42a
Commit
b3b0d42a
authored
Jun 12, 2020
by
zhengjiangtao
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop_20200601' of
http://172.16.10.76/bank/AmosBankRoot
into develop_20200601
parents
856d1996
2f59ebad
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
EquipmentListener.java
.../java/com/yeejoin/amos/bank/config/EquipmentListener.java
+1
-1
No files found.
AmosBankService/src/main/java/com/yeejoin/amos/bank/config/EquipmentListener.java
View file @
b3b0d42a
...
@@ -357,7 +357,7 @@ public class EquipmentListener extends EmqxListener implements InitializingBean
...
@@ -357,7 +357,7 @@ public class EquipmentListener extends EmqxListener implements InitializingBean
alarmPoint1
.
setUpdateDate
(
new
Date
());
alarmPoint1
.
setUpdateDate
(
new
Date
());
alarmPoint1
.
setIsAlarm
(
1
);
// 不合格
alarmPoint1
.
setIsAlarm
(
1
);
// 不合格
alarmPoint1
.
setContent
(
eqpName
+
"-"
+
ipAddress
+
","
+
ALARM_CAUSE
);
alarmPoint1
.
setContent
(
eqpName
+
"-"
+
ipAddress
+
","
+
ALARM_CAUSE
);
alarmPoint1
.
setCode
(
orgCode
);
alarmPoint1
.
setPointName
(
eqpName
);
alarmPoint1
.
setPointName
(
eqpName
);
alarmPoint1
.
setAuthOrg
(
orgCode
);
alarmPoint1
.
setAuthOrg
(
orgCode
);
Map
<
String
,
Object
>
map
=
new
HashMap
<>();
Map
<
String
,
Object
>
map
=
new
HashMap
<>();
...
...
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