From 691bee4229856f8bf81c2720092ecee1c9f21509 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 09 四月 2026 19:18:12 +0800
Subject: [PATCH] #getter$摘出entity

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Loc.java |   82 +++++++++++++++++++++++++---------------
 1 files changed, 51 insertions(+), 31 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Loc.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Loc.java
index 8781760..a583487 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Loc.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Loc.java
@@ -1,18 +1,27 @@
 package com.vincent.rsf.server.manager.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.vincent.rsf.framework.common.Cools;
 import com.vincent.rsf.framework.common.SpringUtils;
+import com.vincent.rsf.server.manager.service.LocTypeService;
+import com.vincent.rsf.server.manager.service.WarehouseAreasService;
+import com.vincent.rsf.server.manager.service.WarehouseService;
 import com.vincent.rsf.server.system.entity.User;
 import com.vincent.rsf.server.system.service.UserService;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.text.SimpleDateFormat;
+import java.util.Arrays;
 import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
 
 @Data
 @Accessors(chain = true)
@@ -52,6 +61,10 @@
     @ApiModelProperty(value= "搴撲綅绫诲瀷(*) H:  楂樺簱浣�   M:  涓簱浣�   L:  浣庡簱浣�  ")
     @TableField("`type`")
     private String type;
+
+    @ApiModelProperty("搴撲綅绫诲瀷(*)[man_loc_type]")
+    @TableField(exist = false)
+    private List<Long> typeIds;
 
     /**
      * 铏氭嫙搴撲綅
@@ -95,13 +108,18 @@
      */
     @ApiModelProperty(value= "瀹�")
     private Double width;
-
     /**
      * 鎺�
      */
     @ApiModelProperty(value= "鎺�")
     @TableField("`row`")
     private Integer row;
+
+    /**
+     * 璁惧鍙�
+     */
+    @ApiModelProperty(value= "璁惧鍙�")
+    private Integer deviceNo;
 
     /**
      * 鍒�
@@ -178,11 +196,15 @@
     @ApiModelProperty(value= "娣诲姞浜哄憳")
     private Long createBy;
 
+    @TableField(exist = false)
+    private String createBy$;
+
     /**
      * 娣诲姞鏃堕棿
      */
     @ApiModelProperty(value= "娣诲姞鏃堕棿")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date createTime;
 
     /**
@@ -191,18 +213,35 @@
     @ApiModelProperty(value= "淇敼浜哄憳")
     private Long updateBy;
 
+    @TableField(exist = false)
+    private String updateBy$;
+
     /**
      * 淇敼鏃堕棿
      */
     @ApiModelProperty(value= "淇敼鏃堕棿")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date updateTime;
+
+    @Version
+    private Integer version;
 
     /**
      * 澶囨敞
      */
     @ApiModelProperty(value= "澶囨敞")
     private String memo;
+    @TableField(exist = false)
+    private String typeIds$;
+
+    @TableField(exist = false)
+    private String warehouseId$;
+
+    @TableField(exist = false)
+    private String areaId$;
+
+
 
     public Loc() {}
 
@@ -268,19 +307,10 @@
 //            null    // 澶囨敞
 //    );
 
-    public String getType$(){
-        if (null == this.type){ return null; }
-        switch (this.type){
-            case  "H":
-                return " 楂樺簱浣�";
-            case  "M":
-                return " 涓簱浣�";
-            case  "L":
-                return " 浣庡簱浣�";
-            default:
-                return String.valueOf(this.type);
-        }
+    public String getTypeIds$(){
+        return this.typeIds$;
     }
+
 
     public String getUseStatus$(){
         if (null == this.useStatus){ return null; }
@@ -302,6 +332,14 @@
         }
     }
 
+    public String getWarehouseId$(){
+        return this.warehouseId$;
+    }
+
+    public String getAreaId$(){
+        return this.areaId$;
+    }
+
     public String getStatus$(){
         if (null == this.status){ return null; }
         switch (this.status){
@@ -314,29 +352,11 @@
         }
     }
 
-    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 getCreateTime$(){
         if (Cools.isEmpty(this.createTime)){
             return "";
         }
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
-    }
-
-    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 getUpdateTime$(){

--
Gitblit v1.9.1