From add402ec68d150cd8b13c231ce991cf49889259c Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期二, 21 十月 2025 14:03:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop_whxrwms' into devlop_whxrwms
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceSite.java | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 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 242362e..b11a951 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
@@ -197,21 +197,21 @@
// );
- public String getSite$() {
- if (this.site == null) {return null;}
- BasStationService service = SpringUtils.getBean(BasStationService.class);
- BasStation station = service.getOne(new LambdaQueryWrapper<BasStation>().eq(BasStation::getStationName, 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 getSite$() {
+// if (this.site == null) {return null;}
+// BasStationService service = SpringUtils.getBean(BasStationService.class);
+// BasStation station = service.getOne(new LambdaQueryWrapper<BasStation>().eq(BasStation::getStationName, 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; }
--
Gitblit v1.9.1