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
841533df
Commit
841533df
authored
Sep 01, 2020
by
xinglei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
*)发生告警更新修改时间
parent
677f45e8
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
16 additions
and
5 deletions
+16
-5
EquipmentListener.java
.../java/com/yeejoin/amos/bank/config/EquipmentListener.java
+4
-0
SelfSupportListener.java
...ava/com/yeejoin/amos/bank/config/SelfSupportListener.java
+4
-0
ProtalDataController.java
...in/amos/spc/business/controller/ProtalDataController.java
+5
-2
application-dev.properties
AmosBankStart/src/main/resources/application-dev.properties
+1
-1
application-prod.properties
AmosBankStart/src/main/resources/application-prod.properties
+1
-1
application-test.properties
AmosBankStart/src/main/resources/application-test.properties
+1
-1
No files found.
AmosBankService/src/main/java/com/yeejoin/amos/bank/config/EquipmentListener.java
View file @
841533df
...
@@ -350,6 +350,10 @@ public class EquipmentListener extends EmqxListener implements InitializingBean
...
@@ -350,6 +350,10 @@ public class EquipmentListener extends EmqxListener implements InitializingBean
// 删除告警
// 删除告警
alarmPointService
.
delete
(
alarmPoint
.
get
(
0
));
alarmPointService
.
delete
(
alarmPoint
.
get
(
0
));
amosWsService
.
pushAlarmPoint
(
"alarmPoint"
,
alarmPointService
.
findAll
());
amosWsService
.
pushAlarmPoint
(
"alarmPoint"
,
alarmPointService
.
findAll
());
}
else
{
AlarmPoint
alarmPoint1
=
alarmPoint
.
get
(
0
);
alarmPoint1
.
setUpdateDate
(
new
Date
());
alarmPointService
.
save
(
alarmPoint1
);
}
}
return
;
return
;
}
else
{
}
else
{
...
...
AmosBankService/src/main/java/com/yeejoin/amos/bank/config/SelfSupportListener.java
View file @
841533df
...
@@ -212,6 +212,10 @@ public class SelfSupportListener extends EmqxListener implements InitializingBea
...
@@ -212,6 +212,10 @@ public class SelfSupportListener extends EmqxListener implements InitializingBea
//删除告警
//删除告警
alarmPointService
.
delete
(
alarmPoint
.
get
(
0
));
alarmPointService
.
delete
(
alarmPoint
.
get
(
0
));
amosWsService
.
pushAlarmPoint
(
"alarmPoint"
,
alarmPointService
.
findAll
());
amosWsService
.
pushAlarmPoint
(
"alarmPoint"
,
alarmPointService
.
findAll
());
}
else
{
AlarmPoint
alarmPoint1
=
alarmPoint
.
get
(
0
);
alarmPoint1
.
setUpdateDate
(
new
Date
());
alarmPointService
.
save
(
alarmPoint1
);
}
}
}
else
{
}
else
{
//不存在,判断当前状态是不是合格,不合格新增,合格不做任何操作
//不存在,判断当前状态是不是合格,不合格新增,合格不做任何操作
...
...
AmosBankService/src/main/java/com/yeejoin/amos/spc/business/controller/ProtalDataController.java
View file @
841533df
...
@@ -76,8 +76,11 @@ public class ProtalDataController extends BaseController {
...
@@ -76,8 +76,11 @@ public class ProtalDataController extends BaseController {
//删除告警
//删除告警
//alarmPointService.delete(alarmPoint.get(0).getId()+"");
//alarmPointService.delete(alarmPoint.get(0).getId()+"");
alarmPointService
.
delete
(
alarmPoint
.
get
(
0
));
alarmPointService
.
delete
(
alarmPoint
.
get
(
0
));
}
else
{
//更新时间
}
AlarmPoint
alarmPoint1
=
alarmPoint
.
get
(
0
);
alarmPoint1
.
setUpdateDate
(
new
Date
());
alarmPointService
.
save
(
alarmPoint1
);
}
}
else
{
}
else
{
//不存在,判断当前状态是不是合格,不合格新增,合格不做任何操作
//不存在,判断当前状态是不是合格,不合格新增,合格不做任何操作
if
(!
"1"
.
equals
(
date
.
getExecuteStatus
())){
if
(!
"1"
.
equals
(
date
.
getExecuteStatus
())){
...
...
AmosBankStart/src/main/resources/application-dev.properties
View file @
841533df
...
@@ -10,7 +10,7 @@ eureka.client.fetchRegistry = true
...
@@ -10,7 +10,7 @@ eureka.client.fetchRegistry = true
ribbon.eureka.enabled
=
true
ribbon.eureka.enabled
=
true
#DB properties:
#DB properties:
spring.datasource.url
=
jdbc:mysql://172.16.10.66:3306/amos_xian_bank?useUnicode=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=
UTC
spring.datasource.url
=
jdbc:mysql://172.16.10.66:3306/amos_xian_bank?useUnicode=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=
GMT%2b8
spring.datasource.username
=
root
spring.datasource.username
=
root
spring.datasource.password
=
root_123
spring.datasource.password
=
root_123
spring.datasource.driver-class-name
=
com.mysql.jdbc.Driver
spring.datasource.driver-class-name
=
com.mysql.jdbc.Driver
...
...
AmosBankStart/src/main/resources/application-prod.properties
View file @
841533df
...
@@ -17,7 +17,7 @@ eureka.instance.status-page-url=http://172.16.11.20:${server.port}/actuator/info
...
@@ -17,7 +17,7 @@ eureka.instance.status-page-url=http://172.16.11.20:${server.port}/actuator/info
#DB properties:
#DB properties:
spring.datasource.url
=
jdbc:mysql://172.16.10.66:3306/amos_xian_bank? useUnicode=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=
UTC
spring.datasource.url
=
jdbc:mysql://172.16.10.66:3306/amos_xian_bank? useUnicode=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=
GMT%2b8
spring.datasource.username
=
root
spring.datasource.username
=
root
spring.datasource.password
=
root_123
spring.datasource.password
=
root_123
spring.datasource.driver-class-name
=
com.mysql.jdbc.Driver
spring.datasource.driver-class-name
=
com.mysql.jdbc.Driver
...
...
AmosBankStart/src/main/resources/application-test.properties
View file @
841533df
...
@@ -17,7 +17,7 @@ eureka.instance.status-page-url=http://172.16.10.99:${server.port}/actuator/info
...
@@ -17,7 +17,7 @@ eureka.instance.status-page-url=http://172.16.10.99:${server.port}/actuator/info
#DB properties:
#DB properties:
spring.datasource.url
=
jdbc:mysql://172.16.10.66:3306/amos_xian_bank? useUnicode=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=
UTC
spring.datasource.url
=
jdbc:mysql://172.16.10.66:3306/amos_xian_bank? useUnicode=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=
GMT%2b8
spring.datasource.username
=
root
spring.datasource.username
=
root
spring.datasource.password
=
root_123
spring.datasource.password
=
root_123
spring.datasource.driver-class-name
=
com.mysql.jdbc.Driver
spring.datasource.driver-class-name
=
com.mysql.jdbc.Driver
...
...
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