From 1c6befe06b8a19dd5da1e34fc667d45be1597bb7 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期六, 19 七月 2025 18:31:33 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/LocMastController.java | 106 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 77 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index a08e8c3..55346b9 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -1,5 +1,6 @@
package com.zy.asrs.controller;
+import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
@@ -11,11 +12,14 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.core.exception.CoolException;
+import com.zy.asrs.entity.BasMap;
import com.zy.asrs.entity.LocMast;
-import com.zy.asrs.entity.WrkMast;
+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.web.BaseController;
import com.zy.core.enums.LocStsType;
@@ -35,6 +39,8 @@
private NavigateMapData navigateMapData;
@Autowired
private LocMastService locMastService;
+ @Autowired
+ private BasMapService basMapService;
@RequestMapping(value = "/locMast/{id}/auth")
@ManagerAuth
@@ -139,39 +145,81 @@
@PostMapping("/locMast/init")
@ManagerAuth(memo = "鍒濆鍖栧簱浣�")
@Transactional
- public R shuttleStateTable(){
- locMastService.delete(new EntityWrapper<>(new LocMast()));
+ 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);
- for (int i = 1; i <= 4; i++) {//鎬诲叡鍥涘眰妤�
- List<List<MapNode>> lists = navigateMapData.getJsonData(i, -1, 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);
-
- if (mapNode.getValue() == MapNodeType.DISABLE.id) {
- continue;
- }
-
- String locNo = Utils.getLocNo(row, bay, i);
- LocMast locMast = new LocMast();
- locMast.setLocNo(locNo);
- locMast.setRow1(row);
- locMast.setBay1(bay);
- locMast.setLev1(i);
-
- 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());
- }
-
- locMastService.insert(locMast);
+ if (mapNode.getValue() == MapNodeType.DISABLE.id) {
+ continue;
}
+
+ String locNo = Utils.getLocNo(row, bay, lev);
+ LocMast locMast = new LocMast();
+ locMast.setLocNo(locNo);
+ locMast.setRow1(row);
+ locMast.setBay1(bay);
+ locMast.setLev1(lev);
+ 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());
+ }
+
+ 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;
+ }
return R.ok();
}
--
Gitblit v1.9.1