From 7518f9366927b0458a9b6392e907aaee0efa07a6 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期五, 23 一月 2026 15:46:23 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceSite.java | 38 ++++++++++++++++++++++----------------
1 files changed, 22 insertions(+), 16 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 d8faaa2..bd4d8dc 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
@@ -84,7 +84,7 @@
/**
* 璁惧缂栧彿
*/
- @ApiModelProperty(value= "璁惧缂栧彿")
+ @ApiModelProperty(value= "鎺ラ┏浣�")
private String deviceCode;
/**
@@ -156,6 +156,12 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ @ApiModelProperty("婧愬簱鍖�")
+ private Long areaIdStart;
+
+ @ApiModelProperty("鐩爣搴撳尯")
+ private Long areaIdEnd;
+
public DeviceSite() {}
public DeviceSite(String type,String site,String name,String wcsCode,String label,String device,String deviceCode,String deviceSite,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
@@ -197,21 +203,21 @@
// );
- 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 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