From 7cd7f3aeb97518b1f50699b0204135c6f53aef5e Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期二, 26 三月 2024 13:53:38 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/service/MapService.java | 24 +++++-------------------
1 files changed, 5 insertions(+), 19 deletions(-)
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 0ec2113..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,26 +26,17 @@
@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();
}
-
-
-// User user = userService.getById(userId);
-// if (Cools.isEmpty(user.getMemo())) {
-// return new MapDataParam();
-// }
-// return JSON.parseObject(user.getMemo(), MapDataParam.class);
}
public void saveMapData(MapDataParam param, Long userId) {
-
String mapKey = getMapKey(param.getFloor());
Dict dict = dictService.getOne(new LambdaQueryWrapper<Dict>().eq(Dict::getFlag, mapKey));
if (Cools.isEmpty(dict)) {
@@ -54,25 +45,20 @@
dict.setFlag(mapKey);
dict.setType(DictType.JSON.flag);
dict.setValue(JSON.toJSONString(param.getItemList()));
+ dict.setCreateBy(userId);
+ dict.setUpdateBy(userId);
if (!dictService.save(dict)) {
throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
}
} else {
dict.setValue(JSON.toJSONString(param.getItemList()));
dict.setUpdateTime(new Date());
+ dict.setUpdateBy(userId);
if (!dictService.updateById(dict)) {
throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
}
}
-
-//
-// User user = userService.getById(userId);
-// user.setMemo(JSON.toJSONString(param));
-// if (!userService.updateById(user)) {
-// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
-// }
}
-
private String getMapKey(Integer floor) {
if (null != floor) {
--
Gitblit v1.9.1