From 7a92ebbfb8227ff30ebe3300cc9db263a75b7e22 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期四, 05 三月 2026 13:06:15 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStation.java | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStation.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStation.java
index af2aaf9..bb7b249 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStation.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStation.java
@@ -7,6 +7,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
import com.vincent.rsf.server.manager.enums.StationTypeEnum;
import com.vincent.rsf.server.manager.service.WarehouseAreasService;
import com.vincent.rsf.server.system.entity.DictData;
@@ -26,7 +27,7 @@
import java.util.stream.Collectors;
@Data
-@TableName("man_bas_station")
+@TableName(value = "man_bas_station", autoResultMap = true)
public class BasStation implements Serializable {
private static final long serialVersionUID = 1L;
@@ -41,8 +42,14 @@
/**
* 绔欑偣鍚嶇О
*/
- @ApiModelProperty(value = "绔欑偣鍚嶇О")
+ @ApiModelProperty(value = "绔欑偣缂栧彿")
private String stationName;
+
+ /**
+ * 绔欑偣鍚嶇О
+ */
+ @ApiModelProperty(value = "绔欑偣鍚嶇О")
+ private String stationId;
@ApiModelProperty("绔欑偣绫诲瀷: {0:鍏夌數锛� 1:鏃犲厜鐢祡")
private Integer type;
@@ -81,7 +88,8 @@
* 鍙法鍖哄尯鍩焛d
*/
@ApiModelProperty(value = "鍙法鍖哄尯鍩焛d")
- private String crossZoneArea;
+ @TableField(typeHandler = JacksonTypeHandler.class)
+ private List<Integer> crossZoneArea;
/**
* 鏄惁wcs绔欑偣
@@ -99,7 +107,8 @@
* 瀹瑰櫒绫诲瀷
*/
@ApiModelProperty(value = "瀹瑰櫒绫诲瀷")
- private String containerType;
+ @TableField(typeHandler = JacksonTypeHandler.class)
+ private List<Integer> containerType;
/**
* 鏉＄爜
@@ -165,6 +174,13 @@
@TableField(exist = false)
private List<Long> containerTypes;
+ /**
+ * 鍒悕
+ */
+ @ApiModelProperty(value = "鍒悕")
+ @TableField(typeHandler = JacksonTypeHandler.class)
+ private List<String> stationAlias;
+
public BasStation() {
}
@@ -180,11 +196,11 @@
}
DictDataService service = SpringUtils.getBean(DictDataService.class);
- Object parse = JSONArray.parse(this.getContainerType());
- List<Long> longs1 = JSONObject.parseArray(parse.toString(), Long.class);
+// Object parse = JSONArray.parse(this.getContainerType());
+// List<Long> longs1 = JSONObject.parseArray(parse.toString(), Long.class);
List<DictData> dictData = service.list(new LambdaQueryWrapper<DictData>()
.eq(DictData::getDictTypeCode, "sys_container_type")
- .in(DictData::getValue, longs1));
+ .in(DictData::getValue, this.getContainerType()));
List<Long> longs = dictData.stream().map(DictData::getId).collect(Collectors.toList());
return longs;
}
@@ -260,4 +276,6 @@
return null;
}
}
+
+
}
--
Gitblit v1.9.1