From 17e4755fd0b05e6dab34abdb23ec656b6849b52f Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 27 三月 2025 16:42:52 +0800
Subject: [PATCH] 站点字典类型转换

---
 rsf-server/src/main/java/com/vincent/rsf/server/system/constant/DictTypeCode.java |    5 +++++
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceSite.java    |   21 ++++++++++++++++++++-
 2 files changed, 25 insertions(+), 1 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 d2a1173..5293829 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
@@ -198,7 +198,26 @@
         DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
         List<DictData> dictDatas = dictDataService.list(new LambdaQueryWrapper<DictData>()
                 .eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_TASK_TYPE)
-                .in(DictData::getId, asList));
+                .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 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;
         }
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/constant/DictTypeCode.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/constant/DictTypeCode.java
index 00a24a1..00d56d1 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/constant/DictTypeCode.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/constant/DictTypeCode.java
@@ -19,4 +19,9 @@
      */
     public final static String DICT_SYS_TASK_TYPE = "sys_task_type";
 
+    /**
+     * 璁惧绫诲瀷
+     */
+    public final static String DICT_SYS_DEVICE_TYPE = "sys_device_type";
+
 }

--
Gitblit v1.9.1