From f140f8d9e17f4465f029134b008ec7f644b0e3db Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 14 十一月 2025 11:08:05 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/LocMastController.java | 149 +++----------------------------------------------
1 files changed, 10 insertions(+), 139 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index db68d3b..6d9b652 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -11,7 +11,9 @@
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.service.BasMapService;
import com.zy.asrs.service.LocMastService;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
@@ -27,6 +29,8 @@
@Autowired
private LocMastService locMastService;
+ @Autowired
+ private BasMapService basMapService;
@RequestMapping(value = "/locMast/{id}/auth")
@ManagerAuth
@@ -132,145 +136,12 @@
@ManagerAuth(memo = "鍒濆鍖栧簱浣�")
@Transactional
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;
-// }
-// }
-// }
+ BasMap basMap = basMapService.selectOne(new EntityWrapper<BasMap>().eq("lev", 1));
+ if (Cools.isEmpty(basMap)){
+ return R.error("璇峰厛鍒濆鍖栧湴鍥�");
+ }
+
+
return R.ok();
}
--
Gitblit v1.9.1