Pu Zhibing
2025-07-18 fdfa8b3b237d8bba8964bda67364f54c08d79432
ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/server/WarnMsgService.java
@@ -66,7 +66,7 @@
   //均辉报警类型
   private List<Integer> jh_warnType = Arrays.asList(0x0201, 0x0012, 0x0202, 0x0203, 0x0208, 0x0002, 0x0212, 0x0214, 0x0213, 0x0215, 0x0217, 0x0307);
   //出租车报警类型
   private List<Integer> cz_warnType = Arrays.asList(0x0001, 0x0005);
   private List<Integer> cz_warnType = Arrays.asList(0x0001, 0x0004, 0x0005);
   //公交报警类型
   private List<Integer> gj_warnType = Arrays.asList(0x0002, 0x0212, 0x0214, 0x0213, 0x0215, 0x0217, 0x0001);
   //平安报警类型
@@ -83,19 +83,19 @@
      DataType dataType = DataType.getDataType(warnMsg.getDataType());
      switch (dataType) {
         case UP_WARN_MSG_URGE_TODO_ACK:
            log.info("报警督办应答消息({}):{}", DataType.UP_WARN_MSG_URGE_TODO_ACK.getCode(), out);
            log.debug("报警督办应答消息({}):{}", DataType.UP_WARN_MSG_URGE_TODO_ACK.getCode(), out);
            up_warn_msg_urge_todo_ack(ctx, out.getGnsscenterId(), warnMsg);
            break;
         case UP_WARN_MSG_ADPT_INFO:
            log.info("上报报警信息({}):{}", DataType.UP_WARN_MSG_ADPT_INFO.getCode(), out);
            log.debug("上报报警信息({}):{}", DataType.UP_WARN_MSG_ADPT_INFO.getCode(), out);
            up_warn_msg_adpt_info(ctx, out.getGnsscenterId(), warnMsg);
            break;
         case UP_WARN_MSG_OPERATION_INFO:
            log.info("上报报警处理信息({}):{}", DataType.UP_WARN_MSG_OPERATION_INFO.getCode(), out);
            log.debug("上报报警处理信息({}):{}", DataType.UP_WARN_MSG_OPERATION_INFO.getCode(), out);
            up_warn_msg_operation_info(ctx, out.getGnsscenterId(), warnMsg);
            break;
         case UP_WARN_MSG_FILELIST_ACK:
            log.info("报警附件目录请求应答({}):{}", DataType.UP_WARN_MSG_FILELIST_ACK.getCode(), out);
            log.debug("报警附件目录请求应答({}):{}", DataType.UP_WARN_MSG_FILELIST_ACK.getCode(), out);
            up_warn_msg_filelist_ack(ctx, out.getGnsscenterId(), warnMsg);
            break;
         default:
@@ -144,6 +144,7 @@
      upWarnMsgUrgeTodoAck.setInferiorPlatformId(inferiorPlatformId);
      upWarnMsgUrgeTodoAck.setCreateTime(LocalDateTime.now().toEpochSecond(ZoneOffset.ofHours(8)));
      upWarnMsgUrgeTodoAckDao.save(upWarnMsgUrgeTodoAck);
      log.info("报警督办应答消息({}):{}", DataType.UP_WARN_MSG_URGE_TODO_ACK.getCode(), JSON.toJSONString(upWarnMsgUrgeTodoAck));
   }
   /**
@@ -194,6 +195,7 @@
         }
      }
      upWarnMsgAdptInfoDao.save(upWarnMsgAdptInfo);
      log.info("上报报警信息({}):{}", DataType.UP_WARN_MSG_ADPT_INFO.getCode(), JSON.toJSONString(upWarnMsgAdptInfo));
      
      //请求报警附件(川标协议)
      if(enterprise.contains(inferiorPlatformId)){
@@ -226,6 +228,7 @@
      upWarnMsgOperationInfo.setInferiorPlatformId(inferiorPlatformId);
      upWarnMsgOperationInfo.setCreateTime(LocalDateTime.now().toEpochSecond(ZoneOffset.ofHours(8)));
      upWarnMsgOperationInfoDao.save(upWarnMsgOperationInfo);
      log.info("上报报警处理信息({}):{}", DataType.UP_WARN_MSG_OPERATION_INFO.getCode(), JSON.toJSONString(upWarnMsgOperationInfo));
      //修改报警处理结果
      UPWarnMsgAdptInfo upWarnMsgAdptInfo = upWarnMsgAdptInfoDao.findByInfoIdIs(upWarnMsgOperationInfo.getInfoId());
      if(null != upWarnMsgAdptInfo){
@@ -246,6 +249,7 @@
      upWarnMsgFileListAck.setInferiorPlatformId(inferiorPlatformId);
      upWarnMsgFileListAck.setCreateTime(LocalDateTime.now().toEpochSecond(ZoneOffset.ofHours(8)));
      upWarnMsgFileListAckDao.save(upWarnMsgFileListAck);
      log.info("报警附件目录请求应答({}):{}", DataType.UP_WARN_MSG_FILELIST_ACK.getCode(), JSON.toJSONString(upWarnMsgFileListAck));
      //修改报警附件数据
      UPWarnMsgAdptInfo upWarnMsgAdptInfo = upWarnMsgAdptInfoDao.findByInfoIdIs(upWarnMsgFileListAck.getInfoId());
      if(upWarnMsgFileListAck.getFileList().size() > 0){