From 1504150a9e26ef221fc6ac4e0ad494446968d06d Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期六, 30 八月 2025 16:28:22 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceSite.java | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceSite.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceSite.java
index 4a318c6..d8faaa2 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceSite.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceSite.java
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.vincent.rsf.server.manager.service.BasStationService;
import com.vincent.rsf.server.manager.service.LocTypeService;
import com.vincent.rsf.server.system.constant.DictTypeCode;
import com.vincent.rsf.server.system.entity.DictData;
@@ -195,6 +196,23 @@
// null // 澶囨敞
// );
+
+ public String getSite$() {
+ if (this.site == null) {return null;}
+ BasStationService service = SpringUtils.getBean(BasStationService.class);
+ BasStation station = service.getById(this.site);
+ if (Objects.isNull(station)) {return null;}
+ return station.getStationName();
+ }
+
+ public String getDeviceSite$() {
+ if (this.deviceSite == null) {return null;}
+ BasStationService service = SpringUtils.getBean(BasStationService.class);
+ BasStation station = service.getById(this.deviceSite);
+ if (Objects.isNull(station)) {return null;}
+ return station.getStationName();
+ }
+
public String getType$(){
if (null == this.type){ return null; }
String[] split = this.type.split(",");
--
Gitblit v1.9.1