Pu Zhibing
2025-06-04 78b2e363a232aa1fa0030f47606d863c9dc429cd
优化报警附件逻辑
1个文件已修改
12 ■■■■■ 已修改文件
ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/server/WarnMsgService.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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);
                        }
                    }
@@ -392,7 +394,7 @@
                            upWarnMsgAdptInfo.setPicUrl(joiner.toString());
                        }
                    }else{
                        upWarnMsgAdptInfo.setPicUrl("");
                        upWarnMsgAdptInfo.setPicUrl("*");
                    }
                    upWarnMsgAdptInfoDao.save(upWarnMsgAdptInfo);