From 4d1a47dc38120559b6c5bb582e6df63d8e16035b Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 04 六月 2025 18:01:55 +0800
Subject: [PATCH] 优化报警附件逻辑
---
ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/server/WarnMsgService.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/server/WarnMsgService.java b/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/server/WarnMsgService.java
index 89a0754..b808222 100644
--- a/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/server/WarnMsgService.java
+++ b/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/server/WarnMsgService.java
@@ -197,8 +197,10 @@
upWarnMsgOperationInfoDao.save(upWarnMsgOperationInfo);
//修改报警处理结果
UPWarnMsgAdptInfo upWarnMsgAdptInfo = upWarnMsgAdptInfoDao.findByInfoIdIs(upWarnMsgOperationInfo.getInfoId());
- upWarnMsgAdptInfo.setResult(upWarnMsgOperationInfo.getResult());
- upWarnMsgAdptInfoDao.save(upWarnMsgAdptInfo);
+ if(null != upWarnMsgAdptInfo){
+ upWarnMsgAdptInfo.setResult(upWarnMsgOperationInfo.getResult());
+ upWarnMsgAdptInfoDao.save(upWarnMsgAdptInfo);
+ }
}
@@ -213,7 +215,7 @@
upWarnMsgFileListAck.setInferiorPlatformId(inferiorPlatformId);
upWarnMsgFileListAck.setCreateTime(LocalDateTime.now().toEpochSecond(ZoneOffset.ofHours(8)));
upWarnMsgFileListAckDao.save(upWarnMsgFileListAck);
- //修改报警处理结果
+ //修改报警附件数据
UPWarnMsgAdptInfo upWarnMsgAdptInfo = upWarnMsgAdptInfoDao.findByInfoIdIs(upWarnMsgFileListAck.getInfoId());
if(upWarnMsgFileListAck.getFileList().size() > 0){
StringJoiner joiner = new StringJoiner(",");
@@ -223,6 +225,8 @@
}
});
upWarnMsgAdptInfo.setPicUrl(joiner.toString());
+ }else{
+ upWarnMsgAdptInfo.setPicUrl("*");
}
upWarnMsgAdptInfoDao.save(upWarnMsgAdptInfo);
}
@@ -257,7 +261,7 @@
String url = jsonObject1.getString("url");
joiner.add(url);
}
- upWarnMsgAdptInfo.setPicUrl(joiner.toString());
+ upWarnMsgAdptInfo.setPicUrl(joiner.length() > 0 ? joiner.toString() : "*");
upWarnMsgAdptInfoDao.save(upWarnMsgAdptInfo);
}
}
@@ -389,6 +393,8 @@
}
upWarnMsgAdptInfo.setPicUrl(joiner.toString());
}
+ }else{
+ upWarnMsgAdptInfo.setPicUrl("*");
}
upWarnMsgAdptInfoDao.save(upWarnMsgAdptInfo);
--
Gitblit v1.7.1