From 78489da7e2185f53faaec9356fa1a8997cedab70 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期三, 28 五月 2025 08:46:55 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/MelsecCrnThread.java | 50 ++++++++++++++++++++++++++------------------------
1 files changed, 26 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/MelsecCrnThread.java b/src/main/java/com/zy/core/thread/MelsecCrnThread.java
index cb42c1f..b2a5fb2 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;
@@ -24,7 +25,6 @@
import com.zy.core.model.protocol.CrnProtocol;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import java.text.MessageFormat;
import java.util.Date;
@@ -125,13 +125,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
@@ -142,10 +142,10 @@
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("鍫嗗灈鏈簆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("鍫嗗灈鏈簆lc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
initCrn();
}
// melsecMcNet.ConnectClose();
@@ -182,19 +182,19 @@
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("-------------------------------------------绗竴姝ャ�乕鍫嗗灈鏈哄彿锛歿}][宸ヤ綔鍙凤細{}]==>> 鐘舵�佷负90锛岀瓑寰呯‘璁わ紒锛�",slave.getId(),crnProtocol.getTaskNo());
if (resetFlag) {
if(crnProtocol.getTaskNo()==9999){
backHpFlag = false;
@@ -214,7 +214,7 @@
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("鍫嗗灈鏈簆lc鏁版嵁搴撴洿鏂板け璐� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
}
} else {
@@ -224,7 +224,7 @@
} 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("璇诲彇鍫嗗灈鏈簆lc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
initCrn();
}
@@ -234,8 +234,10 @@
* 鍐欏叆鏁版嵁
*/
private boolean write(CrnCommand command){
+ String methodName = Thread.currentThread().getStackTrace()[1].getMethodName();
+
if (null == command) {
- log.error("鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�");
+ News.error("鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�");
return false;
}
@@ -330,12 +332,12 @@
} catch (Exception ignore) {}
if (result != null && result.IsSuccess) {
- log.info("鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), JSON.toJSON(command));
+ News.info(methodName + ":鍫嗗灈鏈哄懡浠や笅鍙慬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(methodName + ":鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
return false;
}
}
@@ -356,7 +358,7 @@
}
OperateResult write = melsecMcNet.Write("D10", heartBeatVal);
if (!write.IsSuccess) {
- log.error("杈撻�佺嚎plc缂栧彿={} 蹇冭烦澶辫触", slave.getId());
+ News.error("鍫嗗灈鏈簆lc蹇冭烦閫氳澶辫触 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
}
}
--
Gitblit v1.9.1