From 556fa0e355ae22b6bfcf15d0a230cd5c1b1cb764 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期二, 28 十月 2025 08:27:29 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 93 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 91 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index e08db4f..0f8b410 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -8,10 +8,14 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
+import com.zy.asrs.entity.BasCrnErrorLog;
import com.zy.asrs.entity.BasCrnOpt;
import com.zy.asrs.entity.BasCrnp;
+import com.zy.asrs.entity.BasDevpErrorLog;
+import com.zy.asrs.service.BasCrnErrorLogService;
import com.zy.asrs.service.BasCrnOptService;
import com.zy.asrs.service.BasCrnpService;
+import com.zy.asrs.service.BasDevpErrorLogService;
import com.zy.common.utils.News;
import com.zy.core.CrnThread;
import com.zy.core.cache.MessageQueue;
@@ -126,6 +130,18 @@
crnProtocol.setyDistance((short) 0);
crnProtocol.setxDuration((short) 0);
crnProtocol.setyDuration((short) 0);
+ try{
+ // 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
+ BasCrnpService basCrnpService = SpringUtils.getBean(BasCrnpService.class);
+ BasCrnp basCrnp = new BasCrnp();
+ basCrnp.setCrnNo(slave.getId());
+ basCrnp.setCrnSts((int)crnProtocol.getMode());
+ if (!basCrnpService.updateById(crnProtocol.toSqlModel(basCrnp))){
+ News.error("SiemensCrn"+" - 3"+" - 鍫嗗灈鏈簆lc鏁版嵁搴撴洿鏂板け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
+ }
+ } catch (Exception e){
+
+ }
}
@Override
@@ -154,10 +170,12 @@
private void readStatus(){
try {
OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) 56);
- if (result.IsSuccess) {
+ OperateResultExOne<byte[]> resultErr = siemensNet.Read("DB64.0", (short) 6);
+ if (result.IsSuccess && resultErr.IsSuccess) {
if (null == crnProtocol) {
crnProtocol = new CrnProtocol();
crnProtocol.setCrnNo(slave.getId());
+
}
crnProtocol.setMode(siemensNet.getByteTransform().TransInt16(result.Content, 0));
crnProtocol.setTaskNo(siemensNet.getByteTransform().TransInt16(result.Content, 2));
@@ -180,6 +198,63 @@
crnProtocol.setyDistance(siemensNet.getByteTransform().TransSingle(result.Content, 44));
crnProtocol.setxDuration(siemensNet.getByteTransform().TransSingle(result.Content, 48));
crnProtocol.setyDuration(siemensNet.getByteTransform().TransSingle(result.Content, 52));
+
+
+ boolean[] statusSign = siemensNet.getByteTransform().TransBool(resultErr.Content, 0, 6);
+
+ crnProtocol.setIbDriveFault(statusSign[0]); // 琛岃蛋鍙橀鍣ㄦ晠闅�
+ crnProtocol.setIbSupplyFault(statusSign[1]); // 鎻愪緵鍙橀鍣ㄦ晠闅�
+ crnProtocol.setIbForkDriveFault(statusSign[2]); // 璐у弶鍙橀鍣ㄦ晠闅�
+ crnProtocol.setIbDriveCircuitFault(statusSign[3]); // 琛岃蛋鏂矾鍣ㄦ晠闅�
+ crnProtocol.setIbLiftCircuitFault(statusSign[4]); // 鎻愬崌鏂矾鍣ㄦ晠闅�
+ crnProtocol.setIbForkCircuitFault(statusSign[5]); // 璐у弶鏂矾鍣ㄦ晠闅�
+ crnProtocol.setIbForwardLimit(statusSign[6]); // 鍓嶈繘闄愪綅
+ crnProtocol.setIbReverseLimit(statusSign[7]); // 鍚庨��闄愪綅
+ crnProtocol.setIbDriveStart(statusSign[8]); // 琛岃蛋鍘熺偣
+ crnProtocol.setIbForwardBrakeSpeed(statusSign[9]); // 鍓嶈繘寮哄埗浣庨��
+ crnProtocol.setIbReverseBrakeSpeed(statusSign[10]); // 鍚庨��寮哄埗浣庨��
+ crnProtocol.setIbUpLimit(statusSign[11]); // 涓婂崌闄愪綅
+ crnProtocol.setIbDownLimit(statusSign[12]); // 涓嬮檺闄愪綅
+ crnProtocol.setIbUpOrigin(statusSign[13]); // 鎻愬崌鍘熺偣
+ crnProtocol.setIbUpBrakeSpeed(statusSign[14]); // 涓婂崌寮哄埗浣庨��
+ crnProtocol.setIbDownBrakeSpeed(statusSign[15]); // 涓嬮檷寮哄埗浣庨��
+ crnProtocol.setIbPlatformSignal(statusSign[16]); // 杞借揣鍙版帰璐�
+ crnProtocol.setIbForkMidSignal(statusSign[17]); // 璐у弶涓綅淇″彿
+ crnProtocol.setIbForkLeftLimit(statusSign[18]); // 璐у弶宸︽瀬闄�
+ crnProtocol.setIbForkRightLimit(statusSign[19]); // 璐у弶鍙虫瀬闄�
+ crnProtocol.setIbFrontOverLimit(statusSign[20]); // 鍓嶈秴闄�
+ crnProtocol.setIbRearOverLimit(statusSign[21]); // 鍚庤秴闄�
+ crnProtocol.setIbLeftOverLimit(statusSign[22]); // 宸﹁秴闄�
+ crnProtocol.setIbRightOverLimit(statusSign[23]); // 鍙宠秴闄�
+ crnProtocol.setIbHighOverLimit1(statusSign[24]); // 楂樿秴闄�1
+ crnProtocol.setIbHighOverLimit2(statusSign[25]); // 楂樿秴闄�2
+ crnProtocol.setIbHighOverLimit3(statusSign[26]); // 楂樿秴闄�3
+ crnProtocol.setIbOneExtendLeftLoad1(statusSign[27]); // 涓�浼稿乏渚ф帰璐�1
+ crnProtocol.setIbOneExtendLeftLoad2(statusSign[28]); // 涓�浼稿乏渚ф帰璐�2
+ crnProtocol.setIbOneExtendRightLoad1(statusSign[29]); // 涓�浼稿彸渚ф帰璐�1
+ crnProtocol.setIbOneExtendRightLoad2(statusSign[30]); // 涓�浼稿彸渚ф帰璐�2
+ crnProtocol.setIbTwoExtendLeftLoad1(statusSign[31]); // 浜屼几宸︿晶鎺㈣揣1
+ crnProtocol.setIbTwoExtendLeftLoad2(statusSign[32]); // 浜屼几宸︿晶鎺㈣揣2
+ crnProtocol.setIbTwoExtendRightLoad1(statusSign[33]); // 浜屼几鍙充晶鎺㈣揣1
+ crnProtocol.setIbTwoExtendRightLoad2(statusSign[34]); // 浜屼几鍙充晶鎺㈣揣2
+ crnProtocol.setIbSpeedSignal1(statusSign[35]); // 瓒呴�熶俊鍙�1
+ crnProtocol.setIbSpeedSignal2(statusSign[36]); // 瓒呴�熶俊鍙�2
+ crnProtocol.setIbOverweightSignal1(statusSign[37]); // 瓒呴噸淇″彿1
+ crnProtocol.setIbOverweightSignal2(statusSign[38]); // 瓒呴噸淇″彿2
+ crnProtocol.setIbRopeReleaseSignal1(statusSign[39]); // 鏉剧怀淇″彿1
+ crnProtocol.setIbRopeReleaseSignal2(statusSign[40]); // 鏉剧怀淇″彿2
+ crnProtocol.setIbSafetyClamp(statusSign[41]); // 瀹夊叏閽�
+ crnProtocol.setIbTightener(statusSign[42]); // 寮犵揣鍣�
+ crnProtocol.setIbSpeedLimiter(statusSign[43]); // 闄愰�熷櫒
+ crnProtocol.setIbSafetyDoorOpen(statusSign[44]); // 瀹夊叏闂ㄦ墦寮�
+
+ if(crnProtocol.getStatus() == 99){
+ crnProtocol.setErrorMk(true);//鑻ュ瓨鍦ㄥ紓甯歌Е鍙戝啓鍏�
+ }else{
+ crnProtocol.setWriteMk(true);//鏃犲紓甯稿悗鎵嶈兘缁х画鍐欏叆
+ crnProtocol.setErrorMk(false);
+ }
+
OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
@@ -208,10 +283,24 @@
BasCrnp basCrnp = new BasCrnp();
basCrnp.setCrnNo(slave.getId());
basCrnp.setCrnSts((int)crnProtocol.getMode());
+ if(crnProtocol.isWriteMk() && crnProtocol.isErrorMk()){
+ try {
+ // 鏃ュ織璁板綍寮傚父鎯呭喌
+ BasCrnErrorLog basCrnErrorLogs;
+ basCrnErrorLogs = crnProtocol.toSqlModelError();
+ BasCrnErrorLogService basCrnErrorLogService = SpringUtils.getBean(BasCrnErrorLogService.class);
+ basCrnErrorLogService.insert(basCrnErrorLogs);
+ crnProtocol.setWriteMk(false);
+ } catch (Exception ignore) {
+ log.error(ignore.getMessage());
+ }
+ }
if (!basCrnpService.updateById(crnProtocol.toSqlModel(basCrnp))){
News.error("SiemensCrn"+" - 3"+" - 鍫嗗灈鏈簆lc鏁版嵁搴撴洿鏂板け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
}
- } catch (Exception ignore){}
+ } catch (Exception ignore){
+
+ }
} else {
initCrn();
--
Gitblit v1.9.1