From 4a8bf4bb4e14bec6f9427825eabe08c15326e984 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期日, 24 十一月 2024 09:59:36 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 118 ++++++++++++++++-------------------------------------------
1 files changed, 32 insertions(+), 86 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 6cc420d..dd03cd5 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -351,100 +351,28 @@
}
} else if (slave.getId()==1){
try{
- RgvOneSignMapper rgvOneSignMapper = SpringUtils.getBean(RgvOneSignMapper.class);
-
- OperateResultExOne<byte[]> resultSignOne = siemensS7Net.Read("DB293.106", (short) (8));
+ OperateResultExOne<byte[]> resultSignOne = siemensS7Net.Read("DB293.106", (short) (16));
int smallEmpty = siemensS7Net.getByteTransform().TransInt16(resultSignOne.Content, 0);// 灏忔枡绌烘墭
int bigEmpty = siemensS7Net.getByteTransform().TransInt16(resultSignOne.Content, 2);// 澶ф枡绌烘墭
int smallTurn = siemensS7Net.getByteTransform().TransInt16(resultSignOne.Content, 4);// 灏忔枡缈昏浆
int bigTurn = siemensS7Net.getByteTransform().TransInt16(resultSignOne.Content, 6);// 澶ф枡缈昏浆
+ int LineUp131 = siemensS7Net.getByteTransform().TransInt16(resultSignOne.Content, 8);// 131鎺掗槦
+ int LineUp126 = siemensS7Net.getByteTransform().TransInt16(resultSignOne.Content, 10);// 126鎺掗槦
+ int LineUp312 = siemensS7Net.getByteTransform().TransInt16(resultSignOne.Content, 12);// 312鎺掗槦
+ int LineUp310 = siemensS7Net.getByteTransform().TransInt16(resultSignOne.Content, 14);// 310鎺掗槦
- try{
- RgvOneSign smallEmptySign = rgvOneSignMapper.selectOneSign("smallEmpty");
- if (!Cools.isEmpty(smallEmptySign)){
- smallEmptySign.setRgvOneSign(smallEmpty);
- rgvOneSignMapper.updateById(smallEmptySign);
- }
- } catch (Exception e){
- RgvOneSign smallEmptySign = rgvOneSignMapper.selectOneSign("smallEmpty");
- if (!Cools.isEmpty(smallEmptySign)){
- smallEmptySign.setRgvOneSign(999);
- rgvOneSignMapper.updateById(smallEmptySign);
- }
- }
- try{
- RgvOneSign bigEmptySign = rgvOneSignMapper.selectOneSign("bigEmpty");
- if (!Cools.isEmpty(bigEmptySign)){
- bigEmptySign.setRgvOneSign(bigEmpty);
- rgvOneSignMapper.updateById(bigEmptySign);
- }
- } catch (Exception e){
- RgvOneSign bigEmptySign = rgvOneSignMapper.selectOneSign("bigEmpty");
- if (!Cools.isEmpty(bigEmptySign)){
- bigEmptySign.setRgvOneSign(999);
- rgvOneSignMapper.updateById(bigEmptySign);
- }
- }
- try{
- RgvOneSign smallTurnSign = rgvOneSignMapper.selectOneSign("smallTurn");
- if (!Cools.isEmpty(smallTurnSign)){
- smallTurnSign.setRgvOneSign(smallTurn);
- rgvOneSignMapper.updateById(smallTurnSign);
- }
- } catch (Exception e){
- RgvOneSign smallTurnSign = rgvOneSignMapper.selectOneSign("smallTurn");
- if (!Cools.isEmpty(smallTurnSign)){
- smallTurnSign.setRgvOneSign(999);
- rgvOneSignMapper.updateById(smallTurnSign);
- }
- }
- try{
- RgvOneSign bigTurnSign = rgvOneSignMapper.selectOneSign("bigTurn");
- if (!Cools.isEmpty(bigTurnSign)){
- bigTurnSign.setRgvOneSign(bigTurn);
- rgvOneSignMapper.updateById(bigTurnSign);
- }
- } catch (Exception e){
- RgvOneSign bigTurnSign = rgvOneSignMapper.selectOneSign("bigTurn");
- if (!Cools.isEmpty(bigTurnSign)){
- bigTurnSign.setRgvOneSign(999);
- rgvOneSignMapper.updateById(bigTurnSign);
- }
- }
+ updateRgvOneSign("smallEmpty",smallEmpty);
+ updateRgvOneSign("bigEmpty",bigEmpty);
+ updateRgvOneSign("smallTurn",smallTurn);
+ updateRgvOneSign("bigTurn",bigTurn);
+ updateRgvOneSign("LineUp131",LineUp131);
+ updateRgvOneSign("LineUp126",LineUp126);
+ updateRgvOneSign("LineUp312",LineUp312);
+ updateRgvOneSign("LineUp310",LineUp310);
+
} catch (Exception e){
log.error("璇诲彇杈撻�佺嚎鏁伴噺鏍囪鍑虹幇寮傚父锛�"+e);
- try{
- RgvOneSignMapper rgvOneSignMapper = SpringUtils.getBean(RgvOneSignMapper.class);
-
- RgvOneSign smallEmptySign = rgvOneSignMapper.selectOneSign("smallEmpty");
- if (!Cools.isEmpty(smallEmptySign)){
- smallEmptySign.setRgvOneSign(999);
- rgvOneSignMapper.updateById(smallEmptySign);
- }
-
-
- RgvOneSign bigEmptySign = rgvOneSignMapper.selectOneSign("bigEmpty");
- if (!Cools.isEmpty(bigEmptySign)){
- bigEmptySign.setRgvOneSign(999);
- rgvOneSignMapper.updateById(bigEmptySign);
- }
-
-
- RgvOneSign smallTurnSign = rgvOneSignMapper.selectOneSign("smallTurn");
- if (!Cools.isEmpty(smallTurnSign)){
- smallTurnSign.setRgvOneSign(999);
- rgvOneSignMapper.updateById(smallTurnSign);
- }
-
- RgvOneSign bigTurnSign = rgvOneSignMapper.selectOneSign("bigTurn");
- if (!Cools.isEmpty(bigTurnSign)){
- bigTurnSign.setRgvOneSign(999);
- rgvOneSignMapper.updateById(bigTurnSign);
- }
- } catch (Exception e2){
- log.error("璇诲彇杈撻�佺嚎鏁伴噺鏍囪鍑虹幇寮傚父锛�"+e2);
- }
}
}
@@ -1147,6 +1075,24 @@
}
}
+ public void updateRgvOneSign(String signType,Integer oneSign){
+ RgvOneSignMapper rgvOneSignMapper = SpringUtils.getBean(RgvOneSignMapper.class);
+
+ try{
+ RgvOneSign rgvOneSign = rgvOneSignMapper.selectOneSign(signType);
+ if (!Cools.isEmpty(rgvOneSign)){
+ rgvOneSign.setRgvOneSign(oneSign);
+ rgvOneSignMapper.updateById(rgvOneSign);
+ }
+ } catch (Exception e){
+ RgvOneSign rgvOneSign = rgvOneSignMapper.selectOneSign(signType);
+ if (!Cools.isEmpty(rgvOneSign)){
+ rgvOneSign.setRgvOneSign(999);
+ rgvOneSignMapper.updateById(rgvOneSign);
+ }
+ }
+ }
+
@Override
public void close() {
siemensS7Net.ConnectClose();
--
Gitblit v1.9.1