Merge remote-tracking branch 'origin/master'

puzhibing

2025-06-05 5393e1b43f7148adc93dd5a29f7b6fd4a054eec6

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WarnServiceImpl.java

@@ -5,8 +5,10 @@
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.dataInterchange.api.feignClient.UPWarnMsgAdptInfoClient;
import com.ruoyi.dataInterchange.api.feignClient.UPWarnMsgOperationInfoClient;
import com.ruoyi.dataInterchange.api.model.enums.WarnType;
import com.ruoyi.dataInterchange.api.vo.UPWarnMsgAdptInfoVo;
import com.ruoyi.dataInterchange.api.vo.UPWarnMsgOperationInfoVo;
import com.ruoyi.system.api.model.Car;
import com.ruoyi.system.api.model.Driver;
import com.ruoyi.system.api.model.Enterprise;
@@ -49,6 +51,9 @@
   
   @Resource
   private ICarService carService;
	
   @Resource
   private UPWarnMsgOperationInfoClient upWarnMsgOperationInfoClient;
   
   
   /**
@@ -121,6 +126,7 @@
         warn.setCreateTime(LocalDateTime.now());
         warn.setObjectId(vo.getInfoId());
         warn.setVehicleNumber(vo.getVehicleNo());
         warn.setPicUrl(vo.getPicUrl());
         warns.add(warn);
      }
      if (warns.size() > 0) {
@@ -179,8 +185,33 @@
                  warn.setTreatmentState("将来处理");
                  break;
            }
            this.updateById(warn);
            UPWarnMsgOperationInfoVo upWarnMsgOperationInfoVo = upWarnMsgOperationInfoClient.getUPWarnMsgOperationInfo(warn.getObjectId()).getData();
            if(null != upWarnMsgOperationInfoVo){
               warn.setTreatmentUser(upWarnMsgOperationInfoVo.getOperator());
               warn.setTreatmentTime(LocalDateTime.ofEpochSecond(upWarnMsgOperationInfoVo.getCreateTime(), 0, ZoneOffset.ofHours(8)).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
               switch (upWarnMsgOperationInfoVo.getMethod()) {
                  case 0x01:
                     warn.setTreatmentRemark("快速拍照");
                     break;
                  case 0x02:
                     warn.setTreatmentRemark("语音下发");
                     break;
                  case 0x03:
                     warn.setTreatmentRemark("不做处理");
                     break;
                  case 0x04:
                     warn.setTreatmentRemark("其他");
                     break;
                  default:
                     warn.setTreatmentRemark("其他");
                     break;
               }
            }
         }
         if(null == warn.getPicUrl()){
            warn.setPicUrl(vo.getPicUrl());
         }
         this.updateById(warn);
      }
      
   }