From 488b3ded577e759fc6f77ac68768c66c39560566 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 13 六月 2025 09:41:26 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/core/thread/RgvThread.java | 56 ++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 40 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/RgvThread.java b/src/main/java/com/zy/core/thread/RgvThread.java
index 4ebfcfd..34ae595 100644
--- a/src/main/java/com/zy/core/thread/RgvThread.java
+++ b/src/main/java/com/zy/core/thread/RgvThread.java
@@ -8,7 +8,9 @@
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
import com.zy.asrs.entity.BasRgv;
+import com.zy.asrs.entity.BasRgvErrLog;
import com.zy.asrs.entity.BasRgvOpt;
+import com.zy.asrs.service.BasRgvErrLogService;
import com.zy.asrs.service.BasRgvOptService;
import com.zy.asrs.service.BasRgvService;
import com.zy.asrs.utils.NumUtils;
@@ -29,6 +31,7 @@
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Date;
+import java.util.HashSet;
import java.util.List;
/**
@@ -51,6 +54,7 @@
*/
private boolean resetFlag2 = false;
private boolean connectRgv = false;
+ private boolean alarmChangeSign = false;
public RgvThread(RgvSlave slave) {
this.slave = slave;
@@ -107,7 +111,9 @@
break;
//宸ヤ綅1鍐欏叆鏁版嵁
case 2:
- write((RgvCommand) task.getData());
+ RgvCommand command2 = (RgvCommand) task.getData();
+ rgvOpt(command2);
+ write(command2);
break;
// 澶嶄綅
case 3:
@@ -121,25 +127,14 @@
command.setTaskMode1(RgvTaskModeType.NONE); // 浠诲姟妯″紡
command.setSourceStaNo1((short)0); // 婧愮珯
command.setDestinationStaNo1((short)0); // 鐩爣绔�
+ rgvOpt(command);
write3(command);
- break;
- // 澶嶄綅
- case 4:
- RgvCommand command4 = (RgvCommand) task.getData();
- if (null == command4) {
- command4 = new RgvCommand();
- }
- command4.setRgvNo(slave.getId()); // RGV缂栧彿
- command4.setTaskNo1((short) 0); // 宸ヤ綔鍙�
- command4.setAckFinish1((short) 1); // 浠诲姟瀹屾垚纭浣�
- command4.setTaskMode1(RgvTaskModeType.X_MOVE); // 浠诲姟妯″紡
- command4.setSourceStaNo1((short)0); // 婧愮珯
- command4.setDestinationStaNo1((short)0); // 鐩爣绔�
- write3(command4);
break;
// 婕父
case 5:
- write5((Long) task.getData());
+ Long aLong = (Long) task.getData();
+ rgvOpt(aLong);
+ write5(aLong);
break;
default:
break;
@@ -279,6 +274,7 @@
alarmList.add(alarmCount);
}
}
+ alarmChangeSign = new HashSet<>(alarmList).equals(new HashSet<>(rgvProtocol.getAlarmList()));
rgvProtocol.setAlarmList(alarmList);
// rgvProtocol.setRgvPos((long)NumUtils.GetRandomIntInRange(1737000));
@@ -295,6 +291,16 @@
if (!basRgvService.updateById(rgvProtocol.toSqlModel(basRgv))){
log.error("RGV plc鏁版嵁搴撴洿鏂板け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
}
+ try{
+ if (!alarmChangeSign && !alarmList.isEmpty()){
+ BasRgvErrLogService basRgvErrLogService = SpringUtils.getBean(BasRgvErrLogService.class);
+ BasRgvErrLog basRgvErrLog = new BasRgvErrLog(rgvProtocol.getAlarmList(), rgvProtocol.getTaskNo1(), rgvProtocol.getRgvNo());
+ basRgvErrLogService.insert(basRgvErrLog);
+ }
+ } catch (Exception e){
+ log.error("RGV寮傚父淇℃伅淇濆瓨澶辫触锛侊紒");
+ }
+
} catch (Exception ignore) {
}
@@ -315,6 +321,24 @@
/**
* 宸ヤ綅1鍐欏叆鏁版嵁
*/
+ private void rgvOpt(RgvCommand command) {
+ try{
+ BasRgvOptService basRgvOptService = SpringUtils.getBean(BasRgvOptService.class);
+ BasRgvOpt basRgvOpt = new BasRgvOpt(rgvProtocol, command);
+ basRgvOptService.insert(basRgvOpt);
+ }catch (Exception e){
+ log.error("RGV鍐欏叆鍛戒护淇濆瓨澶辫触锛侊紒");
+ }
+ }
+ private void rgvOpt(Long command) {
+ try{
+ BasRgvOptService basRgvOptService = SpringUtils.getBean(BasRgvOptService.class);
+ BasRgvOpt basRgvOpt = new BasRgvOpt(rgvProtocol, command);
+ basRgvOptService.insert(basRgvOpt);
+ }catch (Exception e){
+ log.error("RGV鍐欏叆鍛戒护淇濆瓨澶辫触锛侊紒");
+ }
+ }
private boolean write(RgvCommand command) throws InterruptedException {
if (null == command) {
log.error("RGV鍐欏叆鍛戒护涓虹┖");
--
Gitblit v1.9.1