更新路径规划任务推送消息
This commit is contained in:
@@ -89,6 +89,7 @@ public class NettyDevice extends Connector {
|
||||
}
|
||||
|
||||
public synchronized Long finishTask() {
|
||||
sendPathCommand((byte) 0x01, (short) 0, 0.00d, 0.00d, (short) 0);
|
||||
long finishId = task.getId();
|
||||
task.setTaskStaus(DeviceTaskStaus.FINISH);
|
||||
task.setFinishTime(LocalDateTime.now());
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
package com.maibu.core.business.inter;
|
||||
|
||||
public interface DeviceWebSocketInterace {
|
||||
|
||||
void sendWebsoketMes(String key, String data);
|
||||
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
package com.maibu.core.business.inter;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.springframework.context.ApplicationContext;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
@Component
|
||||
public class WebsocketMesDispather {
|
||||
|
||||
@Resource
|
||||
private ApplicationContext applicationContext;
|
||||
|
||||
public void dispather(String key, String data) {
|
||||
Map<String, DeviceWebSocketInterace> beanMap = applicationContext.getBeansOfType(DeviceWebSocketInterace.class);
|
||||
// 遍历
|
||||
beanMap.values().forEach(x -> {
|
||||
x.sendWebsoketMes(key, data);
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
@@ -54,6 +54,13 @@ public class BaseController {
|
||||
PageUtils.startPage();
|
||||
}
|
||||
|
||||
/**
|
||||
* 设置请求分页数据
|
||||
*/
|
||||
protected void startPostPage(Integer pageNum,Integer pageSize) {
|
||||
PageHelper.startPage(pageNum, pageSize);
|
||||
}
|
||||
|
||||
/**
|
||||
* 设置请求排序数据
|
||||
*/
|
||||
|
||||
17
maibu-common/src/main/java/com/maibu/core/enums/MesType.java
Normal file
17
maibu-common/src/main/java/com/maibu/core/enums/MesType.java
Normal file
@@ -0,0 +1,17 @@
|
||||
package com.maibu.core.enums;
|
||||
|
||||
public enum MesType {
|
||||
AUTH, // 登录连接权限web->be
|
||||
deviceInfo, // 设备状态 be->web
|
||||
path, // 路径下发 web->be
|
||||
have_logged_in, // 消息
|
||||
device_status_changed, // 上下线状态变化
|
||||
device_error_push, // 错误推送
|
||||
device_task_change, // 任务状态变化推送
|
||||
device_task_arrive_point, // 任务点位到达
|
||||
heartbeat,
|
||||
remoteControl,
|
||||
detectionReport, // 障碍物消息
|
||||
switchPermission, // 切换控制申请
|
||||
switchResult;// 切换结果
|
||||
}
|
||||
@@ -17,5 +17,11 @@ public enum RespondCode {
|
||||
/**
|
||||
* 任务状态变化推送
|
||||
*/
|
||||
device_task_change
|
||||
device_task_change,
|
||||
|
||||
/**
|
||||
* 路径规划到达点位
|
||||
*/
|
||||
device_task_arrive_point
|
||||
|
||||
}
|
||||
|
||||
@@ -10,13 +10,11 @@ import com.maibu.utils.sql.SqlUtil;
|
||||
*
|
||||
* @author ruoyi
|
||||
*/
|
||||
public class PageUtils extends PageHelper
|
||||
{
|
||||
public class PageUtils extends PageHelper {
|
||||
/**
|
||||
* 设置请求分页数据
|
||||
*/
|
||||
public static void startPage()
|
||||
{
|
||||
public static void startPage() {
|
||||
PageDomain pageDomain = TableSupport.buildPageRequest();
|
||||
Integer pageNum = pageDomain.getPageNum();
|
||||
Integer pageSize = pageDomain.getPageSize();
|
||||
@@ -28,8 +26,7 @@ public class PageUtils extends PageHelper
|
||||
/**
|
||||
* 清理分页的线程变量
|
||||
*/
|
||||
public static void clearPage()
|
||||
{
|
||||
public static void clearPage() {
|
||||
PageHelper.clearPage();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user