From b48ab507b4cbbe3cf1cf11ac12b1d945478cc662 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 10 六月 2025 19:27:29 +0800
Subject: [PATCH] bug修复

---
 src/main/java/com/zy/controller/SiteController.java     |   11 +++++++++++
 src/main/java/com/zy/service/impl/MainServiceImpl.java  |    6 +++++-
 src/main/java/com/zy/core/thread/SiemensDevpThread.java |   11 +++++++++++
 3 files changed, 27 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/controller/SiteController.java b/src/main/java/com/zy/controller/SiteController.java
index b3c38f9..80b54bd 100644
--- a/src/main/java/com/zy/controller/SiteController.java
+++ b/src/main/java/com/zy/controller/SiteController.java
@@ -178,6 +178,17 @@
                     }
                     boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                     if (result) {
+                        int devId = 0;
+                        switch (siteId) {
+                            case 1081: devId = 4;break;
+                            case 1084: devId = 5;break;
+                            case 1087: devId = 6;break;
+                            default:
+                        }
+                        if(devId != 0){ // 鍚屾椂缁欑綈瑁呯嚎鍐欏彲鍑�
+                            staProtocol.setPlaceableFlag(1);
+                            MessageQueue.offer(SlaveType.Devp, devId, new Task(5, staProtocol));
+                        }
                         return R.ok();
                     } else {
                         return R.error("涓嬪彂鍛戒护澶辫触");
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 6707f1f..82682c6 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -89,6 +89,8 @@
         add(1081); add(1084);add(1087);
     }};
 
+    private static long lastLogTime = 0;
+
     public SiemensDevpThread(DevpSlave slave) {
         this.slave = slave;
     }
@@ -224,6 +226,15 @@
 //            log.info("璇诲彇{}鍙风綈瑁呯嚎plc淇℃伅鎴愬姛",slave.getId());
             OperateResultExOne<byte[]> read = siemensS7Net.Read("DB101.0", (short) 58);
             if (read.IsSuccess) {
+                // 15绉掓墦鍗颁竴涓嬫棩蹇�
+                if (System.currentTimeMillis() - lastLogTime >= 15000) {
+                    OperateResultExOne<byte[]> readKc = siemensS7Net.Read("DB100.6", (short) 2);
+                    if(readKc.IsSuccess){
+                        short i = siemensS7Net.getByteTransform().TransInt16(readKc.Content, 0);
+                        log.info("璇粄}鍙风綈瑁呯嚎鍙嚭淇″彿鎴愬姛锛屽�硷細{}", slave.getId() -3, i);
+                    }
+                    lastLogTime = System.currentTimeMillis();
+                }
                 // 鎴愬搧淇℃伅鍙嶉鍒扮綈瑁呯嚎鍑哄彛绔欑偣
                 DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 2);
                 StaProtocol staProtocol = devpThread.getStation().get(gzxResultSite.get(slave.getId()-4));
diff --git a/src/main/java/com/zy/service/impl/MainServiceImpl.java b/src/main/java/com/zy/service/impl/MainServiceImpl.java
index 0a22a89..26fcc24 100644
--- a/src/main/java/com/zy/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/service/impl/MainServiceImpl.java
@@ -928,7 +928,7 @@
                     crnCommand.setDestinationPosX(crnStn.getRow().shortValue());     // 鐩爣搴撲綅鎺�
 
                     // 婧愮珯1057
-                    if(slave.getId() == 4 && crnStn.getStaNo() == 1057 && sourceSta.getRow1() == 12) {
+                    if(slave.getId() == 4 && crnStn.getStaNo() == 1057 && (sourceSta.getRow1() == 11 || sourceSta.getRow1() == 12)) {
                         crnCommand.setDestinationPosX((short) 9);
                     }
                     crnCommand.setDestinationPosY(crnStn.getBay().shortValue());     // 鐩爣搴撲綅鍒�
@@ -1648,6 +1648,10 @@
                 }
 
                 if(wrkMast.getIoType() == 3 && (wrkMast.getStaNo() == 1024 || wrkMast.getStaNo() == 1016 || wrkMast.getStaNo() == 1043)) { // 鍒�1024鍑哄簱鍙o紝鏀惧埌杈撻�佺嚎鍚庝换鍔″畬鎴�
+                    if(wrkMast.getWrkSts() != 2 ){
+                        log.warn("rgv鏀捐揣瀹屾垚锛宺gv鏈浣�:rgv鍙穥}锛屼换鍔″彿锛歿}锛屼换鍔$姸鎬亄}",wrkMast.getRgvNo(),wrkMast.getWrkNo(),wrkMast.getWrkSts());
+                        continue;
+                    }
                     wrkMast.setWrkSts(2L);
                     wrkMast.setModiTime(new Date());
                     wrkMastService.updateById(wrkMast);

--
Gitblit v1.9.1