From 1c4461b6851065398a66f9bf58fa2d1c501ba6ba Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 10 四月 2024 14:29:28 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/service/MapService.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 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 a46a9df..b7f0db8 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
@@ -8,6 +8,7 @@
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.map.controller.result.ShuttleVo;
import com.zy.asrs.wcs.core.utils.Utils;
import com.zy.asrs.wcs.system.entity.Dict;
import com.zy.asrs.wcs.system.service.DictService;
@@ -15,10 +16,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
/**
* Created by vincent on 3/15/2024
@@ -32,7 +30,7 @@
private DictService dictService;
public String getMapFloorList(Long userId) {
- String floorKey = "map-floor-list";
+ String floorKey = "floor-list";
Dict dict = dictService.getOne(new LambdaQueryWrapper<Dict>().eq(Dict::getFlag, floorKey));
if (null == dict) {
dict = new Dict();
@@ -84,12 +82,23 @@
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), "F"));
+ locVos.add(new LocVo(Utils.getLocNo(row, bay, lev), statusOptions[random.nextInt(statusOptions.length)]));
}
return locVos;
}
+ public ShuttleVo getShuttleInfo(String shuttleNo) {
+ ShuttleVo vo = new ShuttleVo();
+ vo.setShuttleNo(shuttleNo);
+
+ return vo;
+ }
+
private String getMapKey(Integer floor) {
if (null != floor) {
return "map-" + floor;
--
Gitblit v1.9.1