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, 8 insertions(+), 6 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 1c41f38..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
@@ -215,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(",");
@@ -224,7 +224,9 @@
joiner.add(file.getFileUrl());
}
});
- upWarnMsgAdptInfo.setPicUrl(joiner.length() > 0 ? joiner.toString() : "");
+ upWarnMsgAdptInfo.setPicUrl(joiner.toString());
+ }else{
+ upWarnMsgAdptInfo.setPicUrl("*");
}
upWarnMsgAdptInfoDao.save(upWarnMsgAdptInfo);
}
@@ -241,7 +243,7 @@
//海康威视直接走接口
if(25439966 == inferiorPlatformId){
try {
- if(null == upWarnMsgAdptInfo.getPicUrl()){
+ if(!StringUtils.hasLength(upWarnMsgAdptInfo.getPicUrl())){
FindPicturesByAlarmIdRequest findPicturesByAlarmIdRequest = new FindPicturesByAlarmIdRequest();
findPicturesByAlarmIdRequest.setAlarmId(upWarnMsgAdptInfo.getInfoId());
long warnTime = upWarnMsgAdptInfo.getWarnTime();
@@ -259,7 +261,7 @@
String url = jsonObject1.getString("url");
joiner.add(url);
}
- upWarnMsgAdptInfo.setPicUrl(joiner.length() > 0 ? joiner.toString() : "");
+ upWarnMsgAdptInfo.setPicUrl(joiner.length() > 0 ? joiner.toString() : "*");
upWarnMsgAdptInfoDao.save(upWarnMsgAdptInfo);
}
}
@@ -268,7 +270,7 @@
}
}
//请求报警附件（川标协议）
- if(enterprise.contains(inferiorPlatformId) && null == upWarnMsgAdptInfo.getPicUrl()){
+ if(enterprise.contains(inferiorPlatformId) && !StringUtils.hasLength(upWarnMsgAdptInfo.getPicUrl())){
DOWNWarnMsgFileListReq downWarnMsgFileListReq = new DOWNWarnMsgFileListReq();
downWarnMsgFileListReq.setVehicleNo(upWarnMsgAdptInfo.getVehicleNo());
downWarnMsgFileListReq.setVehicleColor(upWarnMsgAdptInfo.getVehicleColor());
@@ -392,7 +394,7 @@
upWarnMsgAdptInfo.setPicUrl(joiner.toString());
}
}else{
- upWarnMsgAdptInfo.setPicUrl("");
+ upWarnMsgAdptInfo.setPicUrl("*");
}
upWarnMsgAdptInfoDao.save(upWarnMsgAdptInfo);
--
Gitblit v1.7.1