From 58d3d34b740a07099384152e0024e6c09891eca5 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 28 十月 2025 16:30:30 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 67 +++++++++++++++++++++-
src/main/java/com/zy/asrs/domain/vo/RgvDetailVo.java | 42 ++++++++++++++
src/main/java/com/zy/asrs/domain/vo/RgvLatestDataVo.java | 21 +++++++
3 files changed, 126 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 33e7b8c..f159b5f 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -16,12 +16,10 @@
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.mapper.BasCrnErrorMapper;
-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.service.CommonService;
-import com.zy.common.utils.News;
import com.zy.common.utils.RedisUtil;
import com.zy.core.CrnThread;
import com.zy.core.DevpThread;
@@ -33,11 +31,14 @@
import com.zy.core.model.CrnSlave;
import com.zy.core.model.DevpSlave;
import com.zy.core.model.LedSlave;
+import com.zy.core.model.RgvSlave;
import com.zy.core.model.protocol.CrnProtocol;
+import com.zy.core.model.protocol.RgvProtocol;
import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.properties.SystemProperties;
import com.zy.core.thread.BarcodeThread;
+import com.zy.core.thread.RgvThread;
import com.zy.core.thread.ScaleThread;
import com.zy.core.thread.SiemensCrnThread;
import com.zy.system.entity.Config;
@@ -64,8 +65,6 @@
private WrkMastService wrkMastService;
@Autowired
private BasDevpService basDevpService;
- @Autowired
- private LocMastMapper locMastMapper;
@Autowired
private BasCrnErrorMapper basCrnErrorMapper;
@Autowired
@@ -190,6 +189,31 @@
return R.ok().add(vos);
}
+ @PostMapping("/latest/data/rgv")
+ @ManagerAuth(memo = "RGV瀹炴椂鏁版嵁")
+ public R rgvLatestData(){
+ List<RgvLatestDataVo> vos = new ArrayList<>();
+ for (RgvSlave rgvSlave : slaveProperties.getRgv()) {
+ // 鑾峰彇鍫嗗灈鏈轰俊鎭�
+ RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgvSlave.getId());
+ if (rgvThread == null) {
+ continue;
+ }
+ RgvProtocol rgvProtocol = rgvThread.getRgvProtocol();
+ if (rgvProtocol == null) {
+ continue;
+ }
+ RgvLatestDataVo vo = new RgvLatestDataVo();
+ vo.setRgvId(rgvProtocol.getRgvNo()); // RGV缂栧彿
+ vo.setTrackSiteNo(String.valueOf(rgvProtocol.getRgvPos()));
+ vo.setRgvStatus(rgvProtocol.getStatusType());
+ vos.add(vo);
+
+ }
+ redisUtil.set("rgvLatestData", JSON.toJSONString(vos));
+ return R.ok().add(vos);
+ }
+
@PostMapping("/latest/data/barcode")
@ManagerAuth(memo = "鏉＄爜鎵弿浠疄鏃舵暟鎹�")
public R barcodeLatestData(){
@@ -312,6 +336,41 @@
return R.error();
}
+ @PostMapping("/rgv/detail")
+ @ManagerAuth(memo = "RGV璁惧鏁版嵁璇︽儏")
+ public R rgvDetail(@RequestParam Integer rgvNo){
+ if (Cools.isEmpty(rgvNo)){
+ return R.parse(CodeRes.EMPTY);
+ }
+ RgvDetailVo vo = new RgvDetailVo();
+ for (RgvSlave rgvSlave : slaveProperties.getRgv()) {
+ if (rgvSlave.getId().equals(rgvNo)) {
+ RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgvSlave.getId());
+ RgvProtocol rgvProtocol = rgvThread.getRgvProtocol();
+ vo.setRgvNo(rgvNo);
+ vo.setWorkNo(rgvProtocol.getTaskNo1());
+ vo.setRgvStatus(rgvProtocol.getStatusType().desc);
+
+ vo.setError(String.valueOf(rgvProtocol.getAlarm()));
+
+ if (rgvProtocol.getTaskNo1() > 0) {
+ WrkMast wrkMast = wrkMastService.selectById(rgvProtocol.getTaskNo1());
+ if (wrkMast != null) {
+ vo.setSourceStaNo(wrkMast.getSourceStaNo$());
+ vo.setStaNo(wrkMast.getStaNo$());
+ vo.setWrkSts(wrkMast.getWrkSts$()); // 宸ヤ綔鐘舵��
+ vo.setIoType(wrkMast.getIoType$()); // 鍏ュ嚭搴撶被鍨�
+ vo.setSourceLocNo(wrkMast.getSourceLocNo$());
+ vo.setLocNo(wrkMast.getLocNo$());
+ vo.setRgvStatus(rgvProtocol.getStatusType().desc);
+ }
+ }
+ return R.ok().add(vo);
+ }
+ }
+ return R.error();
+ }
+
@Deprecated
@PostMapping("/site/update")
@ManagerAuth(memo = "杈撻�佽澶囨暟鎹慨鏀�")
diff --git a/src/main/java/com/zy/asrs/domain/vo/RgvDetailVo.java b/src/main/java/com/zy/asrs/domain/vo/RgvDetailVo.java
new file mode 100644
index 0000000..5f8b8ca
--- /dev/null
+++ b/src/main/java/com/zy/asrs/domain/vo/RgvDetailVo.java
@@ -0,0 +1,42 @@
+package com.zy.asrs.domain.vo;
+
+import lombok.Data;
+
+/**
+ * RGV璇︽儏瑙嗗浘瀵硅薄
+ * Created by vincent on 2020-06-03
+ */
+@Data
+public class RgvDetailVo {
+
+ // RGV鍙�
+ private Integer rgvNo;
+
+ // 宸ヤ綔鍙�
+ private Short workNo;
+
+ // 婧愮珯
+ private String sourceStaNo = "";
+
+ // 鐩爣绔�
+ private String staNo = "";
+
+ // 宸ヤ綔鐘舵��
+ private String wrkSts = "";
+
+ // 鍑哄叆绫诲瀷
+ private String ioType = "";
+
+ // 婧愬簱浣�
+ private String sourceLocNo = "";
+
+ // 鐩爣搴撲綅
+ private String locNo = "";
+
+ // RGV鐘舵��
+ private String rgvStatus = "";
+
+ // 寮傚父
+ private String error = "";
+
+}
diff --git a/src/main/java/com/zy/asrs/domain/vo/RgvLatestDataVo.java b/src/main/java/com/zy/asrs/domain/vo/RgvLatestDataVo.java
new file mode 100644
index 0000000..e780c24
--- /dev/null
+++ b/src/main/java/com/zy/asrs/domain/vo/RgvLatestDataVo.java
@@ -0,0 +1,21 @@
+package com.zy.asrs.domain.vo;
+
+import com.zy.core.enums.RgvStatusType;
+import lombok.Data;
+
+/**
+ * RGV鏈�鏂版暟鎹鍥惧璞�
+ * Created by vincent on 2020-06-01
+ */
+@Data
+public class RgvLatestDataVo {
+
+ // RGV缂栧彿
+ private Integer rgvId;
+
+ // 杞ㄩ亾浣嶇疆
+ private String trackSiteNo;
+
+ private RgvStatusType rgvStatus;
+
+}
--
Gitblit v1.9.1