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 | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/SysWarningServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/SysWarningServiceImpl.java
index 4a51065..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) {
@@ -83,10 +83,10 @@
params.put("id", selectedWarning.getId());
//给大屏信息发送处理信息
//页面只允许修改完成转台
- if (StringUtils.isNotBlank(selectedWarning.getAlarmId()) && StringUtils.isNotBlank(alarmUrl)){
+ 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");
--
Gitblit v1.9.2