wenhongquan 3 miesięcy temu
rodzic
commit
68733b282c

+ 10 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/TblEventController.java

@@ -18,6 +18,8 @@ import jakarta.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import org.dromara.common.oss.core.OssClient;
 import org.dromara.common.oss.factory.OssFactory;
+import org.dromara.system.domain.vo.TblDeviceVo;
+import org.dromara.system.service.ITblDeviceService;
 import org.dromara.system.utils.DifyUtil;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
@@ -49,6 +51,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 public class TblEventController extends BaseController {
 
     private final ITblEventService tblEventService;
+    private final ITblDeviceService tblDeviceService;
 
     private final DifyUtil difyUtil;
 
@@ -146,6 +149,13 @@ public class TblEventController extends BaseController {
         try{
             data.put("事件来源", JSONUtil.parseObj(tblEventVo.getExt2()).getStr("from"));
         }catch (Exception e) {}
+        try{
+            TblDeviceVo tblDeviceVo = tblDeviceService.queryById(JSONUtil.parseObj(tblEventVo.getExt2()).getJSONObject("deviceVo").getLong("id"));
+            if(tblDeviceVo!=null){
+                data.put("事件地点",JSONUtil.parseObj(tblDeviceVo.getExt1()).getStr("addr"));
+            }
+
+        }catch (Exception e) {}
 
 
         //获取事件图片