From 44fa920bbcf6cd94c81f3a6d2f3008925a8635ca Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 11 五月 2023 09:40:39 +0800
Subject: [PATCH] 四向穿梭车命令封装
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 51 ++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 44 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 43336a3..924f899 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -1,5 +1,6 @@
package com.zy.asrs.controller;
+import com.alibaba.fastjson.JSON;
import com.core.annotations.ManagerAuth;
import com.core.common.Arith;
import com.core.common.Cools;
@@ -9,13 +10,19 @@
import com.zy.asrs.domain.param.SystemSwitchParam;
import com.zy.asrs.domain.vo.*;
import com.zy.asrs.entity.BasDevp;
+import com.zy.asrs.entity.BasMap;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.WrkMastService;
import com.zy.common.CodeRes;
+import com.zy.common.model.MapNode;
+import com.zy.common.utils.NavigateMapData;
+import com.zy.common.utils.RedisUtil;
import com.zy.core.CrnThread;
+import com.zy.core.DevpThread;
import com.zy.core.Slave;
+import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.CrnModeType;
import com.zy.core.enums.SlaveType;
@@ -27,14 +34,10 @@
import com.zy.core.properties.SystemProperties;
import com.zy.core.thread.BarcodeThread;
import com.zy.core.thread.ScaleThread;
-import com.zy.core.thread.MelsecCrnThread;
-import com.zy.core.DevpThread;
+import com.zy.core.thread.SiemensCrnThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.util.*;
@@ -55,6 +58,8 @@
private BasDevpService basDevpService;
@Autowired
private LocMastMapper locMastMapper;
+ @Autowired
+ private RedisUtil redisUtil;
@PostMapping("/system/running/status")
@ManagerAuth(memo = "绯荤粺杩愯鐘舵��")
@@ -243,7 +248,7 @@
CrnDetailVo vo = new CrnDetailVo();
for (CrnSlave crnSlave : slaveProperties.getCrn()) {
if (crnSlave.getId().equals(crnNo)) {
- MelsecCrnThread crnThread = (MelsecCrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId());
+ SiemensCrnThread crnThread = (SiemensCrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId());
CrnProtocol crnProtocol = crnThread.getCrnProtocol();
vo.setCrnNo(crnNo);
vo.setWorkNo(crnProtocol.getTaskNo());
@@ -280,4 +285,36 @@
return R.ok();
}
+ @GetMapping("/barcode/output/site")
+ public R crnOutput(){
+// StringBuilder str = new StringBuilder();
+// String s;
+// int i = 0;
+// while((s = OutputQueue.CRN.poll()) != null && i <=32) {
+// str.append("\n").append(s);
+// i++;
+// }
+// return R.ok().add(str.toString());
+ return R.ok().add(JSON.toJSONString(new ArrayList<>(OutputQueue.BARCODE)));
+ }
+
+ /**
+ * 鑾峰彇鍦板浘鏁版嵁
+ */
+ @GetMapping("/map/{lev}/auth")
+ @ManagerAuth
+ public R getMapFromRedis(@PathVariable Integer lev) {
+ Object data = redisUtil.get("realtimeBasMap_" + lev);
+ if (data == null) {
+ return R.error();
+ }
+
+ BasMap basMap = JSON.parseObject(data.toString(), BasMap.class);
+ //瑙ｆ瀽json鍦板浘鏁版嵁
+ ArrayList arrayList = JSON.parseObject(basMap.getData(), ArrayList.class);
+ NavigateMapData navigateMapData = new NavigateMapData(lev);
+ List<List<MapNode>> lists = navigateMapData.filterMap(-1, arrayList);//杩囨护鍦板浘鏁版嵁
+ return R.ok().add(lists);
+ }
+
}
--
Gitblit v1.9.1