From 5d0461e985b9244cfbea910bc6df9e3f62caaed2 Mon Sep 17 00:00:00 2001
From: DELL <DELL@qq.com>
Date: 星期五, 28 十一月 2025 13:37:31 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/LocMastController.java | 125 ++++++++++++++++++-----------------------
1 files changed, 55 insertions(+), 70 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index 55346b9..35488c6 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -17,13 +17,10 @@
import com.zy.asrs.service.BasMapService;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.utils.Utils;
-import com.zy.common.model.MapNode;
-import com.zy.common.model.NavigateNode;
-import com.zy.common.model.enums.NavigationMapType;
-import com.zy.common.utils.NavigateMapData;
+import com.zy.common.utils.RedisUtil;
import com.zy.common.web.BaseController;
import com.zy.core.enums.LocStsType;
-import com.zy.core.enums.MapNodeType;
+import com.zy.core.enums.RedisKeyType;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@@ -36,11 +33,11 @@
public class LocMastController extends BaseController {
@Autowired
- private NavigateMapData navigateMapData;
- @Autowired
private LocMastService locMastService;
@Autowired
private BasMapService basMapService;
+ @Autowired
+ private RedisUtil redisUtil;
@RequestMapping(value = "/locMast/{id}/auth")
@ManagerAuth
@@ -146,80 +143,68 @@
@ManagerAuth(memo = "鍒濆鍖栧簱浣�")
@Transactional
public R locMastInit(@RequestParam Integer lev) {
- BasMap basMap = basMapService.selectLatestMap(lev);
- locMastService.delete(new EntityWrapper<>(new LocMast())
- .eq("lev1", lev));
- List<List<MapNode>> lists = navigateMapData.getJsonData(lev, NavigationMapType.getMapTypes(NavigationMapType.NONE), null, null);//鑾峰彇瀹屾暣鍦板浘(鍖呮嫭鍏ュ簱鍑哄簱)
- for (int row = 0; row < lists.size(); row++) {
- List<MapNode> nodeList = lists.get(row);
- for (int bay = 0; bay < nodeList.size(); bay++) {
- MapNode mapNode = nodeList.get(bay);
+ BasMap basMap = basMapService.selectOne(new EntityWrapper<BasMap>().eq("lev", 1));
+ if (Cools.isEmpty(basMap)){
+ return R.error("璇峰厛鍒濆鍖栧湴鍥�");
+ }
+ List<List<JSONObject>> dataList = JSON.parseObject(basMap.getData(), List.class);
- if (mapNode.getValue() == MapNodeType.DISABLE.id) {
+ List<HashMap<String, Object>> locNoList = new ArrayList<>();
+
+ int initRow = 1;
+ for (int i = 0; i < dataList.size(); i++) {
+ List<JSONObject> row = dataList.get(i);
+
+ int initBay = -1;
+ for (int j = 0; j < row.size(); j++) {
+ JSONObject map = row.get(j);
+
+ String nodeType = map.getString("type");
+ if("shelf".equals(nodeType)) {
+ if(initBay == -1) {
+ initBay = 2;
+ }
+
+ HashMap<String, Object> locNoMap = new HashMap<>();
+ locNoMap.put("row", initRow);
+ locNoMap.put("bay", initBay);
+ locNoMap.put("mapX", i);
+ locNoMap.put("mapY", j);
+ locNoList.add(locNoMap);
+ initBay++;
+ }else {
continue;
}
+ }
- String locNo = Utils.getLocNo(row, bay, lev);
+ if(initBay != -1) {
+ initRow++;
+ }
+ }
+
+ locMastService.delete(new EntityWrapper<LocMast>());
+
+ for (int i = 1; i <= lev; i++) {
+ int finalLev = i;
+ locNoList.forEach(map -> {
LocMast locMast = new LocMast();
- locMast.setLocNo(locNo);
+ int row = (int) map.get("row");
+ int bay = (int) map.get("bay");
+ int mapX = (int) map.get("mapX");
+ int mapY = (int) map.get("mapY");
+ locMast.setLocNo(Utils.getLocNo(row, bay, finalLev));
+ locMast.setLocSts(String.valueOf(LocStsType.O));
locMast.setRow1(row);
locMast.setBay1(bay);
- locMast.setLev1(lev);
+ locMast.setLev1(finalLev);
+ locMast.setLocType(Utils.getLocNo(mapX, mapY, finalLev));
locMast.setStatus(1);
-
- if (mapNode.getValue() == MapNodeType.NORMAL_PATH.id) {
- locMast.setLocSts(LocStsType.O.toString());
- } else if (mapNode.getValue() == MapNodeType.MAIN_PATH.id) {
- locMast.setLocSts(LocStsType.W.toString());
- }
-
+ locMast.setAppeTime(new Date());
locMastService.insert(locMast);
- }
+ });
}
- LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("lev1", lev).orderBy("row1", false));
- Integer rowMax = locMast.getRow1();
- Integer baseRow = basMap.getBaseRow();
- Integer baseRowCode = basMap.getBaseRowCode();
-
- for (int i = baseRow; i <= rowMax; i++) {
- Integer baseBayCode = basMap.getBaseBayCode();
- if (basMap.getBaseBay() > 0) {
- for (int j = 1; j <= basMap.getBaseBay(); j++) {
- String locNo = Utils.getLocNo(i, j, lev);
-
- LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>()
- .eq("loc_no", locNo));
- if (locMast1 != null) {
- HashMap<String, Object> point = new HashMap<>();
- point.put("y", baseRowCode);
- point.put("x", baseBayCode);
- point.put("z", lev);
- locMast1.setQrCodeValue(JSON.toJSONString(point));
- locMastService.updateById(locMast1);
- }
- baseBayCode += 1;
- }
- }else {
- int baseBay = basMap.getBaseBay() * -1;
- for (int j = baseBay; j > 0; j--) {
- String locNo = Utils.getLocNo(i, j, lev);
-
- LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>()
- .eq("loc_no", locNo));
- if (locMast1 != null) {
- HashMap<String, Object> point = new HashMap<>();
- point.put("y", baseRowCode);
- point.put("x", baseBayCode);
- point.put("z", lev);
- locMast1.setQrCodeValue(JSON.toJSONString(point));
- locMastService.updateById(locMast1);
- }
- baseBayCode += 1;
- }
- }
- baseRowCode += 1;
- }
+ redisUtil.del(RedisKeyType.LOC_MAP_BASE.key);
return R.ok();
}
--
Gitblit v1.9.1