From f30a3efc28ee4d3f67ddf76bc360b676595e4b80 Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期三, 01 三月 2023 12:38:30 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SteThread.java | 70 +++++++++++++++++++++++++++--------
1 files changed, 54 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SteThread.java b/src/main/java/com/zy/core/thread/SteThread.java
index d02a3f3..fbd0360 100644
--- a/src/main/java/com/zy/core/thread/SteThread.java
+++ b/src/main/java/com/zy/core/thread/SteThread.java
@@ -5,6 +5,7 @@
import HslCommunication.Profinet.Siemens.SiemensPLCS;
import HslCommunication.Profinet.Siemens.SiemensS7Net;
import com.alibaba.fastjson.JSON;
+import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
import com.core.exception.CoolException;
@@ -12,6 +13,7 @@
import com.zy.asrs.entity.BasSteOpt;
import com.zy.asrs.service.BasSteOptService;
import com.zy.asrs.service.BasSteService;
+import com.zy.common.utils.News;
import com.zy.core.ThreadHandler;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
@@ -105,10 +107,10 @@
if(connect.IsSuccess){
result = true;
OutputQueue.STE.offer(MessageFormat.format( "銆恵0}銆戠┛姊溅plc杩炴帴鎴愬姛 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
- log.info("绌挎杞lc杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+ News.info("绌挎杞lc杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
} else {
OutputQueue.STE.offer(MessageFormat.format("銆恵0}銆戠┛姊溅plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{1}] [ip:{2}] [port:{3}] ", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
- log.error("绌挎杞lc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+ News.error("绌挎杞lc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
initSte();
}
// melsecMcNet.ConnectClose();
@@ -124,8 +126,9 @@
if (result.IsSuccess) {
if (null == steProtocol) {
steProtocol = new SteProtocol();
+ steProtocol.setSteNo(slave.getId().shortValue());
}
- steProtocol.setSteNo(siemensS7Net.getByteTransform().TransInt16(result.Content, 0));
+// steProtocol.setSteNo(siemensS7Net.getByteTransform().TransInt16(result.Content, 0));
steProtocol.setMode(siemensS7Net.getByteTransform().TransInt16(result.Content, 2));
steProtocol.setStatus(siemensS7Net.getByteTransform().TransInt16(result.Content, 4));
OperateResultExOne<Boolean> executeRes = siemensS7Net.ReadBool("V2001.0");
@@ -135,6 +138,14 @@
OperateResultExOne<Boolean> waitingRes = siemensS7Net.ReadBool("V2001.1");
if (waitingRes.IsSuccess) {
steProtocol.setWaiting(waitingRes.Content);
+ }
+ OperateResultExOne<Boolean> inEmptyRes = siemensS7Net.ReadBool("V2001.2");
+ if (inEmptyRes.IsSuccess) {
+ steProtocol.setInEmpty(inEmptyRes.Content);
+ }
+ OperateResultExOne<Boolean> outEmptyRes = siemensS7Net.ReadBool("V2001.3");
+ if (outEmptyRes.IsSuccess) {
+ steProtocol.setOutEmpty(outEmptyRes.Content);
}
steProtocol.setAlarm(siemensS7Net.getByteTransform().TransInt16(result.Content, 6));
steProtocol.setAlarm0(siemensS7Net.getByteTransform().TransInt16(result.Content, 8));
@@ -164,11 +175,14 @@
steProtocol.setCrnStopRun(siemensS7Net.getByteTransform().TransInt16(result.Content, 38));
steProtocol.setCrnStopFork(siemensS7Net.getByteTransform().TransInt16(result.Content, 40));
steProtocol.setCrnAllowRun(siemensS7Net.getByteTransform().TransInt16(result.Content, 42));
+ steProtocol.setChargeStatus(siemensS7Net.getByteTransform().TransInt16(result.Content, 44));
OutputQueue.STE.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
// 澶嶄綅淇″彿
if (steProtocol.getWaiting()) {
+ News.error("-------------------------------------------绗竴姝ャ�乕绌挎杞﹀彿锛歿}, 宸ヤ綔鍙凤細{}]==>> 鐘舵�佷负3锛岀瓑寰匴CS纭锛侊紒",
+ slave.getId(),steProtocol.getTaskNo());
if (resetFlag) {
SteCommand steCommand = new SteCommand();
steCommand.setComplete(true);
@@ -191,7 +205,7 @@
BasSte basSte = new BasSte();
basSte.setSteNo(slave.getId());
if (!service.updateById(steProtocol.toSqlModel(basSte))){
- log.error("绌挎杞lc鏁版嵁搴撴洿鏂板け璐� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+ News.error("绌挎杞lc鏁版嵁搴撴洿鏂板け璐� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
}
}
@@ -200,9 +214,9 @@
throw new CoolException(MessageFormat.format( "绌挎杞lc鐘舵�佷俊鎭け璐� ===>> [id:{0}] [ip:{1}] [port:{2}]", slave.getId(), slave.getIp(), slave.getPort()));
}
} catch (Exception e) {
- e.printStackTrace();
+// e.printStackTrace();
OutputQueue.STE.offer(MessageFormat.format("銆恵0}銆戣鍙栫┛姊溅plc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
- log.error("璇诲彇绌挎杞lc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+// News.error("璇诲彇绌挎杞lc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
initSte();
}
@@ -213,13 +227,16 @@
*/
private boolean write(SteCommand command){
if (null == command) {
- log.error("绌挎杞﹀啓鍏ュ懡浠や负绌�");
+ News.error("绌挎杞﹀啓鍏ュ懡浠や负绌�");
return false;
}
command.setSteNo(slave.getId());
OperateResult result = null;
// 寮�濮嬩换鍔�
if (!command.getComplete()) {
+ //缁勭粐浠诲姟鍓嶏紝鍏堟竻绌哄啓浠诲姟纭浣嶏紝浠ュ強浠诲姟瀹屾垚纭浣�
+ siemensS7Net.Write("V2000.0", false);
+ siemensS7Net.Write("V2000.1", false);
// 1.浠诲姟鍙�
OperateResult result0 = siemensS7Net.Write("V998", command.getTaskNo().shortValue());
try {
@@ -258,7 +275,10 @@
// 浠诲姟瀹屾垚
} else {
- siemensS7Net.Write("V1000",(short) 0);
+ News.info("鏀跺埌绌挎鏉跨‘璁や俊鍙峰悗鍑嗗缁欏浣嶆爣璁帮紝绌挎鏉縄D={}, 浠诲姟鍙�={}, 绌挎鏉跨姸鎬�={}",slave.getId(), steProtocol.getTaskNo(),steProtocol.getStatus());
+ siemensS7Net.Write("V998", (short) 0);
+ siemensS7Net.Write("V1000", (short) 0);
+ siemensS7Net.Write("V2000.0", false);
result = siemensS7Net.Write("V2000.1", true);
}
@@ -294,15 +314,32 @@
if (result != null && result.IsSuccess) {
// 缁存姢鏁版嵁搴撴帓鍒楀眰
if (!steProtocol.getWaiting()) {
- this.modifyPos(command.getRow().intValue(), command.getBay().intValue(), command.getLev().intValue());
+ if (!Cools.isEmpty(command.getRow(), command.getBay(), command.getLev())) {
+ this.modifyPos(command.getRow().intValue(), command.getBay().intValue(), command.getLev().intValue());
+ }
}
- log.info("绌挎杞﹀懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), JSON.toJSON(command));
+ News.info("绌挎杞﹀懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), JSON.toJSON(command));
OutputQueue.STE.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
+
+ try {
+ Thread.sleep(500);
+ } catch (Exception e){
+
+ }
+ OperateResultExOne<byte[]> result1 = siemensS7Net.Read("V998", (short) 4);
+ if (result1.IsSuccess) {
+ short taskNo = siemensS7Net.getByteTransform().TransInt16(result1.Content, 0);
+ short taskType = siemensS7Net.getByteTransform().TransInt16(result1.Content, 2);
+ readStatus();
+ News.info("绌挎鏉夸换鍔′笅鍙戞垚鍔熷悗浼戠湢200ms绔嬪嵆鍥炶鍐欏叆鏁版嵁锛岀┛姊澘ID={}, 浠诲姟鍙�={}, 浣滀笟绫诲瀷={}",slave.getId(), taskNo, taskType);
+ News.info("绌挎鏉夸换鍔′笅鍙戞垚鍔熷悗浼戠湢200ms绔嬪嵆鍥炶绌挎鏉跨姸鎬侊紝绌挎鏉縄D={}, 浠诲姟鍙�={}, 绌挎鏉跨姸鎬�={}",slave.getId(), steProtocol.getTaskNo(),steProtocol.getStatus());
+ }
+
return true;
} else {
OutputQueue.STE.offer(MessageFormat.format("銆恵0}銆戝啓鍏ョ┛姊溅plc鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
- log.error("鍐欏叆绌挎杞lc鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+ News.error("鍐欏叆绌挎杞lc鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
return false;
}
}
@@ -310,7 +347,7 @@
public void modifyPos(Integer row, Integer bay, Integer lev) {
BasSteService service = SpringUtils.getBean(BasSteService.class);
if (!service.updatePos(this.slave.getId(), row, bay, lev)) {
- log.error("鏇存柊{}鍙风┛姊溅瀹氫綅澶辫触 ===>> 鎺掞細銆恵}銆�, 鍒楋細銆恵}銆戯紝灞傦細銆恵}銆�", this.slave.getId(), row, bay, lev);
+ News.error("鏇存柊{}鍙风┛姊溅瀹氫綅澶辫触 ===>> 鎺掞細銆恵}銆�, 鍒楋細銆恵}銆戯紝灞傦細銆恵}銆�", this.slave.getId(), row, bay, lev);
}
}
@@ -326,7 +363,7 @@
if (service.updatePakMk(this.slave.getId(), "N")) {
return true;
} else {
- log.error("{}鍙风┛姊溅淇敼鏁版嵁搴撳畾浣嶅け璐ワ紒锛侊紒", slave.getId());
+ News.error("{}鍙风┛姊溅淇敼鏁版嵁搴撳畾浣嶅け璐ワ紒锛侊紒", slave.getId());
}
}
}
@@ -337,11 +374,12 @@
short[] arr = new short[] {row.shortValue(), bay.shortValue(), lev.shortValue()};
OperateResult result = siemensS7Net.Write("V1002", arr);
if (!result.IsSuccess) {
+ News.error("鏇存柊{}鍙风┛姊溅瀹氫綅澶辫触 ===>> 鎺掞細銆恵}銆�, 鍒楋細銆恵}銆戯紝灞傦細銆恵}銆�", this.slave.getId(), row, bay, lev);
return false;
}
BasSteService service = SpringUtils.getBean(BasSteService.class);
if (!service.updatePos(this.slave.getId(), row, bay, lev)) {
- log.error("鏇存柊{}鍙风┛姊溅瀹氫綅澶辫触 ===>> 鎺掞細銆恵}銆�, 鍒楋細銆恵}銆戯紝灞傦細銆恵}銆�", this.slave.getId(), row, bay, lev);
+ News.error("鏇存柊{}鍙风┛姊溅瀹氫綅澶辫触 ===>> 鎺掞細銆恵}銆�, 鍒楋細銆恵}銆戯紝灞傦細銆恵}銆�", this.slave.getId(), row, bay, lev);
return false;
}
return true;
@@ -363,14 +401,14 @@
}
OperateResult write = siemensS7Net.Write("D10", heartBeatVal);
if (!write.IsSuccess) {
- log.error("杈撻�佺嚎plc缂栧彿={} 蹇冭烦澶辫触", slave.getId());
+ News.error("杈撻�佺嚎plc缂栧彿={} 蹇冭烦澶辫触", slave.getId());
}
}
// public void modifyPos(int wrkNo, int row, int bay, int lev) {
// BasSteService service = SpringUtils.getBean(BasSteService.class);
// if (!service.updatePos(wrkNo,this.slave.getId(), row, bay, lev)) {
-// log.error("鏇存柊{}鍙风┛姊溅瀹氫綅澶辫触 ===>> 鎺掞細銆恵}銆�, 鍒楋細銆恵}銆戯紝灞傦細銆恵}銆�", this.slave.getId(), row, bay, lev);
+// News.error("鏇存柊{}鍙风┛姊溅瀹氫綅澶辫触 ===>> 鎺掞細銆恵}銆�, 鍒楋細銆恵}銆戯紝灞傦細銆恵}銆�", this.slave.getId(), row, bay, lev);
// }
// }
--
Gitblit v1.9.1