Commit 841533df authored by xinglei's avatar xinglei

*)发生告警更新修改时间

parent 677f45e8
...@@ -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 {
......
...@@ -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 {
//不存在,判断当前状态是不是合格,不合格新增,合格不做任何操作 //不存在,判断当前状态是不是合格,不合格新增,合格不做任何操作
......
...@@ -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())){
......
...@@ -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
......
...@@ -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
......
...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment