From dfecfcf673479df6344b728368edd1edb7f1445e Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期一, 11 八月 2025 16:08:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ytflsbwcs' into ytflsbwcs
---
src/main/java/com/zy/core/thread/MelsecCrnThread.java | 191 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 156 insertions(+), 35 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/MelsecCrnThread.java b/src/main/java/com/zy/core/thread/MelsecCrnThread.java
index 0f4c004..649fe9b 100644
--- a/src/main/java/com/zy/core/thread/MelsecCrnThread.java
+++ b/src/main/java/com/zy/core/thread/MelsecCrnThread.java
@@ -11,6 +11,7 @@
import com.zy.asrs.entity.BasCrnp;
import com.zy.asrs.service.BasCrnOptService;
import com.zy.asrs.service.BasCrnpService;
+import com.zy.common.utils.News;
import com.zy.core.CrnThread;
import com.zy.core.ThreadHandler;
import com.zy.core.cache.MessageQueue;
@@ -39,7 +40,17 @@
private MelsecMcNet melsecMcNet;
private CrnSlave slave;
private CrnProtocol crnProtocol;
+ private short heartBeatVal = 1;
private boolean resetFlag = false;
+
+ /**
+ * 鍫嗗灈鏈烘槸鍚﹀湪鍥炲師鐐硅繍鍔ㄤ腑鏍囪
+ */
+ private boolean backHpFlag = false;
+
+ public Long sign = System.currentTimeMillis();
+
+ public boolean isRunning = true;
public MelsecCrnThread(CrnSlave slave) {
this.slave = slave;
@@ -48,8 +59,15 @@
@Override
@SuppressWarnings("InfiniteLoopStatement")
public void run() {
+ System.out.println("绾跨▼鍚姩");
+ System.out.println("crnProtocol:"+crnProtocol);
this.connect();
- while (true) {
+// try {
+// Thread.sleep(2000);
+// } catch (InterruptedException e) {
+// e.printStackTrace();
+// }
+ while (isRunning) {
try {
int step = 1;
Task task = MessageQueue.poll(SlaveType.Crn, slave.getId());
@@ -75,22 +93,25 @@
command.setTaskNo((short) 0); // 宸ヤ綔鍙�
command.setAckFinish((short) 1); // 浠诲姟瀹屾垚纭浣�
command.setTaskMode(CrnTaskModeType.NONE); // 浠诲姟妯″紡
- command.setSourcePosX((short)0); // 婧愬簱浣嶆帓
- command.setSourcePosY((short)0); // 婧愬簱浣嶅垪
- command.setSourcePosZ((short)0); // 婧愬簱浣嶅眰
- command.setDestinationPosX((short)0); // 鐩爣搴撲綅鎺�
- command.setDestinationPosY((short)0); // 鐩爣搴撲綅鍒�
- command.setDestinationPosZ((short)0); // 鐩爣搴撲綅灞�
+// command.setSourcePosX((short)0); // 婧愬簱浣嶆帓
+// command.setSourcePosY((short)0); // 婧愬簱浣嶅垪
+// command.setSourcePosZ((short)0); // 婧愬簱浣嶅眰
+// command.setDestinationPosX((short)0); // 鐩爣搴撲綅鎺�
+// command.setDestinationPosY((short)0); // 鐩爣搴撲綅鍒�
+// command.setDestinationPosZ((short)0); // 鐩爣搴撲綅灞�
write(command);
break;
default:
break;
}
+ // 蹇冭烦
+ heartbeat();
Thread.sleep(500);
} catch (Exception e) {
e.printStackTrace();
}
-
+// System.out.println("绗�"+slave.getId()+"涓爢鍨涙満绾跨▼杩愯涓�杞細"+(System.currentTimeMillis()-sign));
+ sign = System.currentTimeMillis();
}
}
@@ -111,13 +132,13 @@
crnProtocol.setWalkPos((short)0);
crnProtocol.setLoaded((short)0);
crnProtocol.setAlarm((short)0);
- crnProtocol.setXSpeed(0F);
- crnProtocol.setYSpeed(0F);
- crnProtocol.setZSpeed(0F);
- crnProtocol.setXDistance(0F);
- crnProtocol.setYDistance(0F);
- crnProtocol.setXDuration(0F);
- crnProtocol.setYDuration(0F);
+ crnProtocol.setxSpeed((short)0);
+ crnProtocol.setySpeed((short)0);
+ crnProtocol.setzSpeed((short)0);
+ crnProtocol.setxDistance((short)0);
+ crnProtocol.setyDistance((short)0);
+ crnProtocol.setxDuration((short)0);
+ crnProtocol.setyDuration((short)0);
}
@Override
@@ -128,13 +149,13 @@
if(connect.IsSuccess){
result = true;
OutputQueue.CRN.offer(MessageFormat.format( "銆恵0}銆戝爢鍨涙満plc杩炴帴鎴愬姛 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
- log.info("鍫嗗灈鏈簆lc杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+ News.info("MelsecCrn"+" - 1"+" - 鍫嗗灈鏈簆lc杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
} else {
OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戝爢鍨涙満plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{1}] [ip:{2}] [port:{3}] ", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
- log.error("鍫嗗灈鏈簆lc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+ News.error("MelsecCrn"+" - 2"+" - 鍫嗗灈鏈簆lc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
initCrn();
}
- melsecMcNet.ConnectClose();
+// melsecMcNet.ConnectClose();
return result;
}
@@ -143,11 +164,18 @@
*/
private void readStatus(){
try {
- OperateResultExOne<byte[]> result = melsecMcNet.Read("D20", (short) 70);
+// if (this.slave.getId() == 1 && flag1.equals(0)) {
+// Thread.sleep(3000);
+// flag1=1;
+// System.out.println("===");
+// }
+ OperateResultExOne<byte[]> result = melsecMcNet.Read("D1035", (short) 56);
if (result.IsSuccess) {
if (null == crnProtocol) {
crnProtocol = new CrnProtocol();
+ crnProtocol.setCrnNo(slave.getId());
}
+ crnProtocol.setCrnNo(slave.getId());
crnProtocol.setMode(melsecMcNet.getByteTransform().TransInt16(result.Content, 0));
crnProtocol.setTaskNo(melsecMcNet.getByteTransform().TransInt16(result.Content, 2));
crnProtocol.setStatus(melsecMcNet.getByteTransform().TransInt16(result.Content, 4));
@@ -162,20 +190,23 @@
crnProtocol.setTemp2(melsecMcNet.getByteTransform().TransInt16(result.Content, 22));
crnProtocol.setTemp3(melsecMcNet.getByteTransform().TransInt16(result.Content, 24));
crnProtocol.setTemp4(melsecMcNet.getByteTransform().TransInt16(result.Content, 26));
- crnProtocol.setXSpeed(melsecMcNet.getByteTransform().TransSingle(result.Content, 28));
- crnProtocol.setYSpeed(melsecMcNet.getByteTransform().TransSingle(result.Content, 32));
- crnProtocol.setZSpeed(melsecMcNet.getByteTransform().TransSingle(result.Content, 36));
- crnProtocol.setXDistance(melsecMcNet.getByteTransform().TransSingle(result.Content, 40));
- crnProtocol.setYDistance(melsecMcNet.getByteTransform().TransSingle(result.Content, 44));
- crnProtocol.setXDuration(melsecMcNet.getByteTransform().TransSingle(result.Content, 48));
- crnProtocol.setYDuration(melsecMcNet.getByteTransform().TransSingle(result.Content, 52));
+ crnProtocol.setxSpeed(melsecMcNet.getByteTransform().TransInt16(result.Content, 28));
+ crnProtocol.setySpeed(melsecMcNet.getByteTransform().TransInt16(result.Content, 32));
+ crnProtocol.setzSpeed(melsecMcNet.getByteTransform().TransInt16(result.Content, 36));
+ crnProtocol.setxDistance(melsecMcNet.getByteTransform().TransInt16(result.Content, 40));
+ crnProtocol.setyDistance(melsecMcNet.getByteTransform().TransInt16(result.Content, 44));
+ crnProtocol.setxDuration(melsecMcNet.getByteTransform().TransInt16(result.Content, 48));
+ crnProtocol.setyDuration(melsecMcNet.getByteTransform().TransInt16(result.Content, 52));
OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
// 澶嶄綅淇″彿
if (crnProtocol.getStatusType().equals(CrnStatusType.WAITING)) {
- log.error("-------------------------------------------绗竴姝ャ�乕鍫嗗灈鏈哄彿锛歿}][宸ヤ綔鍙凤細{}]==>> 鐘舵�佷负90锛岀瓑寰呯‘璁わ紒锛�",slave.getId(),crnProtocol.getTaskNo());
+ News.error("MelsecCrn"+" - 3"+" ---------绗竴姝ャ�乕鍫嗗灈鏈哄彿锛歿}][宸ヤ綔鍙凤細{}]==>> 鐘舵�佷负90锛岀瓑寰呯‘璁わ紒锛�",slave.getId(),crnProtocol.getTaskNo());
if (resetFlag) {
+ if(crnProtocol.getTaskNo()==9999){
+ backHpFlag = false;
+ }
CrnCommand crnCommand = new CrnCommand();
crnCommand.setAckFinish((short)1);
if (write(crnCommand)) {
@@ -189,8 +220,9 @@
BasCrnp basCrnp = new BasCrnp();
basCrnp.setCrnErr(crnProtocol.getAlarm()==null?0:crnProtocol.getAlarm().longValue());
basCrnp.setCrnNo(slave.getId());
+ basCrnp.setCrnSts((int)crnProtocol.getMode());
if (!basCrnpService.updateById(crnProtocol.toSqlModel(basCrnp))){
- log.error("鍫嗗灈鏈簆lc鏁版嵁搴撴洿鏂板け璐� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+ News.error("MelsecCrn"+" - 4"+" - 鍫嗗灈鏈簆lc鏁版嵁搴撴洿鏂板け璐� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
}
} else {
@@ -200,8 +232,10 @@
} catch (Exception e) {
e.printStackTrace();
OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戣鍙栧爢鍨涙満plc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
- log.error("璇诲彇鍫嗗灈鏈簆lc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+ News.error("MelsecCrn"+" - 5"+" - 璇诲彇鍫嗗灈鏈簆lc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
initCrn();
+ } finally {
+ sign = System.currentTimeMillis();
}
}
@@ -211,9 +245,58 @@
*/
private boolean write(CrnCommand command){
if (null == command) {
- log.error("鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�");
+ News.error("MelsecCrn"+" - 6"+" - 鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�");
return false;
}
+
+// OperateResult result = null;
+// try{
+// Integer exeCount=0;
+// do{
+// command.setCrnNo(slave.getId());
+// short[] array = new short[10];
+// array[0] = command.getAckFinish();
+// array[1] = command.getTaskNo();
+// array[2] = command.getTaskMode();
+// array[3] = command.getSourcePosX();
+// array[4] = command.getSourcePosY();
+// array[5] = command.getSourcePosZ();
+// array[6] = command.getDestinationPosX();
+// array[7] = command.getDestinationPosY();
+// array[8] = command.getDestinationPosZ();
+// array[9] = command.getCommand();
+// result = melsecMcNet.Write("D0", array);
+// if(result.IsSuccess) {
+// if (command.getAckFinish() == 0) {
+// short commandFinish = 1;
+// result = melsecMcNet.Write("D9", commandFinish);
+// if(result.IsSuccess){
+// //鍐欎换鍔＄‘璁よ繑鍥炴垚鍔熷悗锛屾煡璇㈢‘璁や竴娆�
+// Thread.sleep(200);
+// OperateResultExOne<byte[]> result1 = melsecMcNet.Read("D9", (short)2);
+// if(result1.IsSuccess){
+// short commandVal = melsecMcNet.getByteTransform().TransInt16(result1.Content,2);
+// if(commandVal==1){
+// break;
+// } else {
+// exeCount++;
+// }
+// } else{
+// exeCount++;
+// }
+// }else{
+// exeCount++;
+// }
+// }
+// }else{
+// exeCount++;
+// }
+// Thread.sleep(200);
+// }while(exeCount>3);
+// }catch (Exception e){
+//
+// }
+
command.setCrnNo(slave.getId());
short[] array = new short[10];
array[0] = command.getAckFinish();
@@ -226,11 +309,11 @@
array[7] = command.getDestinationPosY();
array[8] = command.getDestinationPosZ();
array[9] = command.getCommand();
- OperateResult result = melsecMcNet.Write("D0", array);
+ OperateResult result = melsecMcNet.Write("D1001", array);
if (command.getAckFinish() == 0) {
short commandFinish = 1;
- result = melsecMcNet.Write("D9", commandFinish);
+ result = melsecMcNet.Write("D1010", commandFinish);
}
try {
@@ -256,13 +339,13 @@
bean.insert(basCrnOpt);
} catch (Exception ignore) {}
- if (result.IsSuccess) {
- log.info("鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), JSON.toJSON(command));
+ if (result != null && result.IsSuccess) {
+ News.info("MelsecCrn"+" - 7"+" - 鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), JSON.toJSON(command));
OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
return true;
} else {
OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戝啓鍏ュ爢鍨涙満plc鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
- log.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+ News.error("MelsecCrn"+" - 8"+" - 鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
return false;
}
}
@@ -270,6 +353,31 @@
@Override
public void close() {
melsecMcNet.ConnectClose();
+ }
+
+ /**
+ * 蹇冭烦
+ */
+ private void heartbeat(){
+ if (heartBeatVal >= 30000) {
+ heartBeatVal = -30000;
+ } else {
+ heartBeatVal =(short) (heartBeatVal+1);
+ }
+ OperateResult write = melsecMcNet.Write("D1011", heartBeatVal);
+// OperateResult write1 = melsecMcNet.Write("D1001", (short) 0);
+// OperateResult write2 = melsecMcNet.Write("D1002", (short) 0);
+// OperateResult write3 = melsecMcNet.Write("D1003", (short) 0);
+// OperateResult write4 = melsecMcNet.Write("D1004", (short) 0);
+// OperateResult write5 = melsecMcNet.Write("D1005", (short) 0);
+// OperateResult write6 = melsecMcNet.Write("D1006", (short) 0);
+// OperateResult write7 = melsecMcNet.Write("D1007", (short) 0);
+// OperateResult write8 = melsecMcNet.Write("D1008", (short) 0);
+// OperateResult write9 = melsecMcNet.Write("D1009", (short) 0);
+// OperateResult write10 = melsecMcNet.Write("D1010", (short) 0);
+ if (!write.IsSuccess) {
+ News.error("MelsecCrn"+" - 9"+" - 鍫嗗灈鏈簆lc蹇冭烦閫氳澶辫触 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+ }
}
@@ -375,4 +483,17 @@
}
+ // 鎻愪緵涓�涓柟娉曟潵鍋滄绾跨▼
+ public void requestStop() {
+ isRunning = false;
+ }
+
+ // 鎻愪緵涓�涓柟娉曟潵閲嶅惎绾跨▼
+ public Thread restartThread() {
+ isRunning = true;
+ Thread newThread = new Thread(this);
+ newThread.start();
+ return newThread;
+ }
+
}
--
Gitblit v1.9.1