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

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceSite.java |   56 +++++++++-----------------------------------------------
 1 files changed, 9 insertions(+), 47 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 81821c0..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
@@ -167,6 +167,13 @@
 
     @ApiModelProperty("鐩爣搴撳尯")
     private Long areaIdEnd;
+    @TableField(exist = false)
+    private String type$;
+
+    @TableField(exist = false)
+    private String device$;
+
+
 
     public DeviceSite() {}
 
@@ -209,58 +216,13 @@
 //    );
 
 
-//    public String getSite$() {
-//        if (this.site == null) {return  null;}
-//        BasStationService service = SpringUtils.getBean(BasStationService.class);
-//        BasStation station = service.getOne(new LambdaQueryWrapper<BasStation>().eq(BasStation::getStationName, this.site));
-//        if (Objects.isNull(station)) {return  null;}
-//        return station.getStationName();
-//    }
-//
-//    public String getDeviceSite$() {
-//        if (this.deviceSite == null) {return  null;}
-//        BasStationService service = SpringUtils.getBean(BasStationService.class);
-//        BasStation station = service.getById(this.deviceSite);
-//        if (Objects.isNull(station)) {return  null;}
-//        return station.getStationName();
-//    }
 
     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, ",");
+        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$(){

--
Gitblit v1.9.1