From a8df4c4a80781c02815021a840971ce4b15419f5 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 09 四月 2026 09:38:24 +0800
Subject: [PATCH] refactor: batch fill page operator names

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStation.java |   68 +++++++++++++++++++++------------
 1 files changed, 43 insertions(+), 25 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 d0676f0..4ad633a 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;
@@ -87,7 +88,8 @@
      * 鍙法鍖哄尯鍩焛d
      */
     @ApiModelProperty(value = "鍙法鍖哄尯鍩焛d")
-    private String crossZoneArea;
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private List<Integer> crossZoneArea;
 
     /**
      * 鏄惁wcs绔欑偣
@@ -105,13 +107,14 @@
      * 瀹瑰櫒绫诲瀷
      */
     @ApiModelProperty(value = "瀹瑰櫒绫诲瀷")
-    private String containerType;
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private List<Integer> containerType;
 
     /**
      * 鏉＄爜
      */
     @ApiModelProperty(value = "鏉＄爜")
-    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    @TableField(updateStrategy = FieldStrategy.ALWAYS)
     private String barcode;
 
     /**
@@ -136,6 +139,9 @@
     @ApiModelProperty(value = "鍒涘缓浜�")
     private Long createBy;
 
+    @TableField(exist = false)
+    private String createBy$;
+
     /**
      * 鍒涘缓鏃堕棿
      */
@@ -148,6 +154,9 @@
      */
     @ApiModelProperty(value = "鏇存柊浜�")
     private Long updateBy;
+
+    @TableField(exist = false)
+    private String updateBy$;
 
     /**
      * 鏇存柊鏃堕棿
@@ -171,6 +180,31 @@
     @TableField(exist = false)
     private List<Long> containerTypes;
 
+    /**
+     * 鍒悕
+     */
+    @ApiModelProperty(value = "鍒悕")
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private List<String> stationAlias;
+
+    /**
+     * 浠撳簱缂栫爜
+     */
+    @ApiModelProperty(value = "浠撳簱缂栫爜")
+    private String productionLineCode;
+
+    /**
+     * 浠撳簱鍚嶇О
+     */
+    @ApiModelProperty(value = "浠撳簱鍚嶇О")
+    private String productionLineName;
+
+    /**
+     * 浠撳簱鍚嶇О
+     */
+    @ApiModelProperty(value = "浠撳簱鍚嶇О")
+    private String stationTypeCode;
+
     public BasStation() {
     }
 
@@ -186,11 +220,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;
     }
@@ -223,24 +257,6 @@
         return "";
     }
 
-    public String getCreateBy$() {
-        UserService service = SpringUtils.getBean(UserService.class);
-        User user = service.getById(this.createBy);
-        if (!Cools.isEmpty(user)) {
-            return String.valueOf(user.getNickname());
-        }
-        return null;
-    }
-
-    public String getUpdateBy$() {
-        UserService service = SpringUtils.getBean(UserService.class);
-        User user = service.getById(this.updateBy);
-        if (!Cools.isEmpty(user)) {
-            return String.valueOf(user.getNickname());
-        }
-        return null;
-    }
-
     public String getArea$() {
         if (null == this.area) {
             return null;
@@ -266,4 +282,6 @@
                 return null;
         }
     }
+
+
 }

--
Gitblit v1.9.1