tjf преди 11 часа
родител
ревизия
7b609727a6

+ 4 - 4
ruoyi-admin/src/main/resources/application.yml

@@ -19,8 +19,8 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
-#          active: druid
-         active: prod
+          active: druid
+#         active: prod
   # 文件上传
   servlet:
     multipart:
@@ -77,8 +77,8 @@ xss:
 # MQTT配置
 mqtt:
 #  server-uri: tcp://13.229.167.76:1883
-#  server-uri: tcp://60.171.161.56:20009
-  server-uri: tcp://127.0.0.1:1883
+  server-uri: tcp://60.171.161.56:20009
+#  server-uri: tcp://127.0.0.1:1883
 #  server-uri: tcp://192.168.101.147:1883
 #  server-uri: tcp://127.0.0.1:1883
   client-id: JavaClientBoMan

+ 5 - 4
ruoyi-system/src/main/java/com/ruoyi/manage/service/impl/ChannelNumberServiceImpl.java

@@ -76,16 +76,17 @@ public class ChannelNumberServiceImpl implements IChannelNumberService {
     public List<ChannelNumber> selectChannelNumberList(ChannelNumber channelNumber) {
         List<ChannelNumber> channelNumbers = channelNumberMapper.selectChannelNumberList(channelNumber);
         if (channelNumbers != null && !channelNumbers.isEmpty()) {
-            Long channelId = channelNumbers.get(0).getChannelId();
+            ChannelNumber channelNumberOne = channelNumbers.get(0);
+            Long channelId = channelNumberOne.getChannelId();
             //判断是否设置过参数
             ParameterSet parameterSet = parameterSetMapper.selectParameterSetByChannelId(channelId);
+            channelNumberOne.setIsChannel(N);
             if (parameterSet != null) {
-                channelNumber.setIsChannel(Y);
-                channelNumber.setParameterSet(parameterSet);
+                channelNumberOne.setIsChannel(Y);
+                channelNumberOne.setParameterSet(parameterSet);
             }
         }
         return channelNumbers;
-
     }
 
     /**