From 25e7160560fddd6eb413d97d13aa3dade123fe82 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期五, 23 一月 2026 14:39:15 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceSite.java | 24 ++++++++++++++++++++++++
1 files changed, 24 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..c5054c8 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;
@@ -155,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) {
@@ -195,6 +202,23 @@
// null // 澶囨敞
// );
+
+// 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; }
String[] split = this.type.split(",");
--
Gitblit v1.9.1