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 |   78 ++++++++++++++++-----------------------
 1 files changed, 32 insertions(+), 46 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 8593a26..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
@@ -2,6 +2,7 @@
 
 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;
@@ -107,13 +108,18 @@
      */
     @ApiModelProperty(value= "瀹�")
     private Double width;
-
     /**
      * 鎺�
      */
     @ApiModelProperty(value= "鎺�")
     @TableField("`row`")
     private Integer row;
+
+    /**
+     * 璁惧鍙�
+     */
+    @ApiModelProperty(value= "璁惧鍙�")
+    private Integer deviceNo;
 
     /**
      * 鍒�
@@ -190,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;
 
     /**
@@ -203,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() {}
 
@@ -281,20 +308,9 @@
 //    );
 
     public String getTypeIds$(){
-        if (null == this.type){ return null; }
-        String[] split = this.type.split(",");
-        List<String> asList = Arrays.asList(split);
-        if (asList.isEmpty()) {
-            return null;
-        }
-        LocTypeService locTypeService = SpringUtils.getBean(LocTypeService.class);
-        List<LocType> locTypes = locTypeService.list(new LambdaQueryWrapper<LocType>().in(LocType::getId, asList));
-        if (locTypes.isEmpty()) {
-            return null;
-        }
-        List<String> strings = locTypes.stream().map(LocType::getName).collect(Collectors.toList());
-        return StringUtils.join(strings, ",");
+        return this.typeIds$;
     }
+
 
     public String getUseStatus$(){
         if (null == this.useStatus){ return null; }
@@ -317,23 +333,11 @@
     }
 
     public String getWarehouseId$(){
-        if (null == this.warehouseId){ return null; }
-        WarehouseService service = SpringUtils.getBean(WarehouseService.class);
-        Warehouse warehouse = service.getById(this.warehouseId);
-        if (!Cools.isEmpty(warehouse)){
-            return String.valueOf(warehouse.getName());
-        }
-        return null;
+        return this.warehouseId$;
     }
 
     public String getAreaId$(){
-        if (null == this.areaId){ return null; }
-        WarehouseAreasService service = SpringUtils.getBean(WarehouseAreasService.class);
-        WarehouseAreas warehouseAreas = service.getById(this.areaId);
-        if (!Cools.isEmpty(warehouseAreas)){
-            return String.valueOf(warehouseAreas.getName());
-        }
-        return null;
+        return this.areaId$;
     }
 
     public String getStatus$(){
@@ -348,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