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
197c7d4d
Commit
197c7d4d
authored
Jun 22, 2020
by
zhengjiangtao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bug
parent
9dcc751c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
3 deletions
+7
-3
AlarmConstant.java
...n/java/com/yeejoin/amos/bank/constants/AlarmConstant.java
+2
-0
ShiduAlarmWebSocketClient.java
...eejoin/amos/bank/webSocket/ShiduAlarmWebSocketClient.java
+5
-3
No files found.
AmosBankService/src/main/java/com/yeejoin/amos/bank/constants/AlarmConstant.java
View file @
197c7d4d
...
...
@@ -14,4 +14,6 @@ public class AlarmConstant {
public
static
String
ALARM_NORMAL_STATUS
=
"清除"
;
public
static
String
ALARM_ABNORMAL_STATUS
=
"告警"
;
public
static
String
ALARM_DEVICE
=
"警告告警"
;
public
static
String
ALARM_DEVICE_TYPE
=
"监测设备告警"
;
public
static
String
ALARM_DEVICE_AlARAM
=
"监测异常"
;
}
AmosBankService/src/main/java/com/yeejoin/amos/bank/webSocket/ShiduAlarmWebSocketClient.java
View file @
197c7d4d
...
...
@@ -7,6 +7,8 @@ import static com.yeejoin.amos.bank.constants.AlarmConstant.ALARM_NORMAL_STATUS;
import
static
com
.
yeejoin
.
amos
.
bank
.
constants
.
AlarmConstant
.
ALARM_TYPE
;
import
static
com
.
yeejoin
.
amos
.
bank
.
constants
.
AlarmConstant
.
CLEAR_PERSON
;
import
static
com
.
yeejoin
.
amos
.
bank
.
constants
.
AlarmConstant
.
ALARM_DEVICE
;
import
static
com
.
yeejoin
.
amos
.
bank
.
constants
.
AlarmConstant
.
ALARM_DEVICE_TYPE
;
import
static
com
.
yeejoin
.
amos
.
bank
.
constants
.
AlarmConstant
.
ALARM_DEVICE_AlARAM
;
import
java.io.IOException
;
...
...
@@ -264,11 +266,11 @@ public class ShiduAlarmWebSocketClient extends WebSocketClient {
}
else
{
//记录无告警则新增
Alarm
alarm
=
new
Alarm
();
alarm
.
setSourceId
(
sourceId
);
alarm
.
setAlarmReason
(
cpblName
);
alarm
.
setAlarmReason
(
ALARM_DEVICE_AlARAM
);
alarm
.
setAlarmSourceName
(
eqpName
);
alarm
.
setAlarmLevel
(
ALARM_DEVICE
);
alarm
.
setAlarmSourceIp
(
sourceId
);
alarm
.
setAlarmSourceType
(
ALARM_TYPE
);
//
alarm.setAlarmSourceIp(sourceId);
alarm
.
setAlarmSourceType
(
ALARM_
DEVICE_
TYPE
);
alarm
.
setClearDate
(
""
);
alarm
.
setContinueDate
(
""
);
alarm
.
setEnsureDate
(
""
);
...
...
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