From d62c5c0eb2e28b7bf27d23de84a609b5a2e415e4 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期四, 17 十月 2024 18:48:00 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/controller/MapController.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/controller/MapController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/controller/MapController.java
index 6b9dd62..670c8c5 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/controller/MapController.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/controller/MapController.java
@@ -1,9 +1,12 @@
package com.zy.asrs.wcs.core.map.controller;
+import com.alibaba.fastjson.JSON;
import com.zy.asrs.framework.common.R;
import com.zy.asrs.wcs.core.map.controller.param.MapDataParam;
import com.zy.asrs.wcs.core.map.controller.param.MapQueryParam;
import com.zy.asrs.wcs.core.map.service.MapService;
+import com.zy.asrs.wcs.core.utils.RedisUtil;
+import com.zy.asrs.wcs.rcs.constant.DeviceRedisConstant;
import com.zy.asrs.wcs.system.controller.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -17,6 +20,8 @@
@Autowired
private MapService mapService;
+ @Autowired
+ private RedisUtil redisUtil;
// @PreAuthorize("hasAuthority('core:map:list')")
@PostMapping("/floor/list")
@@ -40,9 +45,14 @@
// 璐ф灦 - 搴撲綅 --------------------------------------------------------
+ @GetMapping("/shelf/group")
+ public R shelfGroup(@RequestParam String locNo) {
+ return R.ok().add(mapService.getShelfLocNoGroup(locNo));
+ }
+
@GetMapping("/shelf/info")
public R shelfInfo(@RequestParam String locNo) {
- return R.ok().add(mapService.getShelfLocNoList(locNo));
+ return R.ok().add(mapService.getShelfLocNoInfo(locNo));
}
// 绌挎杞� --------------------------------------------------------
@@ -65,4 +75,11 @@
// return R.ok().add(mapService.getShelfLocNoList(locNo));
// }
+ @GetMapping("/clearLockPath")
+ public R clearLockPath(@RequestParam Integer lev) {
+ redisUtil.del(DeviceRedisConstant.MAP + lev);
+ redisUtil.del(DeviceRedisConstant.LOCK_PATH + lev);
+ return R.ok();
+ }
+
}
--
Gitblit v1.9.1