From b6428016edf3de843020bc95fd1708d3bb1961e5 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 07 七月 2025 16:41:51 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 89 ++++++++++++++++++++++++++++++++++++--------
1 files changed, 72 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index e820576..821fb46 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -1,22 +1,32 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.R;
import com.zy.asrs.domain.param.SystemSwitchParam;
import com.zy.asrs.entity.BasMap;
+import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.BasMapService;
+import com.zy.asrs.service.WrkMastService;
import com.zy.common.model.MapNode;
import com.zy.common.model.enums.NavigationMapType;
import com.zy.common.utils.NavigateMapData;
import com.zy.common.utils.RedisUtil;
+import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.RedisKeyType;
+import com.zy.core.enums.SlaveType;
+import com.zy.core.model.ForkLiftSlave;
+import com.zy.core.model.ShuttleSlave;
+import com.zy.core.model.protocol.ForkLiftProtocol;
+import com.zy.core.model.protocol.ShuttleProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.properties.SystemProperties;
+import com.zy.core.thread.ForkLiftThread;
+import com.zy.core.thread.ShuttleThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
@@ -32,15 +42,15 @@
public class ConsoleController {
@Autowired
- private SlaveProperties slaveProperties;
- @Autowired
private BasMapService basMapService;
@Autowired
private RedisUtil redisUtil;
- @Value("${super.pwd}")
- private String superPwd;
@Autowired
private NavigateMapData navigateMapData;
+ @Autowired
+ private WrkMastService wrkMastService;
+ @Autowired
+ private SlaveProperties slaveProperties;
@PostMapping("/system/running/status")
@ManagerAuth(memo = "绯荤粺杩愯鐘舵��")
@@ -65,6 +75,20 @@
Thread.sleep(200L);
SystemProperties.WCS_RUNNING_STATUS.set(param.getOperatorType()==1?Boolean.TRUE:Boolean.FALSE);
return R.ok().add(Cools.add("status", SystemProperties.WCS_RUNNING_STATUS.get()));
+ }
+
+ /**
+ * 鑾峰彇鍦板浘妤煎眰鏁版嵁
+ */
+ @GetMapping("/map/lev/list")
+ @ManagerAuth
+ public R getMapLevList() {
+ List<BasMap> basMaps = basMapService.selectList(new EntityWrapper<BasMap>().orderBy("lev", true));
+ ArrayList<Integer> levList = new ArrayList<>();
+ for (BasMap basMap : basMaps) {
+ levList.add(basMap.getLev());
+ }
+ return R.ok().add(levList);
}
/**
@@ -103,20 +127,51 @@
@GetMapping("/map/resetMap/{lev}")
@ManagerAuth(memo = "閲嶇疆Redis鍦板浘")
public R resetMapToRedisByLev(@PathVariable Integer lev, HttpServletRequest request) {
- // super璐﹀彿
- String token = request.getHeader("token");
- if (token == null) {
- return R.error();
- }
- String deToken = Cools.deTokn(token, superPwd);
- if (deToken == null) {
- return R.error("鏉冮檺涓嶈冻");
- }
- if (!"super".equals(deToken.substring(13))) {
- return R.error("鏉冮檺涓嶈冻");
+ redisUtil.del(RedisKeyType.MAP.key + lev);
+ return R.ok();
+ }
+
+ /**
+ * 浠诲姟妫�娴�
+ */
+ @GetMapping("/checkTask")
+ @ManagerAuth(memo = "浠诲姟妫�娴�")
+ public R checkTask() {
+ List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<>());
+ if (!wrkMasts.isEmpty()) {
+ return R.error("瀛樺湪鏈粨鏉熶换鍔�");
}
- redisUtil.del(RedisKeyType.MAP.key + lev);
+ for (ShuttleSlave slave : slaveProperties.getShuttle()) {
+ ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, slave.getId());
+ if (shuttleThread == null) {
+ continue;
+ }
+ ShuttleProtocol shuttleProtocol = shuttleThread.getStatus();
+ if (shuttleProtocol == null) {
+ continue;
+ }
+
+ if (shuttleProtocol.getTaskNo() > 0) {
+ return R.error(slave.getId() + "鍙峰皬杞﹀瓨鍦ㄥ伐浣滃彿");
+ }
+ }
+
+ for (ForkLiftSlave slave : slaveProperties.getForkLift()) {
+ ForkLiftThread forkLiftThread = (ForkLiftThread) SlaveConnection.get(SlaveType.ForkLift, slave.getId());
+ if (forkLiftThread == null) {
+ continue;
+ }
+ ForkLiftProtocol forkLiftProtocol = forkLiftThread.getStatus();
+ if (forkLiftProtocol == null) {
+ continue;
+ }
+
+ if (forkLiftProtocol.getTaskNo() > 0) {
+ return R.error(slave.getId() + "鍙疯揣鍙夋彁鍗囨満瀛樺湪宸ヤ綔鍙�");
+ }
+ }
+
return R.ok();
}
--
Gitblit v1.9.1