From 5026865596b57287aefc72acdc9938bc0d93dbec Mon Sep 17 00:00:00 2001
From: cpT <1@123>
Date: 星期日, 22 六月 2025 15:35:27 +0800
Subject: [PATCH] #改造
---
src/main/java/com/zy/core/thread/RgvThread.java | 177 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 160 insertions(+), 17 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..df76d8e 100644
--- a/src/main/java/com/zy/core/thread/RgvThread.java
+++ b/src/main/java/com/zy/core/thread/RgvThread.java
@@ -8,15 +8,15 @@
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;
-import com.zy.asrs.utils.RouteUtils;
import com.zy.core.ThreadHandler;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
-import com.zy.core.enums.RgvStatusType;
+import com.zy.core.enums.RgvModeType;
import com.zy.core.enums.RgvTaskModeType;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.RgvSlave;
@@ -29,6 +29,7 @@
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Date;
+import java.util.HashSet;
import java.util.List;
/**
@@ -51,6 +52,7 @@
*/
private boolean resetFlag2 = false;
private boolean connectRgv = false;
+ private boolean alarmChangeSign = false;
public RgvThread(RgvSlave slave) {
this.slave = slave;
@@ -107,7 +109,9 @@
break;
//宸ヤ綅1鍐欏叆鏁版嵁
case 2:
- write((RgvCommand) task.getData());
+ RgvCommand command2 = (RgvCommand) task.getData();
+ rgvOpt(command2);
+ write(command2);
break;
// 澶嶄綅
case 3:
@@ -121,25 +125,24 @@
command.setTaskMode1(RgvTaskModeType.NONE); // 浠诲姟妯″紡
command.setSourceStaNo1((short)0); // 婧愮珯
command.setDestinationStaNo1((short)0); // 鐩爣绔�
+ rgvOpt(command);
write3(command);
break;
- // 澶嶄綅
+ //宸ヤ綅1鍐欏叆鍙栨秷鏁版嵁
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);
+ rgvOpt(command4);
+ write4(command4);
break;
// 婕父
case 5:
- write5((Long) task.getData());
+ Long aLong = (Long) task.getData();
+ rgvOpt(aLong);
+ write5(aLong);
+ //宸ヤ綅1鍐欏叆鍙栨秷鏁版嵁
+ case 6:
+ rgvOpt();
+ write6();
break;
default:
break;
@@ -223,7 +226,32 @@
rgvProtocol.setxSpeed((short) 0);
rgvProtocol.setxDistance((short) 0);
rgvProtocol.setxDuration((short) 0);
+ log.error("杩炴帴涓柇锛歊GV鍙凤細"+slave.getId());
}
+
+// /**
+// * 鍒濆鍖朢GV鐘舵��
+// */
+// private void initRgv() {
+// if (null == rgvProtocol) {
+// rgvProtocol = new RgvProtocol();
+// }
+// rgvProtocol.setRgvNo(slave.getId());
+// rgvProtocol.setMode((short) 3);
+// rgvProtocol.setStatus((short)0);
+// rgvProtocol.setTaskNo1((short)0);
+// rgvProtocol.setStatus1((short)0);
+// rgvProtocol.setLoaded1((short)0);
+// rgvProtocol.setWalkPos((short)0);
+// rgvProtocol.setRgvPos(slave.getId()*100000L);
+// rgvProtocol.setTaskNo2((short)0);
+// rgvProtocol.setStatus2((short)0);
+// rgvProtocol.setLoaded2((short)0);
+// rgvProtocol.setAlarm((short)0);
+// rgvProtocol.setxSpeed((short) 0);
+// rgvProtocol.setxDistance((short) 0);
+// rgvProtocol.setxDuration((short) 0);
+// }
@Override
public boolean connect() {
@@ -267,7 +295,12 @@
rgvProtocol.setAlarm(siemensNet.getByteTransform().TransInt16(result.Content, 10));
rgvProtocol.setStatus(siemensNet.getByteTransform().TransInt16(result.Content, 12));
rgvProtocol.setxSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 14));
- rgvProtocol.setRgvPos(siemensNet.getByteTransform().TransUInt32(result.Content, 16));
+ int poi = siemensNet.getByteTransform().TransInt32(result.Content, 16);
+ if (poi>0){
+ rgvProtocol.setRgvPos((long)poi);
+ rgvProtocol.setRgvPosInt(poi);
+ }
+ log.info(rgvProtocol.getRgvNo()+"鍙峰皬杞﹁鍙栧畾浣嶅�硷細"+poi);
rgvProtocol.setInstantaneousSpeed(Double.valueOf(siemensNet.getByteTransform().TransInt16(resultV.Content, 0)));
rgvProtocol.setEndStaM(siemensNet.getByteTransform().TransInt16(resultE.Content, 0));
boolean[] statusAlarmList = siemensNet.getByteTransform().TransBool(resultError.Content, 0, 13);
@@ -279,6 +312,7 @@
alarmList.add(alarmCount);
}
}
+ alarmChangeSign = new HashSet<>(alarmList).equals(new HashSet<>(rgvProtocol.getAlarmList()));
rgvProtocol.setAlarmList(alarmList);
// rgvProtocol.setRgvPos((long)NumUtils.GetRandomIntInRange(1737000));
@@ -295,6 +329,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 +359,34 @@
/**
* 宸ヤ綅1鍐欏叆鏁版嵁
*/
+ private void rgvOpt(RgvCommand command) {
+ try{
+ BasRgvOptService basRgvOptService = SpringUtils.getBean(BasRgvOptService.class);
+ BasRgvOpt basRgvOpt = new BasRgvOpt(rgvProtocol.getTaskNo1().intValue(), rgvProtocol.getRgvNo(), rgvProtocol.getRgvPosInt(), command);
+ log.info(rgvProtocol.getRgvNo()+"鍙峰皬杞﹀啓鍏ュ懡浠ゅ畾浣嶅�硷細"+rgvProtocol.getRgvPosInt());
+ 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.getTaskNo1().intValue(), rgvProtocol.getRgvNo(), rgvProtocol.getRgvPosI(), command);
+ basRgvOptService.insert(basRgvOpt);
+ }catch (Exception e){
+ log.error("RGV鍐欏叆鍛戒护淇濆瓨澶辫触锛侊紒");
+ }
+ }
+ private void rgvOpt() {
+ try{
+ BasRgvOptService basRgvOptService = SpringUtils.getBean(BasRgvOptService.class);
+ BasRgvOpt basRgvOpt = new BasRgvOpt(rgvProtocol.getTaskNo1().intValue(), rgvProtocol.getRgvNo(), rgvProtocol.getRgvPosI());
+ basRgvOptService.insert(basRgvOpt);
+ }catch (Exception e){
+ log.error("RGV鍐欏叆鍛戒护淇濆瓨澶辫触锛侊紒");
+ }
+ }
private boolean write(RgvCommand command) throws InterruptedException {
if (null == command) {
log.error("RGV鍐欏叆鍛戒护涓虹┖");
@@ -377,6 +449,68 @@
return false;
}
}
+ private boolean write4(RgvCommand command) throws InterruptedException {
+ if (null == command) {
+ log.error("RGV鍐欏叆鍛戒护涓虹┖");
+ return false;
+ }
+
+// siemensNet.Write("DB24.10.0", false);
+// siemensNet.Write("DB24.10.1", false);
+
+ command.setRgvNo(slave.getId());
+ short[] array = new short[5];
+ array[0] = command.getRgvNo().shortValue();
+ array[1] = command.getSourceStaNo1();
+ array[2] = command.getDestinationStaNo1();
+ array[3] = command.getTaskMode1();//浠诲姟妯″紡
+ array[4] = command.getTaskNo1();
+
+
+
+ OperateResult result = siemensNet.Write("DB24.0", array);
+//
+// if (command.getAckFinish1().equals((short)0)) {
+//// Thread.sleep(100L);
+//// siemensNet.Write("DB24.10.7", command.getRgvSome() == 1);
+//// Thread.sleep(20L);
+//// result = siemensNet.Write("DB24.10.0", true);
+// } else {
+// siemensNet.Write("DB24.10.1", true);
+// }
+
+ try {
+ // 鏃ュ織璁板綍
+ BasRgvOptService bean = SpringUtils.getBean(BasRgvOptService.class);
+ BasRgvOpt basRgvOpt = new BasRgvOpt(
+ command.getTaskNo1().intValue(),
+ command.getTaskNo2().intValue(),
+ command.getRgvNo(),
+ new Date(),
+ command.getTaskModeType1().toString(),
+ command.getSourceStaNo1().intValue(),
+ command.getDestinationStaNo1().intValue(),
+ command.getSourceStaNo2().intValue(),
+ command.getDestinationStaNo2().intValue(),
+ null,
+ new Date(),
+ null
+ );
+ bean.insert(basRgvOpt);
+ } catch (Exception ignore) {}
+
+ if (result != null && result.IsSuccess) {
+// Thread.sleep(200);
+// this.readStatus();
+ log.info("RGV 宸ヤ綅1鍙栨秷鍛戒护涓嬪彂[id:{}] >>>>> {}", slave.getId(), JSON.toJSONString(command));
+ OutputQueue.RGV.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 宸ヤ綅1鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSONString(command)));
+ return true;
+ } else {
+ OutputQueue.RGV.offer(MessageFormat.format("銆恵0}銆戝啓鍏GV plc宸ヤ綅1鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
+ log.error("鍐欏叆RGV plc宸ヤ綅1鍙栨秷鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+ return false;
+ }
+ }
/**
* 瀹屾垚
@@ -404,6 +538,15 @@
}
}
+ private void write6(){
+ try {
+ siemensNet.Write("DB24.11.1", true);
+
+ } catch (Exception ignore) {
+ log.error("鍐欏叆RGV plc宸ヤ綅1婕父鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+ }
+ }
+
private boolean write3(RgvCommand command) throws InterruptedException {
if (null == command) {
log.error("RGV鍐欏叆鍛戒护涓虹┖");
--
Gitblit v1.9.1