From 8b4f5b2b23023986db813242cd04f4650537decd Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 05 十一月 2025 16:51:26 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/LocMastController.java | 180 ++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 140 insertions(+), 40 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..db68d3b 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -12,14 +12,8 @@
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.LocMast;
-import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.LocMastService;
-import com.zy.asrs.utils.Utils;
-import com.zy.common.model.MapNode;
-import com.zy.common.utils.NavigateMapData;
import com.zy.common.web.BaseController;
-import com.zy.core.enums.LocStsType;
-import com.zy.core.enums.MapNodeType;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@@ -31,8 +25,6 @@
@RestController
public class LocMastController extends BaseController {
- @Autowired
- private NavigateMapData navigateMapData;
@Autowired
private LocMastService locMastService;
@@ -139,38 +131,146 @@
@PostMapping("/locMast/init")
@ManagerAuth(memo = "鍒濆鍖栧簱浣�")
@Transactional
- public R shuttleStateTable(){
- locMastService.delete(new EntityWrapper<>(new LocMast()));
-
- 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);
- }
- }
- }
+ public R locMastInit() {
+// List<BasMap> basMaps = basMapService.selectList(new EntityWrapper<BasMap>().orderBy("lev", true));
+// basShuttleChargeService.delete(new EntityWrapper<>());
+// int chargeNo = 1;
+// for (BasMap basMap : basMaps) {
+// Integer lev = basMap.getLev();
+// 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);
+//
+// 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());
+// } else if (mapNode.getValue() == MapNodeType.CHARGE.id) {
+// locMast.setLocSts(LocStsType.C.toString());
+//
+// BasShuttleCharge basShuttleCharge = new BasShuttleCharge();
+// basShuttleCharge.setChargeId(chargeNo++);
+// basShuttleCharge.setLocNo(locNo);
+// basShuttleCharge.setWaitLocNo(locNo);
+// basShuttleCharge.setStatus(1);
+// basShuttleCharge.setCreateTime(new Date());
+// basShuttleCharge.setUpdateTime(new Date());
+// basShuttleChargeService.insert(basShuttleCharge);
+// } else if (mapNode.getValue() == MapNodeType.CONVEYOR.id) {
+// locMast.setLocSts(LocStsType.E.toString());
+// } else if (mapNode.getValue() == MapNodeType.LIFT.id) {
+// locMast.setLocSts(LocStsType.E.toString());
+// }
+//
+// locMastService.insert(locMast);
+// }
+// }
+//
+// LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("lev1", lev).orderBy("row1", false));
+// Integer rowMax = locMast.getRow1();
+// LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("lev1", lev).orderBy("bay1", false));
+// Integer bayMax = locMast2.getBay1();
+//
+// Integer baseRow = basMap.getBaseRow();
+// Integer baseRowCode = basMap.getBaseRowCode();
+//
+// if (baseRow > 0) {
+// for (int i = baseRow; i <= rowMax; i++) {
+// Integer baseBayCode = basMap.getBaseBayCode();
+// if (basMap.getBaseBay() > 0) {
+// for (int j = basMap.getBaseBay(); j <= bayMax; 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;
+// }
+// }else {
+// baseRow = baseRow * -1;
+// for (int i = baseRow; i > 0; i--) {
+// Integer baseBayCode = basMap.getBaseBayCode();
+// if (basMap.getBaseBay() > 0) {
+// for (int j = basMap.getBaseBay(); j <= bayMax; 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