From 1dacf2305187f5c2fb44f03b6b754c46cb73ba25 Mon Sep 17 00:00:00 2001
From: L <L@132>
Date: 星期四, 19 三月 2026 08:53:59 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/RgvController.java | 53 +++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 43 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/RgvController.java b/src/main/java/com/zy/asrs/controller/RgvController.java
index 6bcaa10..cf6679d 100644
--- a/src/main/java/com/zy/asrs/controller/RgvController.java
+++ b/src/main/java/com/zy/asrs/controller/RgvController.java
@@ -348,20 +348,31 @@
if (rgvProtocol == null) {
continue;
}
- RingThroughParam ringThroughParam = new RingThroughParam();
+ try {
+ if (rgvProtocol.getRgvPos() == null || rgvProtocol.getModeType() == null || rgvProtocol.getStatusType() == null) {
+ log.warn("鐜┛浣嶇疆淇℃伅瀛樺湪绌哄瓧娈碉紝璺宠繃璇GV: rgvNo={}", rgv.getId());
+ continue;
+ }
+ RingThroughParam ringThroughParam = new RingThroughParam();
- ringThroughParam.setIndex(rgv.getId());
+ ringThroughParam.setIndex(rgv.getId());
// ringThroughParam.setIndex(i);
// double[] doubles = Utils.RingThroughXY2(perimeter, NumUtils.GetRandomIntInRange(183));
// double[] doubles = Utils.RingThroughXYRgv(perimeter, perimeter-rgvProtocol.RgvPos.doubleValue());
- double[] doubles = Utils.getRgvPosNew(perimeter, rgvProtocol.RgvPos.doubleValue());
-// double[] doubles = Utils.RingThroughXY2(183.0, 100*i );
+ double[] doubles = Utils.getRgvPosNew(perimeter, rgvProtocol.getRgvPos().doubleValue());
- ringThroughParam.setValueX(doubles[0]);
- ringThroughParam.setValueY(doubles[1]);
- ringThroughParam.setModeColor(rgvProtocol.modeType.color);
- ringThroughParam.setStatusColor(rgvProtocol.statusType.color);
- result.add(ringThroughParam);
+ ringThroughParam.setValueX(doubles[0]);
+ ringThroughParam.setValueY(doubles[1]);
+ ringThroughParam.setModeColor(rgvProtocol.getModeType().color);
+ ringThroughParam.setStatusColor(rgvProtocol.getStatusType().color);
+ if (rgvProtocol.getModeType() == RgvModeType.AUTO){
+ ringThroughParam.setAnimation(2);
+ }
+ result.add(ringThroughParam);
+ } catch (Exception e) {
+ // 鍗曞彴RGV鏁版嵁寮傚父涓嶅奖鍝嶅叾瀹僐GV缁樺埗
+ log.error("鐜┛浣嶇疆淇℃伅澶勭悊寮傚父锛岃烦杩囪RGV: rgvNo={}", rgv.getId(), e);
+ }
}
return R.ok().add(result);
}
@@ -373,6 +384,9 @@
List<RingThroughParam> result = new ArrayList<>();
List<BasDevpPosition> basDevpPositions = basDevpPositionService.selectList(new EntityWrapper<>());
for (BasDevpPosition basDevpPosition : basDevpPositions){
+ if (basDevpPosition.getDevRegion() == 0){
+ continue;
+ }
RingThroughParam ringThroughParam = new RingThroughParam();
ringThroughParam.setModeColor("#FFFFFF");
@@ -569,4 +583,23 @@
return R.ok();
}
-}
\ No newline at end of file
+ @PostMapping("/disable/task/delete1")
+// @ManagerAuth(memo = "鍒濆鍖栦换鍔�")
+ public R taskDisabledelete1(@RequestParam Long wrkNo){
+ Date now = new Date();
+ log.info("/disable/task/delete1===銆嬪垵濮嬪寲浠诲姟锛侊紒锛亀rkNo:{},data:{}",wrkNo,new Date());
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", wrkNo));
+ if (Cools.isEmpty(wrkMast)){
+ return R.error().add("鏈壘鍒版浠诲姟锛屽紓甯革紒锛侊紒");
+ }
+ wrkMast.setWrkSts(1L);
+ wrkMast.setRgvNo(0);
+ wrkMast.setAppeTime(now);
+ wrkMast.setLogErrTime(now);
+ if (wrkMastService.updateById(wrkMast)){
+ return R.ok();
+ }
+ return R.error("鍒濆鍖栧け璐ワ紒锛侊紒");
+ }
+
+}
--
Gitblit v1.9.1