From 96bf3f238144416b09ff7c7c346f7d88b98214b8 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 24 十月 2024 14:11:03 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/core/thread/JarThread.java | 50 ++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 40 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/JarThread.java b/src/main/java/com/zy/core/thread/JarThread.java
index 311d53d..6b8c207 100644
--- a/src/main/java/com/zy/core/thread/JarThread.java
+++ b/src/main/java/com/zy/core/thread/JarThread.java
@@ -20,7 +20,6 @@
import com.zy.core.enums.SlaveType;
import com.zy.core.model.JarSlave;
import com.zy.core.model.Task;
-import com.zy.core.model.command.CrnCommand;
import com.zy.core.model.command.JarCommand;
import com.zy.core.model.protocol.JarProtocol;
import lombok.Data;
@@ -64,7 +63,7 @@
break;
// 鍐欐暟鎹� ID+鐩爣绔�
case 2:
- write(null);
+ write((JarCommand) task.getData());
break;
default:
break;
@@ -118,7 +117,27 @@
*/
private void readStatus(){
try {
- OperateResultExOne<byte[]> result = siemensS7Net.Read("V300", (short) 26);
+ if (slave.getId()>4){
+ if (null == jarProtocol) {
+ jarProtocol = new JarProtocol();
+ 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);
if (result.IsSuccess) {
if (null == jarProtocol) {
jarProtocol = new JarProtocol();
@@ -150,8 +169,19 @@
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.setAutoing(siemensS7Net.getByteTransform().TransInt16(result.Content, 12) == 2);//鑷姩
+
+//
+// jarProtocol.setMode(2);//妯″紡
+// 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 //鍑烘枡闂�
+// jarProtocol.setRightDoorClose(0);//close the right door //鍑烘枡闂�
+
+
// 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
BasJarService service = SpringUtils.getBean(BasJarService.class);
if (null != service) {
@@ -194,7 +224,7 @@
String resultV2 = null;
short resultS2 = 0;
- switch (command.getTaskMode()){
+ switch (command.getTaskModeType().id){
case 1:
case 2:
case 3:
@@ -239,7 +269,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++;
@@ -251,14 +281,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++;
@@ -274,7 +304,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++;
@@ -286,14 +316,14 @@
if (transInt16 == resultS1 || 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