From 9d0acfb65c80c4948c305ca01338f894b87346a0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 08 四月 2024 09:44:37 +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 | 84 +++++++++++++++++++++++++++++++-----------
1 files changed, 62 insertions(+), 22 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..94a8a55 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
@@ -7,13 +7,15 @@
import com.zy.asrs.wcs.common.domain.enums.DictType;
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.core.map.controller.result.LocVo;
+import com.zy.asrs.wcs.core.utils.Utils;
import com.zy.asrs.wcs.system.entity.Dict;
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;
-import java.util.Date;
+import java.util.*;
/**
* Created by vincent on 3/15/2024
@@ -26,26 +28,31 @@
@Autowired
private DictService dictService;
- public MapDataParam getMapData(MapQueryParam param, Long userId) {
+ public String getMapFloorList(Long userId) {
+ String floorKey = "map-floor-list";
+ Dict dict = dictService.getOne(new LambdaQueryWrapper<Dict>().eq(Dict::getFlag, floorKey));
+ if (null == dict) {
+ dict = new Dict();
+ dict.setName(floorKey);
+ dict.setFlag(floorKey);
+ dict.setType(DictType.JSON.flag);
+ dict.setValue(floorListStr);
+ dict.setCreateBy(userId);
+ dict.setUpdateBy(userId);
+ if (!dictService.save(dict)) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
+ }
+ }
+ return Optional.ofNullable(dict).map(Dict::getValue).orElse(null);
+ }
+ 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) ;
- }
-
-
-// User user = userService.getById(userId);
-// if (Cools.isEmpty(user.getMemo())) {
-// return new MapDataParam();
-// }
-// return JSON.parseObject(user.getMemo(), MapDataParam.class);
+ return Optional.ofNullable(dict).map(Dict::getValue).orElse(null);
}
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 +61,35 @@
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("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
-// }
}
+
+ public List<LocVo> getShelfLocNoList(String locNo) {
+ List<LocVo> locVos = new ArrayList<>();
+ int row = Utils.getRow(locNo);
+ int bay = Utils.getBay(locNo);
+
+
+ String[] statusOptions = {"F", "D", "O"};
+ Random random = new Random();
+ for (int lev = 1; lev < 6; lev++) {
+ locVos.add(new LocVo(Utils.getLocNo(row, bay, lev), statusOptions[random.nextInt(statusOptions.length)]));
+ }
+ return locVos;
+ }
private String getMapKey(Integer floor) {
if (null != floor) {
@@ -81,4 +98,27 @@
return "map";
}
+ private final String floorListStr = "[\n" +
+ " {\n" +
+ " label: '1F',\n" +
+ " value: 1\n" +
+ " },\n" +
+ " {\n" +
+ " label: '2F',\n" +
+ " value: 2\n" +
+ " },\n" +
+ " {\n" +
+ " label: '3F',\n" +
+ " value: 3\n" +
+ " },\n" +
+ " {\n" +
+ " label: '4F',\n" +
+ " value: 4\n" +
+ " },\n" +
+ " {\n" +
+ " label: '5F',\n" +
+ " value: 5\n" +
+ " },\n" +
+ "]";
+
}
--
Gitblit v1.9.1