From ec1398e9d8e6bb161e9d21eae5b1f43ba9601cbc Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 14 三月 2022 13:23:12 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SteThread.java | 170 ++++++++++++++++++++++++++++++++++----------------------
1 files changed, 102 insertions(+), 68 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SteThread.java b/src/main/java/com/zy/core/thread/SteThread.java
index 169d8aa..e74e48e 100644
--- a/src/main/java/com/zy/core/thread/SteThread.java
+++ b/src/main/java/com/zy/core/thread/SteThread.java
@@ -4,11 +4,12 @@
import HslCommunication.Core.Types.OperateResultExOne;
import HslCommunication.Profinet.Siemens.SiemensPLCS;
import HslCommunication.Profinet.Siemens.SiemensS7Net;
+import com.alibaba.fastjson.JSON;
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.BasCrnp;
-import com.zy.asrs.service.BasCrnpService;
+import com.zy.asrs.entity.BasSte;
+import com.zy.asrs.service.BasSteService;
import com.zy.core.ThreadHandler;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
@@ -27,6 +28,7 @@
/**
* shuttle 绌挎杞︾嚎绋�
* Created by vincent on 2020/8/4
+ * 涓嶈兘鏈� 妲藉彿 鍜� 鏈烘灦鍙�
*/
@Data
@Slf4j
@@ -37,6 +39,10 @@
private SteProtocol steProtocol;
private short heartBeatVal = 1;
private boolean resetFlag = false;
+
+ private Integer lastRow;
+ private Integer lastBay;
+ private Integer lastLev;
public SteThread(SteSlave slave) {
this.slave = slave;
@@ -61,24 +67,6 @@
// 鍐欏叆鏁版嵁
case 2:
write((SteCommand) task.getData());
- break;
- // 澶嶄綅
- case 3:
- SteCommand command = (SteCommand) task.getData();
- if (null == command) {
- command = new SteCommand();
- }
-// command.setSteNo(slave.getId()); // 绌挎杞︾紪鍙�
-// command.setTaskNo((short) 0); // 宸ヤ綔鍙�
-// command.setAckFinish((short) 1); // 浠诲姟瀹屾垚纭浣�
-// command.setTaskMode(CrnTaskModeType.NONE); // 浠诲姟妯″紡
-// command.setSourcePosX((short)0); // 婧愬簱浣嶆帓
-// command.setSourcePosY((short)0); // 婧愬簱浣嶅垪
-// command.setSourcePosZ((short)0); // 婧愬簱浣嶅眰
-// command.setDestinationPosX((short)0); // 鐩爣搴撲綅鎺�
-// command.setDestinationPosY((short)0); // 鐩爣搴撲綅鍒�
-// command.setDestinationPosZ((short)0); // 鐩爣搴撲綅灞�
- write(command);
break;
default:
break;
@@ -122,9 +110,10 @@
@Override
public boolean connect() {
boolean result = false;
- siemensS7Net = new SiemensS7Net(SiemensPLCS.S1200, slave.getIp());
- siemensS7Net.setRack(slave.getRack().byteValue());
- siemensS7Net.setSlot(slave.getSlot().byteValue());
+ // 涓嶈兘鏈� 妲藉彿 鍜� 鏈烘灦鍙�
+ siemensS7Net = new SiemensS7Net(SiemensPLCS.S200Smart, slave.getIp());
+// siemensS7Net.setRack(slave.getRack().byteValue());
+// siemensS7Net.setSlot(slave.getSlot().byteValue());
OperateResult connect = siemensS7Net.ConnectServer();
if(connect.IsSuccess){
result = true;
@@ -144,26 +133,44 @@
*/
private void readStatus(){
try {
-// if (this.slave.getId() == 1 && flag1.equals(0)) {
-// Thread.sleep(3000);
-// flag1=1;
-// System.out.println("===");
-// }
- OperateResultExOne<byte[]> result = siemensS7Net.Read("D20", (short) 70);
+ OperateResultExOne<byte[]> result = siemensS7Net.Read("V20", (short) 70);
if (result.IsSuccess) {
if (null == steProtocol) {
steProtocol = new SteProtocol();
}
-// steProtocol.setMode(siemensS7Net.getByteTransform().TransInt16(result.Content, 0));
-// steProtocol.setTaskNo(siemensS7Net.getByteTransform().TransInt16(result.Content, 2));
-// steProtocol.setStatus(siemensS7Net.getByteTransform().TransInt16(result.Content, 4));
-// steProtocol.setBay(siemensS7Net.getByteTransform().TransInt16(result.Content, 6));
-// steProtocol.setLevel(siemensS7Net.getByteTransform().TransInt16(result.Content, 8));
-// steProtocol.setForkPos(siemensS7Net.getByteTransform().TransInt16(result.Content, 10));
-// steProtocol.setLiftPos(siemensS7Net.getByteTransform().TransInt16(result.Content, 12));
-// steProtocol.setWalkPos(siemensS7Net.getByteTransform().TransInt16(result.Content, 14));
-// steProtocol.setLoaded(siemensS7Net.getByteTransform().TransInt16(result.Content, 16));
-// steProtocol.setAlarm(siemensS7Net.getByteTransform().TransInt16(result.Content, 18));
+// steProtocol.setSteNo();
+// steProtocol.setMode();
+// steProtocol.setStatus();
+// steProtocol.setExecute();
+// steProtocol.setWaiting();
+// steProtocol.setAlarm();
+// steProtocol.setAlarm0();
+// steProtocol.setCharge();
+// steProtocol.setFullCharge();
+// steProtocol.setLowCharge();
+// steProtocol.setFeed();
+// steProtocol.setLoca();
+// steProtocol.setCloser();
+// steProtocol.setSpeed();
+// steProtocol.setPos();
+// steProtocol.setLoad();
+// steProtocol.setTrack();
+// steProtocol.setTaskNo();
+// steProtocol.setTaskType();
+// steProtocol.setRow();
+// steProtocol.setBay();
+// steProtocol.setLev();
+//
+// steProtocol.setHisTaskNo();
+// steProtocol.setHisTaskStatus();
+// steProtocol.setCheckQty();
+// steProtocol.setReady();
+// steProtocol.setChargeNo();
+//
+// steProtocol.setHeart();
+// steProtocol.setCrnStopRun();
+// steProtocol.setCrnStopFork();
+// steProtocol.setCrnAllowRun();
OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
@@ -172,7 +179,7 @@
if (resetFlag) {
SteCommand steCommand = new SteCommand();
// steCommand.setAckFinish((short)1);
- if (write(steCommand)) {
+ if (write(steCommand) && confirmPos()) {
resetFlag = false;
}
}
@@ -180,11 +187,10 @@
// 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
- BasCrnpService basCrnpService = SpringUtils.getBean(BasCrnpService.class);
- BasCrnp basCrnp = new BasCrnp();
- basCrnp.setCrnErr(steProtocol.getAlarm()==null?0:steProtocol.getAlarm().longValue());
- basCrnp.setCrnNo(slave.getId());
- if (!basCrnpService.updateById(steProtocol.toSqlModel(basCrnp))){
+ BasSteService service = SpringUtils.getBean(BasSteService.class);
+ 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());
}
@@ -205,13 +211,12 @@
* 鍐欏叆鏁版嵁
*/
private boolean write(SteCommand command){
- return true;
-// if (null == command) {
-// log.error("绌挎杞﹀啓鍏ュ懡浠や负绌�");
-// return false;
-// }
-// command.setCrnNo(slave.getId());
-// short[] array = new short[10];
+ if (null == command) {
+ log.error("绌挎杞﹀啓鍏ュ懡浠や负绌�");
+ return false;
+ }
+ command.setSteNo(slave.getId());
+ short[] array = new short[10];
// array[0] = command.getAckFinish();
// array[1] = command.getTaskNo();
// array[2] = command.getTaskMode();
@@ -222,15 +227,15 @@
// array[7] = command.getDestinationPosY();
// array[8] = command.getDestinationPosZ();
// array[9] = command.getCommand();
-// OperateResult result = siemensS7Net.Write("D0", array);
-//
+ OperateResult result = siemensS7Net.Write("D0", array);
+
// if (command.getAckFinish() == 0) {
// short commandFinish = 1;
// result = siemensS7Net.Write("D9", commandFinish);
// }
-//
-// try {
-// // 鏃ュ織璁板綍
+
+ try {
+ // 鏃ュ織璁板綍
// BasCrnOptService bean = SpringUtils.getBean(BasCrnOptService.class);
// BasCrnOpt basCrnOpt = new BasCrnOpt(
// command.getTaskNo().intValue(), // 浠诲姟鍙�
@@ -250,17 +255,46 @@
// null // 淇敼浜哄憳
// );
// bean.insert(basCrnOpt);
-// } catch (Exception ignore) {}
-//
-// if (result.IsSuccess) {
-// log.info("绌挎杞﹀懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), JSON.toJSON(command));
-// OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
-// return true;
-// } else {
-// OutputQueue.CRN.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());
-// return false;
-// }
+ } catch (Exception ignore) {}
+
+ if (result.IsSuccess) {
+ // 缁存姢鏁版嵁搴撴帓鍒楀眰
+// this.modifyPos();
+
+ log.info("绌挎杞﹀懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), JSON.toJSON(command));
+ OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
+ return true;
+ } else {
+ OutputQueue.CRN.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());
+ return false;
+ }
+ }
+
+ public void modifyPos(Integer row, Integer bay, Integer lev) {
+ this.lastRow = row;
+ this.lastBay = bay;
+ this.lastLev = lev;
+ }
+
+ public boolean confirmPos() {
+ if (this.lastRow != null && this.lastRow != 0) {
+ if (this.lastBay != null && this.lastBay != 0) {
+ if (this.lastLev != null && this.lastLev != 0) {
+ BasSteService service = SpringUtils.getBean(BasSteService.class);
+ BasSte basSte = service.selectById(slave.getId());
+ if (basSte != null) {
+ if (service.updatePos(this.lastRow, this.lastBay, this.lastLev) > 0) {
+ return true;
+ } else {
+ log.error("{}鍙风┛姊溅淇敼鏁版嵁搴撳畾浣嶅け璐ワ紒锛侊紒", slave.getId());
+ }
+ }
+
+ }
+ }
+ }
+ return false;
}
@Override
--
Gitblit v1.9.1