|
@@ -86,35 +86,39 @@ public class ParameterSetServiceImpl implements IParameterSetService {
|
|
|
String playRate = parameterSet.getPlayRate();
|
|
|
if (StringUtils.isNotEmpty(channelRange)) {
|
|
|
try {
|
|
|
- CompletableFuture<Void> future = mqttService.publish(DETECTION_RECT, channelId+"_"+channelRange);
|
|
|
+ CompletableFuture<Void> future = mqttService.publish(DETECTION_RECT, channelId + "_" + channelRange);
|
|
|
future.get(10, TimeUnit.SECONDS);
|
|
|
} catch (InterruptedException | ExecutionException | TimeoutException e) {
|
|
|
return AjaxResult.error("发布消息失败:" + DETECTION_RECT);
|
|
|
}
|
|
|
- } else if (StringUtils.isNotEmpty(leaveTime)) {
|
|
|
+ }
|
|
|
+ if (StringUtils.isNotEmpty(leaveTime)) {
|
|
|
try {
|
|
|
- CompletableFuture<Void> future = mqttService.publish(DETECTION_LEAVETIME, channelId+"_"+leaveTime);
|
|
|
+ CompletableFuture<Void> future = mqttService.publish(DETECTION_LEAVETIME, channelId + "_" + leaveTime);
|
|
|
future.get(10, TimeUnit.SECONDS);
|
|
|
} catch (InterruptedException | ExecutionException | TimeoutException e) {
|
|
|
return AjaxResult.error("发布消息失败:" + DETECTION_LEAVETIME);
|
|
|
}
|
|
|
- } else if (StringUtils.isNotEmpty(playTime)) {
|
|
|
+ }
|
|
|
+ if (StringUtils.isNotEmpty(playTime)) {
|
|
|
try {
|
|
|
- CompletableFuture<Void> future = mqttService.publish(DETECTION_PLAYTIME, channelId+"_"+playTime);
|
|
|
+ CompletableFuture<Void> future = mqttService.publish(DETECTION_PLAYTIME, channelId + "_" + playTime);
|
|
|
future.get(10, TimeUnit.SECONDS);
|
|
|
} catch (InterruptedException | ExecutionException | TimeoutException e) {
|
|
|
return AjaxResult.error("发布消息失败:" + DETECTION_PLAYTIME);
|
|
|
}
|
|
|
- } else if (StringUtils.isNotEmpty(leaveRate)) {
|
|
|
+ }
|
|
|
+ if (StringUtils.isNotEmpty(leaveRate)) {
|
|
|
try {
|
|
|
- CompletableFuture<Void> future = mqttService.publish(DETECTION_LEAVERATE, channelId+"_"+leaveRate);
|
|
|
+ CompletableFuture<Void> future = mqttService.publish(DETECTION_LEAVERATE, channelId + "_" + leaveRate);
|
|
|
future.get(10, TimeUnit.SECONDS);
|
|
|
} catch (InterruptedException | ExecutionException | TimeoutException e) {
|
|
|
return AjaxResult.error("发布消息失败:" + DETECTION_LEAVERATE);
|
|
|
}
|
|
|
- } else if (StringUtils.isNotEmpty(playRate)) {
|
|
|
+ }
|
|
|
+ if (StringUtils.isNotEmpty(playRate)) {
|
|
|
try {
|
|
|
- CompletableFuture<Void> future = mqttService.publish(DETECTION_PLAYRATE, channelId+"_"+playRate);
|
|
|
+ CompletableFuture<Void> future = mqttService.publish(DETECTION_PLAYRATE, channelId + "_" + playRate);
|
|
|
future.get(10, TimeUnit.SECONDS);
|
|
|
} catch (InterruptedException | ExecutionException | TimeoutException e) {
|
|
|
return AjaxResult.error("发布消息失败:" + DETECTION_PLAYRATE);
|