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/DeviceSite.java |   83 ++++++++++++++++-------------------------
 1 files changed, 32 insertions(+), 51 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 2bca82a..986a67a 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
@@ -6,6 +6,8 @@
 import java.util.*;
 
 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;
@@ -82,7 +84,7 @@
     /**
      * 璁惧缂栧彿
      */
-    @ApiModelProperty(value= "璁惧缂栧彿")
+    @ApiModelProperty(value= "鎺ラ┏浣�")
     private String deviceCode;
 
     /**
@@ -104,6 +106,10 @@
     @TableLogic
     private Integer deleted;
 
+    @ApiModelProperty(value= "宸烽亾")
+    private Integer channel;
+
+
     /**
      * 绉熸埛
      */
@@ -116,11 +122,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;
 
     /**
@@ -129,11 +139,15 @@
     @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;
 
 
@@ -147,6 +161,19 @@
      */
     @ApiModelProperty(value= "澶囨敞")
     private String memo;
+
+    @ApiModelProperty("婧愬簱鍖�")
+    private Long areaIdStart;
+
+    @ApiModelProperty("鐩爣搴撳尯")
+    private Long areaIdEnd;
+    @TableField(exist = false)
+    private String type$;
+
+    @TableField(exist = false)
+    private String device$;
+
+
 
     public DeviceSite() {}
 
@@ -188,42 +215,14 @@
 //            null    // 澶囨敞
 //    );
 
-    public String getType$(){
-        if (null == this.type){ return null; }
-        String[] split = this.type.split(",");
-        List<String> asList = Arrays.asList(split);
-        if (asList.isEmpty()) {
-            return null;
-        }
-        DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
-        List<DictData> dictDatas = dictDataService.list(new LambdaQueryWrapper<DictData>()
-                .eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_TASK_TYPE)
-                .in(DictData::getValue, asList));
-        if (dictDatas.isEmpty()) {
-            return null;
-        }
-        List<String> strings = dictDatas.stream().map(DictData::getLabel).collect(Collectors.toList());
 
-        return StringUtils.join(strings, ",");
+
+    public String getType$(){
+        return this.type$;
     }
 
     public String getDevice$(){
-        if (null == this.device){ return null; }
-        String[] split = this.device.split(",");
-        List<String> asList = Arrays.asList(split);
-        if (asList.isEmpty()) {
-            return null;
-        }
-        DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
-        List<DictData> dictDatas = dictDataService.list(new LambdaQueryWrapper<DictData>()
-                .eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_DEVICE_TYPE)
-                .in(DictData::getValue, asList));
-        if (dictDatas.isEmpty()) {
-            return null;
-        }
-        List<String> strings = dictDatas.stream().map(DictData::getLabel).collect(Collectors.toList());
-
-        return StringUtils.join(strings, ",");
+        return this.device$;
     }
 
     public String getStatus$(){
@@ -238,29 +237,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