From ff7f41f5d6c99bff4a1d85a5b3342eec5a8fee0c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 07 十一月 2024 08:52:34 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/resources/application.yml | 2 +-
zy-acs-manager/src/main/java/com/zy/acs/manager/common/CodeBuilder.java | 18 ++++++++++++++++++
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataWsScheduler.java | 17 +++++++++--------
3 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/common/CodeBuilder.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/common/CodeBuilder.java
index 3dc1241..6cfd2fa 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/common/CodeBuilder.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/common/CodeBuilder.java
@@ -44,4 +44,22 @@
PRIMARY KEY (`id`)
) ENGINE=INNODB AUTO_INCREMENT=15 DEFAULT CHARSET=utf8;
*/
+
}
+/**
+ *
+ * TRUNCATE man_action;
+ * TRUNCATE man_bus;
+ * TRUNCATE man_code;
+ * TRUNCATE man_code_gap;
+ * TRUNCATE man_func_sta;
+ * TRUNCATE man_jam;
+ * TRUNCATE man_loc;
+ * TRUNCATE man_nav_map;
+ * TRUNCATE man_route;
+ * TRUNCATE man_segment;
+ * TRUNCATE man_sta;
+ * TRUNCATE man_task;
+ * TRUNCATE man_travel;
+ *
+ */
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataWsScheduler.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataWsScheduler.java
index 09035a8..4bb3460 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataWsScheduler.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataWsScheduler.java
@@ -42,18 +42,18 @@
@Scheduled(cron = "0/1 * * * * ? ")
public void broadcast() {
- i++;
- int key;
- if (i > 10) {
- i=0;
- }
- key = i /2;
- MapWebSocket.broadcast(mockData.get(key));
+// i++;
+// int key;
+// if (i > 10) {
+// i=0;
+// }
+// key = i /2;
+// MapWebSocket.broadcast(mockData.get(key));
MapWsVo mapWsVo = new MapWsVo();
mapWsVo.setAgvVos(syncAgv());
-// MapWebSocket.broadcast(GsonUtils.toJson(mapWsVo));
+ MapWebSocket.broadcast(GsonUtils.toJson(mapWsVo));
}
private List<MapWsAgvVo> syncAgv() {
@@ -68,6 +68,7 @@
Long recentCode = agvDetail.getRecentCode();
if (null == recentCode) { continue; }
Code code = codeService.getById(recentCode);
+ if (null == code) { continue; }
MapWsAgvVo vo = new MapWsAgvVo();
vo.setAgvNo(agv.getUuid());
diff --git a/zy-acs-manager/src/main/resources/application.yml b/zy-acs-manager/src/main/resources/application.yml
index ddd21e3..dd056d3 100644
--- a/zy-acs-manager/src/main/resources/application.yml
+++ b/zy-acs-manager/src/main/resources/application.yml
@@ -8,7 +8,7 @@
static-path-pattern: /**
datasource:
driver-class-name: com.mysql.jdbc.Driver
- url: jdbc:mysql://localhost:3306/react_admin_dev?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://localhost:3306/zy_rcs?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
# url: jdbc:mysql://192.168.2.46:3306/zy_acs?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: root
password: xltys1995
--
Gitblit v1.9.1