From 63a1882e1e042c13ab809508ce58549f37ca5ad6 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 21 三月 2024 13:24:41 +0800
Subject: [PATCH] Merge branch 'Four-Way-Rack' of http://47.97.1.152:5880/r/zy-asrs-master into Four-Way-Rack
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/service/MapService.java | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 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 4ec28c1..ee3728c 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
@@ -1,10 +1,14 @@
package com.zy.asrs.wcs.core.map.service;
import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wcs.core.map.controller.param.MapDataParam;
+import com.zy.asrs.wcs.core.map.controller.param.MapQueryParam;
+import com.zy.asrs.wcs.system.entity.Dict;
import com.zy.asrs.wcs.system.entity.User;
+import com.zy.asrs.wcs.system.service.DictService;
import com.zy.asrs.wcs.system.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -17,13 +21,24 @@
@Autowired
private UserService userService;
+ @Autowired
+ private DictService dictService;
- public MapDataParam getMapData(Long userId) {
- User user = userService.getById(userId);
- if (Cools.isEmpty(user.getMemo())) {
- return new MapDataParam();
+ public MapDataParam getMapData(MapQueryParam param, Long userId) {
+
+ String dictFlag = "map-" + param.getFloor();
+ Dict dict = dictService.getOne(new LambdaQueryWrapper<Dict>().eq(Dict::getFlag, dictFlag));
+ if (Cools.isEmpty(dict)) {
+ return null;
+ } else {
+ return JSON.parseObject(dict.getValue(), MapDataParam.class) ;
}
- return JSON.parseObject(user.getMemo(), MapDataParam.class);
+
+// 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) {
--
Gitblit v1.9.1