From 7d45db8d9d03a890e589c6b53980afdac180e029 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期四, 29 五月 2025 10:47:51 +0800
Subject: [PATCH] 消防机器人websocket逻辑更新
---
src/main/java/com/whyc/webSocket/receiver/ThirdPartyWebSocketHandler.java | 1 +
src/main/java/com/whyc/pojo/db_fire_robot/RobotStatus.java | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/whyc/pojo/db_fire_robot/RobotStatus.java b/src/main/java/com/whyc/pojo/db_fire_robot/RobotStatus.java
index 3f29f53..66c8ae5 100644
--- a/src/main/java/com/whyc/pojo/db_fire_robot/RobotStatus.java
+++ b/src/main/java/com/whyc/pojo/db_fire_robot/RobotStatus.java
@@ -34,7 +34,7 @@
private int position;
@ApiModelProperty(value = "褰撳墠浣嶇疆鍖洪棿锛�0-1銆�2-3鈥︹��")
- private int regposition;
+ private String regposition;
@ApiModelProperty(value = "褰撳墠浣嶇疆鍖洪棿鐧惧垎姣旓紝鍗曚綅锛�%")
private int perposition;
diff --git a/src/main/java/com/whyc/webSocket/receiver/ThirdPartyWebSocketHandler.java b/src/main/java/com/whyc/webSocket/receiver/ThirdPartyWebSocketHandler.java
index 5d2c597..2f64aa3 100644
--- a/src/main/java/com/whyc/webSocket/receiver/ThirdPartyWebSocketHandler.java
+++ b/src/main/java/com/whyc/webSocket/receiver/ThirdPartyWebSocketHandler.java
@@ -68,6 +68,7 @@
robotStatusService.addOrUpdate(status);
}break;
case "alarm": {
+ gson = JsonUtil.getGson("yyyy-MM-dd HH-mm-ss");
FireRobotData<RobotAlarm> data = gson.fromJson(jsonStr, new TypeToken<FireRobotData<RobotAlarm>>() {
}.getType());
RobotAlarm alarm = data.getData();
--
Gitblit v1.9.1