From 6ec7b33492417900ead18175f187381dedc9bc0e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 21 三月 2024 14:26:11 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/service/MapService.java | 4 ++--
zy-asrs-flow/src/pages/map/index.jsx | 1 +
zy-asrs-flow/src/pages/map/utils.js | 3 +--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/index.jsx b/zy-asrs-flow/src/pages/map/index.jsx
index a1991fd..668981a 100644
--- a/zy-asrs-flow/src/pages/map/index.jsx
+++ b/zy-asrs-flow/src/pages/map/index.jsx
@@ -221,6 +221,7 @@
// watch curFloor
React.useEffect(() => {
+ Utils.fetchMapData(curFloor);
}, [curFloor]);
// didClickSprite, stop triggers both sprite click and play's selection boxs
diff --git a/zy-asrs-flow/src/pages/map/utils.js b/zy-asrs-flow/src/pages/map/utils.js
index efd533d..ec2a53f 100644
--- a/zy-asrs-flow/src/pages/map/utils.js
+++ b/zy-asrs-flow/src/pages/map/utils.js
@@ -329,10 +329,9 @@
}
export const fetchMapData = async (curFloor) => {
- console.log(curFloor);
clearMapData();
await Http.doPostPromise('api/map/list', { floor: curFloor }, (res) => {
- const mapItemList = res.data.itemList;
+ const mapItemList = eval(res.data);
mapItemList.forEach(item => {
let sprite;
switch (item.type) {
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/service/MapService.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/service/MapService.java
index 23dcc88..5622fc3 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/service/MapService.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/service/MapService.java
@@ -26,13 +26,13 @@
@Autowired
private DictService dictService;
- public MapDataParam getMapData(MapQueryParam param, Long userId) {
+ public String getMapData(MapQueryParam param, Long userId) {
String mapKey = getMapKey(param.getFloor());
Dict dict = dictService.getOne(new LambdaQueryWrapper<Dict>().eq(Dict::getFlag, mapKey));
if (Cools.isEmpty(dict)) {
return null;
} else {
- return JSON.parseObject(dict.getValue(), MapDataParam.class) ;
+ return dict.getValue();
}
}
--
Gitblit v1.9.1