From 47a751cb301d05276ae5d75145d57b2d090fe4e1 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期一, 01 七月 2024 10:58:35 +0800
Subject: [PATCH] change
---
src/main/java/com/nanometer/smartlab/service/SysWarningServiceImpl.java | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/SysWarningServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/SysWarningServiceImpl.java
index 55bc3da..210c373 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysWarningServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysWarningServiceImpl.java
@@ -65,7 +65,7 @@
}
@Override
- public SysWarning getSysWarning(String id) {
+ public SysWarning getSysWarning(Long id) {
try {
return this.sysWarningDao.getSysWarning(id);
} catch (DataAccessException e) {
@@ -76,7 +76,6 @@
@Override
public void updateSysWarning(SysWarning selectedWarning) throws IOException {
-
try {
Map<String,Object> params = new HashMap<>();
params.put("memo", selectedWarning.getMemo());
@@ -84,10 +83,10 @@
params.put("id", selectedWarning.getId());
//给大屏信息发送处理信息
//页面只允许修改完成转台
- if (StringUtils.isNotBlank(selectedWarning.getAlarmId())){
+ if (selectedWarning.getDapingAlarmId()!=null && StringUtils.isNotBlank(alarmUrl)){
JSONObject json=new JSONObject();
json.put("dataType", "data");
- json.put("id", selectedWarning.getAlarmId());
+ json.put("id", selectedWarning.getDapingAlarmId());
CloseableHttpClient client2 = HttpClients.createDefault();
HttpPost post2 = new HttpPost(alarmUrl);
post2.setHeader("Content-Type", "application/json;charset=UTF-8");
@@ -102,8 +101,7 @@
}else{
logger.info("关联daping的告警id为空 ");
}
- this.sysWarningDao.updateSysWarning(params);
-
+ this.sysWarningDao.updateSysWarning(params);
} catch (DataAccessException e) {
logger.error(e.getMessage(), e);
throw new BusinessException(ExceptionEnumCode.DB_ERR, MessageUtil.getMessageByCode(ExceptionEnumCode.DB_ERR.getCode()), e);
--
Gitblit v1.9.2