From 25b1530e5adf0d3e1ed5bf9a3d56cccb1e2ce94f Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期六, 23 十一月 2024 16:03:01 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/JarThread.java | 49 ++++++++++++++++++++++++++++++++++++-------------
1 files changed, 36 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/JarThread.java b/src/main/java/com/zy/core/thread/JarThread.java
index c0a5e5d..3b2b223 100644
--- a/src/main/java/com/zy/core/thread/JarThread.java
+++ b/src/main/java/com/zy/core/thread/JarThread.java
@@ -118,14 +118,34 @@
private void readStatus(){
try {
if (slave.getId()>4){
- return;
- }
- OperateResultExOne<byte[]> result = siemensS7Net.Read("V300", (short) 26);
- if (result.IsSuccess) {
if (null == jarProtocol) {
jarProtocol = new JarProtocol();
jarProtocol.setJarNo(slave.getId());
}
+ jarProtocol.setJarNo(slave.getId());
+ jarProtocol.setMode(2);//妯″紡
+ jarProtocol.setStatus((short)0);//鐘舵��
+ jarProtocol.setAutoing(true);//鑷姩
+
+ jarProtocol.setRightDoor(true);//宸﹂棬鐘舵�� //鍑烘枡闂�
+ jarProtocol.setLeftDoor(true);//鍙抽棬鐘舵�� //杩涙枡闂�
+
+ jarProtocol.setLeftDoorOpen(0);//open the left door //杩涙枡闂�
+ jarProtocol.setLeftDoorClose(0);//close the left door //杩涙枡闂�
+ jarProtocol.setRightDoorOpen(0);//open the right door //鍑烘枡闂�
+ jarProtocol.setRightDoorClose(0);//close the right door //鍑烘枡闂�
+
+ jarProtocol.setJarTemperature(0.0F);
+ return;
+ }
+ OperateResultExOne<byte[]> result = siemensS7Net.Read("V300", (short) 30);
+ OperateResultExOne<byte[]> result338 = siemensS7Net.Read("V338", (short) 4);
+ if (result.IsSuccess && result338.IsSuccess) {
+ if (null == jarProtocol) {
+ jarProtocol = new JarProtocol();
+ jarProtocol.setJarNo(slave.getId());
+ }
+ jarProtocol.setJarNo(slave.getId());
if (slave.getId() == 1 || slave.getId() == 3){
jarProtocol.setRightDoor(siemensS7Net.getByteTransform().TransInt16(result.Content, 0) != 0);//宸﹂棬鐘舵�� //鍑烘枡闂�
jarProtocol.setLeftDoor(siemensS7Net.getByteTransform().TransInt16(result.Content, 2) != 0);//鍙抽棬鐘舵�� //杩涙枡闂�
@@ -152,12 +172,15 @@
jarProtocol.setMode((int)siemensS7Net.getByteTransform().TransInt16(result.Content, 12));//妯″紡
jarProtocol.setJarErr((int)siemensS7Net.getByteTransform().TransInt16(result.Content, 14));//寮傚父鐮�
jarProtocol.setStatus(siemensS7Net.getByteTransform().TransInt16(result.Content, 16));//鐘舵��
+ jarProtocol.setJarTemperature(siemensS7Net.getByteTransform().TransSingle(result.Content, 26));//娓╁害
+
+ jarProtocol.setJarPressure(siemensS7Net.getByteTransform().TransSingle(result338.Content, 0));//鍘嬪姏
jarProtocol.setAutoing(siemensS7Net.getByteTransform().TransInt16(result.Content, 12) == 2);//鑷姩
//
// jarProtocol.setMode(2);//妯″紡
-// jarProtocol.setStatus((short)1);//鐘舵��
+// jarProtocol.setStatus((short)6);//鐘舵��
// jarProtocol.setLeftDoorOpen(0);//open the left door //杩涙枡闂�
// jarProtocol.setLeftDoorClose(0);//close the left door //杩涙枡闂�
// jarProtocol.setRightDoorOpen(0);//open the right door //鍑烘枡闂�
@@ -206,7 +229,7 @@
String resultV2 = null;
short resultS2 = 0;
- switch (command.getTaskMode()){
+ switch (command.getTaskModeType().id){
case 1:
case 2:
case 3:
@@ -251,7 +274,7 @@
do {
try{
if(!result1.IsSuccess){
- log.error("鍐欏叆纭寲缃恜lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(command),writeCount);
+ log.error("鍐欏叆纭寲缃恜lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(command),writeCount);
result1 = siemensS7Net.Write(resultV1, resultS1);
Thread.sleep(100);
writeCount++;
@@ -263,14 +286,14 @@
if (transInt16 == resultS1 || transInt16 == (short) 2 || transInt16 == (short) 3){
break;
} else {
- log.error("鍐欏叆纭寲缃恜lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(command),writeCount);
+ log.error("鍐欏叆纭寲缃恜lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(command),writeCount);
result1 = siemensS7Net.Write(resultV1, resultS1);
Thread.sleep(100);
writeCount++;
continue;
}
} else {
- log.error("鍐欏叆纭寲缃恜lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(command),writeCount);
+ log.error("鍐欏叆纭寲缃恜lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(command),writeCount);
result1 = siemensS7Net.Write(resultV1, resultS1);
Thread.sleep(100);
writeCount++;
@@ -286,7 +309,7 @@
do {
try{
if(!result2.IsSuccess){
- log.error("鍐欏叆纭寲缃恜lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(command),writeCount);
+ log.error("鍐欏叆纭寲缃恜lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(command),writeCount);
result2 = siemensS7Net.Write(resultV2, resultS2);
Thread.sleep(100);
writeCount++;
@@ -295,17 +318,17 @@
OperateResultExOne<byte[]> resultRead2 = siemensS7Net.Read(resultV2, (short) 2);
if (resultRead2.IsSuccess) {
short transInt16 = siemensS7Net.getByteTransform().TransInt16(resultRead2.Content, 0);
- if (transInt16 == resultS1 || transInt16 == (short) 3){
+ if (transInt16 == resultS2 || transInt16 == (short) 3){
break;
} else {
- log.error("鍐欏叆纭寲缃恜lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(command),writeCount);
+ log.error("鍐欏叆纭寲缃恜lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(command),writeCount);
result2 = siemensS7Net.Write(resultV2, resultS2);
Thread.sleep(100);
writeCount++;
continue;
}
} else {
- log.error("鍐欏叆纭寲缃恜lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(command),writeCount);
+ log.error("鍐欏叆纭寲缃恜lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(command),writeCount);
result2 = siemensS7Net.Write(resultV2, resultS2);
Thread.sleep(100);
writeCount++;
--
Gitblit v1.9.1