From 473da408619b57c656cc22e191e9ed2e1c3eafaa Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 13 六月 2025 10:41:19 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/RgvController.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 48 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/RgvController.java b/src/main/java/com/zy/asrs/controller/RgvController.java
index c9f1720..0b889d3 100644
--- a/src/main/java/com/zy/asrs/controller/RgvController.java
+++ b/src/main/java/com/zy/asrs/controller/RgvController.java
@@ -10,10 +10,7 @@
import com.zy.asrs.domain.vo.*;
import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.BasRgvErrMapper;
-import com.zy.asrs.service.BasCircularShuttleService;
-import com.zy.asrs.service.BasDevpPositionService;
-import com.zy.asrs.service.BasRgvService;
-import com.zy.asrs.service.WrkMastService;
+import com.zy.asrs.service.*;
import com.zy.asrs.service.impl.MainServiceImpl;
import com.zy.asrs.utils.NumUtils;
import com.zy.asrs.utils.Utils;
@@ -57,6 +54,10 @@
private WrkMastService wrkMastService;
@Autowired
private BasRgvErrMapper basRgvErrMapper;
+ @Autowired
+ private BasRgvErrLogService basRgvErrLogService;
+ @Autowired
+ private BasRgvOptService basRgvOptService;
@Autowired
private BasRgvService basRgvService;
@Autowired
@@ -370,11 +371,11 @@
List<RingThroughParam> result = new ArrayList<>();
List<BasDevpPosition> basDevpPositions = basDevpPositionService.selectList(new EntityWrapper<>());
for (BasDevpPosition basDevpPosition : basDevpPositions){
- if (basDevpPosition.getDevNo() == 114){
+ if (basDevpPosition.getDevNo() == 134){
continue;
}
RingThroughParam ringThroughParam = new RingThroughParam();
- ringThroughParam.setIndex(basDevpPosition.getDevNo()-100);
+ ringThroughParam.setIndex(basDevpPosition.getDevNo());
// double[] doubles = Utils.RingThroughXYSta(perimeter, perimeter-basDevpPosition.getPlcPosition());
// ringThroughParam.setValueX(doubles[0]>50? doubles[0]+6:doubles[0]-1);
// ringThroughParam.setValueY(doubles[1]>50? doubles[1]+6:doubles[1]-1);
@@ -452,6 +453,19 @@
return R.ok().add(result);
}
+ @PostMapping("/ring/through/task/wrk/mast/position/data/v1")
+// @ManagerAuth(memo = "浣滀笟淇℃伅")
+ public R ringThroughTaskWrkMastV1(){
+ List<BasRgvOpt> result = new ArrayList<>();
+ for (int i = 1 ; i<11; i ++){
+ BasRgvOpt basRgvOpt = basRgvOptService.selectOne(new EntityWrapper<BasRgvOpt>().eq("rgv_no", i).orderBy("id", false));
+ if (basRgvOpt!=null){
+ result.add(basRgvOpt);
+ }
+ }
+ return R.ok().add(result);
+ }
+
@PostMapping("/task/rgv/circular/shuttle/mast/position/data")
// @ManagerAuth(memo = "浣滀笟淇℃伅")
public R rgvCircularShuttle(){
@@ -468,6 +482,21 @@
if (rgvCircularShuttleParam.getStatus()==0){
rgvCircularShuttleParam.setStatus$(rgvProtocol.statusType.desc);
}
+ if (rgvProtocol.getAlarmList().isEmpty()){
+ rgvCircularShuttleParam.setError(0);
+ rgvCircularShuttleParam.setError$("-");
+ } else {
+ StringBuilder alarmList = new StringBuilder();
+ for (Integer alarm : rgvProtocol.getAlarmList()){
+ BasRgvErr rgvErr = basRgvErrMapper.selectById(alarm);
+ alarmList.append((rgvErr==null || rgvErr.getErrName()==null)? "鏈煡寮傚父:"+alarm:rgvErr.getErrName());
+ if (alarm.equals(rgvProtocol.getAlarmList().get(rgvProtocol.getAlarmList().size() - 1))){
+ break;
+ }
+ alarmList.append("---");
+ }
+ rgvCircularShuttleParam.setError$(alarmList.toString());
+ }
}
}
}
@@ -476,6 +505,19 @@
return R.ok().add(result);
}
+ @PostMapping("/task/rgv/circular/shuttle/mast/position/data/v1")
+// @ManagerAuth(memo = "浣滀笟淇℃伅")
+ public R rgvCircularShuttleV1(){
+ List<BasRgvErrLog> result = new ArrayList<>();
+ for (int i = 1 ; i<11; i ++){
+ BasRgvErrLog basRgvErrLog = basRgvErrLogService.selectOne(new EntityWrapper<BasRgvErrLog>().eq("rgv_no", i).orderBy("id", false));
+ if (basRgvErrLog!=null){
+ result.add(basRgvErrLog);
+ }
+ }
+ return R.ok().add(result);
+ }
+
@PostMapping("/disable/rgv/status")
// @ManagerAuth(memo = "淇敼RGV鐘舵��")
--
Gitblit v1.9.1