From b49345c85dfad9d73c6b88b54679ad5de9dbfe3c Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期日, 24 十一月 2024 09:43:44 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 104 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 102 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index ebce4ea..6cc420d 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -10,6 +10,8 @@
import com.core.common.SpringUtils;
import com.core.exception.CoolException;
import com.zy.asrs.entity.BasDevp;
+import com.zy.asrs.entity.RgvOneSign;
+import com.zy.asrs.mapper.RgvOneSignMapper;
import com.zy.asrs.service.BasDevpService;
import com.zy.core.DevpThread;
import com.zy.core.News;
@@ -347,6 +349,103 @@
}
}
}
+ } else if (slave.getId()==1){
+ try{
+ RgvOneSignMapper rgvOneSignMapper = SpringUtils.getBean(RgvOneSignMapper.class);
+
+ OperateResultExOne<byte[]> resultSignOne = siemensS7Net.Read("DB293.106", (short) (8));
+
+ 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);// 澶ф枡缈昏浆
+
+ 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);
+ }
+ }
+ } 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);
+ }
+ }
}
@@ -356,7 +455,7 @@
if (result2.IsSuccess) {
int[] staNosRgv = new int[]{281,292,173,214,120};
if (slave.getId()==2){
- staNosRgv = new int[]{453,460,508,534,611};
+ staNosRgv = new int[]{453,460,518,532,607};
}
for (int i = 0; i < barcodeSize; i++) {
//1:281 2:292 3:174(173) 4:214 5:120
@@ -1040,9 +1139,10 @@
* 璁剧疆鍏ュ簱鏍囪
*/
@Override
- public void setPakMk(Integer siteId, boolean pakMk) {
+ public void setPakMk(Integer siteId, boolean pakMk,Integer i) {
StaProtocol staProtocol = station.get(siteId);
if (null != staProtocol) {
+ log.info("閿佸畾鍏ュ簱鏍囪锛岀珯鐐瑰彿={};pakMk={};鏃堕棿={};鏍囪={}",siteId,pakMk,new Date(),i);
staProtocol.setPakMk(pakMk);
}
}
--
Gitblit v1.9.1