update

liujie

2025-09-09 d52d4796208241c1a36b11b4e6c823a10ce4592a

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

@@ -155,7 +155,7 @@
    * @param warnMsg
    */
   public void up_warn_msg_adpt_info(ChannelHandlerContext ctx, int inferiorPlatformId, WarnMsg warnMsg) {
      log.info("上报报警信息cz0({})：{}",inferiorPlatformId,warnMsg);
//      log.info("上报报警信息cz0({})：{}",inferiorPlatformId,warnMsg);
      UPWarnMsgAdptInfo upWarnMsgAdptInfo = enterprise.contains(inferiorPlatformId) ? new UPWarnMsgAdptInfo().decode2(warnMsg) : new UPWarnMsgAdptInfo().decode1(warnMsg);
      upWarnMsgAdptInfo.setResult(0x00);
      upWarnMsgAdptInfo.setInferiorPlatformId(inferiorPlatformId);
@@ -179,16 +179,16 @@
            }
            break;
         case 17235341:
            log.info("上报报警信息cz88888({})：{}:{}", DataType.UP_WARN_MSG_ADPT_INFO.getCode(), JSON.toJSONString(upWarnMsgAdptInfo),upWarnMsgAdptInfo.getWarnType());
//            log.info("上报报警信息cz88888({})：{}:{}", DataType.UP_WARN_MSG_ADPT_INFO.getCode(), JSON.toJSONString(upWarnMsgAdptInfo),upWarnMsgAdptInfo.getWarnType());
            if(!cz_warnType.contains(upWarnMsgAdptInfo.getWarnType())){
               log.info("上报报警信息czcontains({})：{}:{}", DataType.UP_WARN_MSG_ADPT_INFO.getCode(), JSON.toJSONString(upWarnMsgAdptInfo),upWarnMsgAdptInfo.getWarnType());
//               log.info("上报报警信息czcontains({})：{}:{}", DataType.UP_WARN_MSG_ADPT_INFO.getCode(), JSON.toJSONString(upWarnMsgAdptInfo),upWarnMsgAdptInfo.getWarnType());
               return;
            }
            break;
         case 82296583:
            log.info("上报报警信息cz88888({})：{}:{}", DataType.UP_WARN_MSG_ADPT_INFO.getCode(), JSON.toJSONString(upWarnMsgAdptInfo),upWarnMsgAdptInfo.getWarnType());
//            log.info("上报报警信息cz88888({})：{}:{}", DataType.UP_WARN_MSG_ADPT_INFO.getCode(), JSON.toJSONString(upWarnMsgAdptInfo),upWarnMsgAdptInfo.getWarnType());
            if(!cz_warnType.contains(upWarnMsgAdptInfo.getWarnType())){
               log.info("上报报警信息czcontains({})：{}:{}", DataType.UP_WARN_MSG_ADPT_INFO.getCode(), JSON.toJSONString(upWarnMsgAdptInfo),upWarnMsgAdptInfo.getWarnType());
//               log.info("上报报警信息czcontains({})：{}:{}", DataType.UP_WARN_MSG_ADPT_INFO.getCode(), JSON.toJSONString(upWarnMsgAdptInfo),upWarnMsgAdptInfo.getWarnType());

               return;
            }
@@ -204,10 +204,10 @@
            }
            break;
      }
      log.info("上报报警信息555555({})：{}:{}", DataType.UP_WARN_MSG_ADPT_INFO.getCode(), JSON.toJSONString(upWarnMsgAdptInfo),upWarnMsgAdptInfo.getWarnType());
//      log.info("上报报警信息555555({})：{}:{}", DataType.UP_WARN_MSG_ADPT_INFO.getCode(), JSON.toJSONString(upWarnMsgAdptInfo),upWarnMsgAdptInfo.getWarnType());
      try {
      if(0 == upWarnMsgAdptInfo.getLongitude()){
         log.info("上报报警信息6666666({})：{}:{}", DataType.UP_WARN_MSG_ADPT_INFO.getCode(), JSON.toJSONString(upWarnMsgAdptInfo),upWarnMsgAdptInfo.getWarnType());
//         log.info("上报报警信息6666666({})：{}:{}", DataType.UP_WARN_MSG_ADPT_INFO.getCode(), JSON.toJSONString(upWarnMsgAdptInfo),upWarnMsgAdptInfo.getWarnType());
         UPExgMsgRealLocation upExgMsgRealLocation = upExgMsgRealLocationDao.findByVehicleNoOrderByCreateTimeDesc(upWarnMsgAdptInfo.getVehicleNo());
         if (null != upExgMsgRealLocation) {
            GnssData gnssData = upExgMsgRealLocation.getGnssData();
@@ -216,7 +216,7 @@
            upWarnMsgAdptInfo.setLatitude(gnssData.getLat());
         }
      }
      log.info("上报报警信息333333");
//      log.info("上报报警信息333333");

         upWarnMsgAdptInfoDao.save(upWarnMsgAdptInfo);
      }catch (Exception e){
@@ -224,8 +224,8 @@
         log.info("上报报警信息保存失败{}",e.getMessage());
      }

      log.info("上报报警信息2({})：{}", DataType.UP_WARN_MSG_ADPT_INFO.getCode(), JSON.toJSONString(upWarnMsgAdptInfo));
		
//      log.info("上报报警信息2({})：{}", DataType.UP_WARN_MSG_ADPT_INFO.getCode(), JSON.toJSONString(upWarnMsgAdptInfo));

      //请求报警附件（川标协议）
      if(enterprise.contains(inferiorPlatformId)){
         DOWNWarnMsgFileListReq downWarnMsgFileListReq = new DOWNWarnMsgFileListReq();