From 97283d17c312d0e6aca7946bc060015c17349a57 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 13 八月 2020 08:21:39 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 15 ++++---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 16 ++++----
src/main/java/com/zy/core/thread/DevpThread.java | 88 +++++++++++++++++++++----------------------
3 files changed, 60 insertions(+), 59 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 7a27c3c..0e941a0 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -138,8 +138,8 @@
// 鏇存柊绔欑偣淇℃伅 涓� 涓嬪彂plc鍛戒护
barcodeThread.setBarcode("");
- staProtocol.setWorkNo(workNo);
- staProtocol.setStaNo(startupDto.getStaNo());
+ staProtocol.setWorkNo((short) workNo);
+ staProtocol.setStaNo(startupDto.getStaNo().shortValue());
staProtocol.setPakMk(false);
staProtocol.setInreq1(false);
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(4, staProtocol));
@@ -169,7 +169,7 @@
if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInreq1()
&& staProtocol.getWorkNo() > 0 && staProtocol.isPakMk()){
- WrkMast wrkMast = wrkMastMapper.selectPickStep(staProtocol.getWorkNo());
+ WrkMast wrkMast = wrkMastMapper.selectPickStep(staProtocol.getWorkNo().intValue());
if (wrkMast == null) {
// 鏃犳嫞鏂欐暟鎹�
continue;
@@ -217,8 +217,8 @@
}
// 鏇存柊绔欑偣淇℃伅 涓� 涓嬪彂plc鍛戒护
- staProtocol.setWorkNo(wrkMast.getWrkNo());
- staProtocol.setStaNo(wrkMast.getStaNo());
+ staProtocol.setWorkNo(wrkMast.getWrkNo().shortValue());
+ staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
staProtocol.setPakMk(false);
staProtocol.setInreq1(false);
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(4, staProtocol));
@@ -281,8 +281,8 @@
}
// 2.涓嬪彂绔欑偣淇℃伅
- staProtocol.setWorkNo(wrkMast.getWrkNo());
- staProtocol.setStaNo(wrkMast.getStaNo());
+ staProtocol.setWorkNo(wrkMast.getWrkNo().shortValue());
+ staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
if (!MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(4, staProtocol))) {
throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触");
}
@@ -354,7 +354,7 @@
continue;
}
// 鑾峰彇宸ヤ綔鐘舵�佷负2锛堣澶囦笂璧帮級鐨勫叆搴撳伐浣滄。
- WrkMast wrkMast = wrkMastMapper.selectPakInStep2(slave.getId(), staProtocol.getWorkNo());
+ WrkMast wrkMast = wrkMastMapper.selectPakInStep2(slave.getId(), staProtocol.getWorkNo().intValue());
if(null == wrkMast) {
log.error("鏌ヨ鏃犲緟鍏ュ簱鏁版嵁--wrk_sts=2, 宸ヤ綔鍙�={}", staProtocol.getWorkNo());
continue;
diff --git a/src/main/java/com/zy/core/model/protocol/StaProtocol.java b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
index 16a7ad7..1c2ff6e 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -12,6 +12,15 @@
// 绔欑偣缂栧彿
private Integer siteId;
+ // ----------------------------------------------------------------
+ // 宸ヤ綔鍙�
+ private Short workNo;
+
+ // ----------------------------------------------------------------
+ // 鐩爣绔�
+ private Short staNo;
+
+ // ----------------------------------------------------------------
// 鑷姩
private boolean autoing;
@@ -32,12 +41,6 @@
// 閿佸畾鏍囪
private boolean pakMk;
-
- // 宸ヤ綔鍙�
- private Integer workNo;
-
- // 鐩爣绔�
- private Integer staNo;
}
diff --git a/src/main/java/com/zy/core/thread/DevpThread.java b/src/main/java/com/zy/core/thread/DevpThread.java
index 03f028f..1695914 100644
--- a/src/main/java/com/zy/core/thread/DevpThread.java
+++ b/src/main/java/com/zy/core/thread/DevpThread.java
@@ -4,6 +4,7 @@
import HslCommunication.Core.Types.OperateResultExOne;
import HslCommunication.Profinet.Siemens.SiemensPLCS;
import HslCommunication.Profinet.Siemens.SiemensS7Net;
+import com.alibaba.fastjson.JSON;
import com.zy.core.Slave;
import com.zy.core.ThreadHandler;
import com.zy.core.cache.MessageQueue;
@@ -46,10 +47,7 @@
switch (step) {
// 璇绘暟鎹�
case 1:
- readWorkNo(); // 璇诲彇宸ヤ綔鍙�
- readStaDest(); // 璇诲彇鐩爣绔�
- readStatus(); // 璇诲彇鐘舵��
- readError(); // 璇诲彇寮傚父淇℃伅
+ read(); // 璇诲彇鐘舵��
break;
case 2:
break;
@@ -85,57 +83,57 @@
return result;
}
- /**
- * 璇诲彇宸ヤ綔鍙�
- */
- private void readWorkNo(){
- OperateResultExOne<int[]> read = siemensS7Net.ReadInt32("DB100", (short) 8);
- if (read.IsSuccess) {
- int staNo1 = read.Content[0];
- int staNo2 = read.Content[1];
- int staNo3 = read.Content[2];
- int staNo4 = read.Content[3];
- int staNo5 = read.Content[4];
- int staNo6 = read.Content[5];
- int staNo7 = read.Content[6];
- int staNo8 = read.Content[7];
- }
- }
-
- /**
- * 璇诲彇鐩爣绔�
- */
- private void readStaDest(){
- OperateResultExOne<byte[]> read = siemensS7Net.Read("DB101", (short) 8);
- if (read.IsSuccess) {
- int staNo1 = siemensS7Net.getByteTransform().TransInt32(read.Content, 0);
- int staNo2 = siemensS7Net.getByteTransform().TransInt32(read.Content, 4);
- int staNo3 = siemensS7Net.getByteTransform().TransInt32(read.Content, 8);
- int staNo4 = siemensS7Net.getByteTransform().TransInt32(read.Content, 12);
- int staNo5 = siemensS7Net.getByteTransform().TransInt32(read.Content, 16);
- int staNo6 = siemensS7Net.getByteTransform().TransInt32(read.Content, 20);
- int staNo7 = siemensS7Net.getByteTransform().TransInt32(read.Content, 24);
- int staNo8 = siemensS7Net.getByteTransform().TransInt32(read.Content, 28);
-
- }
+ public static void main(String[] args) {
+ Slave slave = new Slave();
+ slave.setIp("192.168.2.125");
+ DevpThread devpThread = new DevpThread(slave);
+ boolean connect = devpThread.connect();
+ System.out.println(connect);
+ devpThread.read();
+ // 鍐�
+ StaProtocol staProtocol = devpThread.getStation().get(1);
+ staProtocol.setWorkNo((short) 666);
+ devpThread.write(staProtocol);
+ // 璇�
+ devpThread.read();
+ System.out.println(JSON.toJSONString(devpThread.station));
}
/**
* 璇诲彇鐘舵��
*/
- private void readStatus(){
-
+ private void read(){
+ OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.0", (short) 40);
+ for (int i = 1; i <= 7; i++) {
+ StaProtocol staProtocol = station.get(i);
+ if (null == staProtocol) {
+ staProtocol = new StaProtocol();
+ staProtocol.setSiteId(i);
+ station.put(i, staProtocol);
+ }
+ System.out.println(siemensS7Net.getByteTransform().TransInt16(result.Content, (i-1)*2));
+ staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt16(result.Content, (i-1)*2));
+ staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, (i-1)*2+20));
+// staProtocol.setAutoing(siemensS7Net.getByteTransform().TransBool());
+ }
+ // todo
+// OperateResultExOne<Short> shortOperateResultExOne = siemensS7Net.ReadInt16("DB100.0");
+// System.out.println(shortOperateResultExOne.Content);
}
- /**
- * 璇诲彇寮傚父淇℃伅
- */
- private void readError(){
- }
- private void writeWorkNo(){
+ private void write(StaProtocol staProtocol){
+ if (null == staProtocol) {
+ return;
+ }
+ OperateResult write = siemensS7Net.Write("DB100." + (staProtocol.getSiteId() - 1) * 2, staProtocol.getWorkNo());
+ if (write.IsSuccess) {
+ System.out.println("鍐欏叆鎴愬姛");
+ } else {
+ System.out.println("鍐欏叆澶辫触");
+ }
}
--
Gitblit v1.9.1