From 065c2d959a8e686ab03fee0454fbffa68a4d1411 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 05 六月 2025 16:11:19 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WarnServiceImpl.java |   27 +++++++++++++++++++++++++++
 1 files changed, 27 insertions(+), 0 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WarnServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WarnServiceImpl.java
index 962be7e..21a4db0 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WarnServiceImpl.java
+++ b/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;
 	
 	
 	/**
@@ -180,6 +185,28 @@
 						warn.setTreatmentState("将来处理");
 						break;
 				}
+				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());

--
Gitblit v1.7.1