优化报警附件逻辑

Pu Zhibing

2025-06-04 74d8128def9a959208c94b7d98195a6ecb8584cc

优化报警附件逻辑

 ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/server/WarnMsgService.java

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