From 4c167750ac805b35d0c025961b060b23f0268969 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 19 一月 2026 15:35:40 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 159512d..9f829a9 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -53,6 +53,8 @@
*/
private boolean backHpFlag = false;
+ private Integer errId = 0;
+
public SiemensCrnThread(CrnSlave slave) {
this.slave = slave;
}
@@ -170,8 +172,8 @@
private void readStatus(){
try {
OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) 56);
- OperateResultExOne<byte[]> resultErr = siemensNet.Read("DB64.0", (short) 7);
- 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());
@@ -200,7 +202,7 @@
crnProtocol.setyDuration(siemensNet.getByteTransform().TransSingle(result.Content, 52));
- boolean[] statusSign = siemensNet.getByteTransform().TransBool(resultErr.Content, 0, 7);
+ boolean[] statusSign = siemensNet.getByteTransform().TransBool(resultErr.Content, 0, 6);
crnProtocol.setIbDriveFault(statusSign[0]); // 琛岃蛋鍙橀鍣ㄦ晠闅�
crnProtocol.setIbSupplyFault(statusSign[1]); // 鎻愪緵鍙橀鍣ㄦ晠闅�
@@ -260,7 +262,7 @@
// 澶嶄綅淇″彿
if (!Cools.isEmpty(crnProtocol.getStatusType()) && crnProtocol.getStatusType().equals(CrnStatusType.WAITING)) {
- News.error("---绗竴姝ャ�乕鍫嗗灈鏈哄彿锛歿}, 宸ヤ綔鍙凤細{}, 杞借揣鍙颁俊鍙�:{}]==>> 鐘舵�佷负10锛岀瓑寰呯‘璁わ紒锛�",
+ News.info("---绗竴姝ャ�乕鍫嗗灈鏈哄彿锛歿}, 宸ヤ綔鍙凤細{}, 杞借揣鍙颁俊鍙�:{}]==>> 鐘舵�佷负10锛岀瓑寰呯‘璁わ紒锛�",
slave.getId(),crnProtocol.getTaskNo(), crnProtocol.getLoaded()==1 ? "鏈夌墿" : "鏃犵墿");
if (resetFlag) {
if(crnProtocol.getTaskNo()==9999){
@@ -289,7 +291,9 @@
BasCrnErrorLog basCrnErrorLogs;
basCrnErrorLogs = crnProtocol.toSqlModelError();
BasCrnErrorLogService basCrnErrorLogService = SpringUtils.getBean(BasCrnErrorLogService.class);
- basCrnErrorLogService.insert(basCrnErrorLogs);
+ if(basCrnErrorLogService.insert(basCrnErrorLogs)){
+ crnProtocol.setUuid(basCrnErrorLogs.getId().toString());
+ }
crnProtocol.setWriteMk(false);
} catch (Exception ignore) {
log.error(ignore.getMessage());
--
Gitblit v1.9.1