解决冲突
This commit is contained in:
@ -1,75 +1,76 @@
|
|||||||
//package com.ho.datacollect.util;
|
package com.ho.datacollect.util;
|
||||||
//
|
|
||||||
//public class AnotherMqttConfigUtil {
|
public class AnotherMqttConfigUtil {
|
||||||
//
|
|
||||||
// public static String[] commonTopic = new String[]{
|
public static String[] commonTopic = new String[]{
|
||||||
// "+/device/27d83a2844ff5866",
|
"+/device/27d83a2844ff5866",
|
||||||
// "+/device/77ba753718908d1a",
|
"+/device/77ba753718908d1a",
|
||||||
// "1/device/+"
|
"+/device/93372fa4f4c4ebcf",
|
||||||
// };
|
"1/device/+"
|
||||||
//
|
};
|
||||||
// /**
|
|
||||||
// * 获取登录验证的监听主题
|
/**
|
||||||
// * @return
|
* 获取登录验证的监听主题
|
||||||
// */
|
* @return
|
||||||
// public static String[] getLoginRequestTopic(){
|
*/
|
||||||
// String log = "/login/request";
|
public static String[] getLoginRequestTopic(){
|
||||||
// String[] str = new String[commonTopic.length];
|
String log = "/login/request";
|
||||||
// for (int i = 0; i < commonTopic.length; i++) {
|
String[] str = new String[commonTopic.length];
|
||||||
// str[i] = commonTopic[i]+log;
|
for (int i = 0; i < commonTopic.length; i++) {
|
||||||
// }
|
str[i] = commonTopic[i]+log;
|
||||||
// return str;
|
}
|
||||||
// }
|
return str;
|
||||||
//
|
}
|
||||||
// /**
|
|
||||||
// * 读取文件请求的监听主题
|
/**
|
||||||
// * @return
|
* 读取文件请求的监听主题
|
||||||
// */
|
* @return
|
||||||
// public static String[] getReadRequestTopic(){
|
*/
|
||||||
// String log = "/read/response";
|
public static String[] getReadRequestTopic(){
|
||||||
// String[] str = new String[commonTopic.length];
|
String log = "/read/response";
|
||||||
// for (int i = 0; i < commonTopic.length; i++) {
|
String[] str = new String[commonTopic.length];
|
||||||
// str[i] = commonTopic[i]+log;
|
for (int i = 0; i < commonTopic.length; i++) {
|
||||||
// }
|
str[i] = commonTopic[i]+log;
|
||||||
// return str;
|
}
|
||||||
// }
|
return str;
|
||||||
//
|
}
|
||||||
// /**
|
|
||||||
// * 写文件响应的监听主题
|
/**
|
||||||
// * @return
|
* 写文件响应的监听主题
|
||||||
// */
|
* @return
|
||||||
// public static String[] getWriteRequestTopic(){
|
*/
|
||||||
// String log = "/write/response";
|
public static String[] getWriteRequestTopic(){
|
||||||
// String[] str = new String[commonTopic.length];
|
String log = "/write/response";
|
||||||
// for (int i = 0; i < commonTopic.length; i++) {
|
String[] str = new String[commonTopic.length];
|
||||||
// str[i] = commonTopic[i]+log;
|
for (int i = 0; i < commonTopic.length; i++) {
|
||||||
// }
|
str[i] = commonTopic[i]+log;
|
||||||
// return str;
|
}
|
||||||
// }
|
return str;
|
||||||
//
|
}
|
||||||
// /**
|
|
||||||
// * 获取数据上送监听主题
|
/**
|
||||||
// * @return
|
* 获取数据上送监听主题
|
||||||
// */
|
* @return
|
||||||
// public static String[] getReportPushTopic(){
|
*/
|
||||||
// String log = "/report/push";
|
public static String[] getReportPushTopic(){
|
||||||
// String[] str = new String[commonTopic.length];
|
String log = "/report/push";
|
||||||
// for (int i = 0; i < commonTopic.length; i++) {
|
String[] str = new String[commonTopic.length];
|
||||||
// str[i] = commonTopic[i]+log;
|
for (int i = 0; i < commonTopic.length; i++) {
|
||||||
// }
|
str[i] = commonTopic[i]+log;
|
||||||
// return str;
|
}
|
||||||
// }
|
return str;
|
||||||
//
|
}
|
||||||
// /**
|
|
||||||
// * 获取远程控制主题
|
/**
|
||||||
// * @return
|
* 获取远程控制主题
|
||||||
// */
|
* @return
|
||||||
// public static String[] getControlResponseTopic(){
|
*/
|
||||||
// String log = "/control/response";
|
public static String[] getControlResponseTopic(){
|
||||||
// String[] str = new String[commonTopic.length];
|
String log = "/control/response";
|
||||||
// for (int i = 0; i < commonTopic.length; i++) {
|
String[] str = new String[commonTopic.length];
|
||||||
// str[i] = commonTopic[i]+log;
|
for (int i = 0; i < commonTopic.length; i++) {
|
||||||
// }
|
str[i] = commonTopic[i]+log;
|
||||||
// return str;
|
}
|
||||||
// }
|
return str;
|
||||||
//}
|
}
|
||||||
|
}
|
||||||
|
|||||||
@ -1,66 +1,67 @@
|
|||||||
//package com.ho.filecenter.util;
|
package com.ho.filecenter.util;
|
||||||
//
|
|
||||||
//import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
//import java.util.List;
|
import java.util.List;
|
||||||
//
|
|
||||||
//public class AnotherMqttConfigUtil {
|
public class AnotherMqttConfigUtil {
|
||||||
//
|
|
||||||
// public static String[] commonTopic = new String[]{
|
public static String[] commonTopic = new String[]{
|
||||||
// "+/device/27d83a2844ff5866",
|
"+/device/27d83a2844ff5866",
|
||||||
// "+/device/77ba753718908d1a",
|
"+/device/77ba753718908d1a",
|
||||||
// "1/device/+"
|
"+/device/93372fa4f4c4ebcf",
|
||||||
// };
|
"1/device/+"
|
||||||
//
|
};
|
||||||
// /**
|
|
||||||
// * 获取文件请求监听主题
|
/**
|
||||||
// * @return
|
* 获取文件请求监听主题
|
||||||
// */
|
* @return
|
||||||
// public static String[] getFileRequestTopic(){
|
*/
|
||||||
// String log = "/file/request";
|
public static String[] getFileRequestTopic(){
|
||||||
// String[] str = new String[commonTopic.length];
|
String log = "/file/request";
|
||||||
// for (int i = 0; i < commonTopic.length; i++) {
|
String[] str = new String[commonTopic.length];
|
||||||
// str[i] = commonTopic[i]+log;
|
for (int i = 0; i < commonTopic.length; i++) {
|
||||||
// }
|
str[i] = commonTopic[i]+log;
|
||||||
// return str;
|
}
|
||||||
// }
|
return str;
|
||||||
//
|
}
|
||||||
// /**
|
|
||||||
// * 读取文件响应监听主题
|
/**
|
||||||
// * @return
|
* 读取文件响应监听主题
|
||||||
// */
|
* @return
|
||||||
// public static String[] getFileResponseTopic(){
|
*/
|
||||||
// String log = "/file/response";
|
public static String[] getFileResponseTopic(){
|
||||||
// String[] str = new String[commonTopic.length];
|
String log = "/file/response";
|
||||||
// for (int i = 0; i < commonTopic.length; i++) {
|
String[] str = new String[commonTopic.length];
|
||||||
// str[i] = commonTopic[i]+log;
|
for (int i = 0; i < commonTopic.length; i++) {
|
||||||
// }
|
str[i] = commonTopic[i]+log;
|
||||||
// return str;
|
}
|
||||||
// }
|
return str;
|
||||||
//
|
}
|
||||||
// public static String[] getCurveResponseTopic(){
|
|
||||||
// String log = "/curve/response";
|
public static String[] getCurveResponseTopic(){
|
||||||
// String[] str = new String[commonTopic.length];
|
String log = "/curve/response";
|
||||||
// for (int i = 0; i < commonTopic.length; i++) {
|
String[] str = new String[commonTopic.length];
|
||||||
// str[i] = commonTopic[i]+log;
|
for (int i = 0; i < commonTopic.length; i++) {
|
||||||
// }
|
str[i] = commonTopic[i]+log;
|
||||||
// return str;
|
}
|
||||||
// }
|
return str;
|
||||||
//
|
}
|
||||||
// public static String[] getDispatchResponseTopic(){
|
|
||||||
// String log = "/dispatch/response";
|
public static String[] getDispatchResponseTopic(){
|
||||||
// String[] str = new String[commonTopic.length];
|
String log = "/dispatch/response";
|
||||||
// for (int i = 0; i < commonTopic.length; i++) {
|
String[] str = new String[commonTopic.length];
|
||||||
// str[i] = commonTopic[i]+log;
|
for (int i = 0; i < commonTopic.length; i++) {
|
||||||
// }
|
str[i] = commonTopic[i]+log;
|
||||||
// return str;
|
}
|
||||||
// }
|
return str;
|
||||||
//
|
}
|
||||||
// /**
|
|
||||||
// * 获取SN配置合集
|
/**
|
||||||
// * @return
|
* 获取SN配置合集
|
||||||
// */
|
* @return
|
||||||
// public static List<String> getSnList(){
|
*/
|
||||||
// List<String> strings = Arrays.asList(commonTopic);
|
public static List<String> getSnList(){
|
||||||
// return strings;
|
List<String> strings = Arrays.asList(commonTopic);
|
||||||
// }
|
return strings;
|
||||||
//}
|
}
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user