From 6237806cc2aef5350b4ce3d635eae1c194e79b0b Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期四, 27 三月 2025 16:58:09 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

---
 rsf-server/src/main/java/com/vincent/rsf/server/system/constant/DictTypeCode.java               |    5 +++++
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/DeviceSiteServiceImpl.java |    7 +++++--
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceSite.java                  |   21 ++++++++++++++++++++-
 3 files changed, 30 insertions(+), 3 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/manager/service/impl/DeviceSiteServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/DeviceSiteServiceImpl.java
index 33a5a6c..2a1a189 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/DeviceSiteServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/DeviceSiteServiceImpl.java
@@ -27,8 +27,11 @@
     @Override
     public boolean initSites(DeviceSiteParame param) {
         if (param.getFlagInit() == 1) {
-            if (!this.remove(new LambdaQueryWrapper<>())) {
-                throw new CoolException("鍒濆鍖栧け璐ワ細 鍒犻櫎绔欑偣澶辫触锛侊紒");
+            List<DeviceSite> list = this.list(new LambdaQueryWrapper<DeviceSite>().select(DeviceSite::getId).last("limit 1"));
+            if (!list.isEmpty()) {
+                if (!this.remove(new LambdaQueryWrapper<>())) {
+                    throw new CoolException("鍒濆鍖栧け璐ワ細 鍒犻櫎绔欑偣澶辫触锛侊紒");
+                }
             }
         }
         if (Objects.isNull(param.getDeviceSites()) || StringUtils.isBlank(param.getDeviceSites())) {
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