Merge remote-tracking branch 'origin/dev' into dev

dk-api/api-system/src/main/java/org/dromara/system/api/RemoteConfigService.java

@@ -1,5 +1,7 @@
 package org.dromara.system.api;
 
+import java.util.List;
+
 /**
  * 配置服务
  *
@@ -22,5 +24,5 @@ public interface RemoteConfigService {
     String selectStreamIp();
 
 
-    String selectStreamType(String deviceSn);
+    List<String> selectStreamType(String deviceSn);
 }

dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/PlayTextServiceImpl.java

@@ -10,6 +10,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import io.seata.common.util.StringUtils;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.dromara.common.sdk.cloudapi.device.*;
 import org.dromara.common.sdk.cloudapi.firmware.*;
@@ -56,7 +57,6 @@ import org.dromara.system.api.RemoteConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
 
 import java.time.LocalDateTime;
 import java.util.*;
@@ -124,8 +124,9 @@ public class PlayTextServiceImpl implements IPlayTextService {
     public HttpResultResponse streamType(Map<String, Object> objectMap) {
         String top = "task/image/disobey/streamType";
         //发送mqtt
-        String s = remoteConfigService.selectStreamType(objectMap.get("deviceSn").toString());
+        List<String> list = remoteConfigService.selectStreamType(objectMap.get("deviceSn").toString());
-        if (StringUtils.isNotEmpty(s)){
+        if (CollectionUtils.isNotEmpty(list)){
+            for (String s : list){
                 String[] split = s.split(",");
                 objectMap.put("deptId",split[0]);
                 objectMap.put("deptName",split[1]);
@@ -135,6 +136,7 @@ public class PlayTextServiceImpl implements IPlayTextService {
                 gatewayPublish.publish(top,new CommonTopicRequest<>()
                     .setData(Objects.requireNonNull(param)),1);
             }
+        }
         return HttpResultResponse.error("请求成功");
     }
 }

dk-modules/system/src/main/java/org/dromara/system/dubbo/RemoteConfigServiceImpl.java

@@ -8,6 +8,8 @@ import org.dromara.system.domain.SysConfig;
 import org.dromara.system.service.ISysConfigService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 配置服务
  *
@@ -37,9 +39,9 @@ public class RemoteConfigServiceImpl implements RemoteConfigService {
     }
 
     @Override
-    public String selectStreamType(String deviceSn) {
+    public List<String> selectStreamType(String deviceSn) {
-        String ip =sysConfigService.selectStreamType(deviceSn);
+        List<String> list =sysConfigService.selectStreamType(deviceSn);
-        return ip;
+        return list;
     }
 
 }

dk-modules/system/src/main/java/org/dromara/system/service/ISysConfigService.java

@@ -86,6 +86,6 @@ public interface ISysConfigService {
 
     String selectStreamIp();
 
-    String selectStreamType(String deviceSn);
+    List<String> selectStreamType(String deviceSn);
 
 }

dk-modules/system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java

@@ -28,6 +28,7 @@ import org.springframework.stereotype.Service;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 参数配置 服务层实现
@@ -211,10 +212,11 @@ public class SysConfigServiceImpl implements ISysConfigService {
     }
 
     @Override
-    public String selectStreamType(String deviceSn) {
+    public List<String> selectStreamType(String deviceSn) {
-        SysConfig sysConfig = baseMapper.selectOne(new LambdaQueryWrapper<SysConfig>()
+        List<SysConfig> sysConfig = baseMapper.selectList(new LambdaQueryWrapper<SysConfig>()
             .eq(SysConfig::getConfigKey, "streamType").eq(SysConfig::getConfigValue, deviceSn));
-        return sysConfig.getRemark();
+        List<String> collect = sysConfig.stream().map(SysConfig::getRemark).collect(Collectors.toList());
+        return collect;
     }
 
 }