优化报警附件逻辑

Pu Zhibing

2025-06-04 78b2e363a232aa1fa0030f47606d863c9dc429cd

 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);
                  }
               }
@@ -266,7 +270,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());
@@ -389,6 +393,8 @@
                     }
                     upWarnMsgAdptInfo.setPicUrl(joiner.toString());
                  }
               }else{
                  upWarnMsgAdptInfo.setPicUrl("*");
               }
               upWarnMsgAdptInfoDao.save(upWarnMsgAdptInfo);