From 82c36e2b434fa7a1c16b0448aa4cf1483107f79c Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期二, 02 十二月 2025 16:28:20 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/LocMastController.java | 64 +++++++++++++++++++++++++++++++
1 files changed, 63 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index 6d9b652..35488c6 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;
@@ -15,7 +16,11 @@
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.service.BasMapService;
import com.zy.asrs.service.LocMastService;
+import com.zy.asrs.utils.Utils;
+import com.zy.common.utils.RedisUtil;
import com.zy.common.web.BaseController;
+import com.zy.core.enums.LocStsType;
+import com.zy.core.enums.RedisKeyType;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@@ -31,6 +36,8 @@
private LocMastService locMastService;
@Autowired
private BasMapService basMapService;
+ @Autowired
+ private RedisUtil redisUtil;
@RequestMapping(value = "/locMast/{id}/auth")
@ManagerAuth
@@ -135,14 +142,69 @@
@PostMapping("/locMast/init")
@ManagerAuth(memo = "鍒濆鍖栧簱浣�")
@Transactional
- public R locMastInit() {
+ public R locMastInit(@RequestParam Integer lev) {
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);
+ 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;
+ }
+ }
+
+ 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();
+ 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(finalLev);
+ locMast.setLocType(Utils.getLocNo(mapX, mapY, finalLev));
+ locMast.setStatus(1);
+ locMast.setAppeTime(new Date());
+ locMastService.insert(locMast);
+ });
+ }
+
+ redisUtil.del(RedisKeyType.LOC_MAP_BASE.key);
return R.ok();
}
--
Gitblit v1.9.1