From 204d411e545412dc65545b1b9149479a6d07672a Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期六, 14 九月 2024 14:46:49 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/RgvController.java | 106 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 85 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/RgvController.java b/src/main/java/com/zy/asrs/controller/RgvController.java
index e50d1dc..ef49d0b 100644
--- a/src/main/java/com/zy/asrs/controller/RgvController.java
+++ b/src/main/java/com/zy/asrs/controller/RgvController.java
@@ -6,14 +6,15 @@
import com.core.exception.CoolException;
import com.zy.asrs.domain.enums.RgvStatusType;
import com.zy.asrs.domain.param.RgvOperatorParam;
+import com.zy.asrs.domain.param.RingThroughParam;
import com.zy.asrs.domain.vo.*;
import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.BasRgvErrMapper;
import com.zy.asrs.service.BasRgvService;
-import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.service.impl.MainServiceImpl;
-import com.zy.asrs.utils.VersionUtils;
+import com.zy.asrs.utils.NumUtils;
+import com.zy.asrs.utils.Utils;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
@@ -28,11 +29,11 @@
import com.zy.core.thread.RgvThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import javax.rmi.CORBA.Util;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -57,8 +58,6 @@
private BasRgvService basRgvService;
@Autowired
private MainServiceImpl mainService;
- @Autowired
- private LocMastService locMastService;
@PostMapping("/table/rgv/state")
@ManagerAuth(memo = "RGV淇℃伅琛�")
@@ -88,7 +87,7 @@
vo.setWalkPos(rgvProtocol.getWalkPos()==1?"涓嶅湪瀹氫綅":"鍦ㄥ畾浣�");
vo.setWorkNo2(rgvProtocol.getTaskNo2()); // 宸ヤ綅2浠诲姟鍙�
vo.setStatus2(rgvProtocol.getStatusType2().desc); // 宸ヤ綅2鐘舵��
- vo.setLoading2(rgvProtocol.getLoaded2()==1?"鏈夌墿":"鏃犵墿"); // 宸ヤ綅2鏈夌墿
+ vo.setLoading2(rgvProtocol.getLoaded2()==0?"鏃犵墿":"鏈夌墿"); // 宸ヤ綅2鏈夌墿
vo.setWarnCode(String.valueOf(rgvProtocol.getAlarm()));
if (rgvProtocol.getAlarm() > 0) {
@@ -110,7 +109,7 @@
vo.setRgvNo(basRgv.getRgvNo()); // RGV鍙�
list.add(vo);
// 鑾峰彇RGV淇℃伅
- RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Crn, basRgv.getRgvNo());
+ RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, basRgv.getRgvNo());
if (rgvThread == null) {
continue;
}
@@ -119,7 +118,7 @@
continue;
}
- vo.setWorkNo1(rgvProtocol.getTaskNo1()); // 浠诲姟鍙�
+ vo.setWorkNo(rgvProtocol.getTaskNo1()); // 浠诲姟鍙�
if (rgvProtocol.getTaskNo1()>0) {
WrkMast wrkMast = wrkMastService.selectById(rgvProtocol.getTaskNo1());
if (wrkMast != null) {
@@ -145,23 +144,11 @@
StringBuilder str = new StringBuilder();
String s;
int i = 0;
- while((s = OutputQueue.CRN.poll()) != null && i <=10) {
+ while((s = OutputQueue.RGV.poll()) != null && i <=10) {
str.append("\n").append(s);
i++;
}
return R.ok().add(str.toString());
- }
-
- @GetMapping("/demo/status")
- public R demoStatus(){
- List<Map<String, Object>> res = new ArrayList<>();
- for (RgvSlave rgvSlave : slaveProperties.getRgv()) {
- Map<String, Object> map = new HashMap<>();
- map.put("rgvNo", rgvSlave.getId());
- map.put("demo", rgvSlave.getDemo());
- res.add(map);
- }
- return R.ok().add(res);
}
/****************************************************************/
@@ -333,4 +320,81 @@
return false;
}
+ @PostMapping("/console/rgv/site/data")
+ @ManagerAuth(memo = "灏忚溅瀹炴椂浣嶇疆")
+ public R scaleLatestData(){
+ List<Map> result = new ArrayList<>();
+ for (RgvSlave rgv : slaveProperties.getRgv()) {
+ // 鑾峰彇RGV淇℃伅
+ RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgv.getId());
+ if (rgvThread == null) {
+ throw new CoolException("RGV涓嶅湪绾�");
+ }
+ RgvProtocol rgvProtocol = rgvThread.getRgvProtocol();
+ if (rgvProtocol == null) {
+ throw new CoolException("RGV涓嶅湪绾�");
+ }
+ Map<String, Object> rgvMap = new HashMap<>();
+ rgvMap.put("title", rgvProtocol.getRgvPosI());
+ rgvMap.put("id", rgvProtocol.getRgvNo());
+ result.add(rgvMap);
+ }
+ return R.ok().add(result);
+ }
+ @PostMapping("/ring/through/rgv/position/data")
+// @ManagerAuth(memo = "鐜┛浣嶇疆淇℃伅")
+ public R ringThroughRgv(){
+ List<RingThroughParam> result = new ArrayList<>();
+// for (RgvSlave rgv : slaveProperties.getRgv()) {
+ for (int i = 1;i<2;i++) {
+// // 鑾峰彇RGV淇℃伅
+// RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgv.getId());
+// if (rgvThread == null) {
+// continue;
+// }
+// RgvProtocol rgvProtocol = rgvThread.getRgvProtocol();
+// if (rgvProtocol == null) {
+// continue;
+// }
+ RingThroughParam ringThroughParam = new RingThroughParam();
+
+// ringThroughParam.setIndex(rgv.getId());
+ ringThroughParam.setIndex(i);
+ double[] doubles = Utils.RingThroughXY2(183.0, NumUtils.GetRandomIntInRange(183));
+// double[] doubles = Utils.RingThroughXY2(183.0, 100*i );
+
+ ringThroughParam.setValueX(doubles[0]-2.94);
+ ringThroughParam.setValueY(doubles[1]-2.94);
+ result.add(ringThroughParam);
+ }
+ return R.ok().add(result);
+ }
+
+ @PostMapping("/ring/through/dev/position/data")
+// @ManagerAuth(memo = "鐜┛浣嶇疆淇℃伅")
+ public R ringThroughDev(){
+ List<RingThroughParam> result = new ArrayList<>();
+// for (RgvSlave rgv : slaveProperties.getRgv()) {
+ for (int i = 1;i<10;i++) {
+// // 鑾峰彇RGV淇℃伅
+// RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgv.getId());
+// if (rgvThread == null) {
+// continue;
+// }
+// RgvProtocol rgvProtocol = rgvThread.getRgvProtocol();
+// if (rgvProtocol == null) {
+// continue;
+// }
+ RingThroughParam ringThroughParam = new RingThroughParam();
+
+// ringThroughParam.setIndex(rgv.getId());
+ ringThroughParam.setIndex(i);
+ double[] doubles = Utils.RingThroughXY2(183.0, 100*i );
+ ringThroughParam.setValueX(doubles[0]+2.94);
+ ringThroughParam.setValueY(doubles[1]+2.94);
+ result.add(ringThroughParam);
+ }
+ return R.ok().add(result);
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.1