From 62af9acaccedaea4c4c7efd4e68c8b702cf5a27d Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期六, 22 六月 2024 13:35:02 +0800
Subject: [PATCH] # 捷众二期开发
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 373 +++++++++++++++++++++++++++++------------------------
1 files changed, 203 insertions(+), 170 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 5bfc407..a410ab6 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -11,10 +11,13 @@
import com.zy.asrs.entity.BasCrnp;
import com.zy.asrs.service.BasCrnOptService;
import com.zy.asrs.service.BasCrnpService;
+import com.zy.common.utils.News;
import com.zy.core.CrnThread;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
-import com.zy.core.enums.*;
+import com.zy.core.enums.CrnStatusType;
+import com.zy.core.enums.CrnTaskModeType;
+import com.zy.core.enums.SlaveType;
import com.zy.core.model.CrnSlave;
import com.zy.core.model.Task;
import com.zy.core.model.command.CrnCommand;
@@ -37,6 +40,20 @@
private CrnSlave slave;
private CrnProtocol crnProtocol;
private boolean resetFlag = false;
+
+ /**
+ * 20230711 Add锛屽垽鏂槸鍚﹀厑璁镐笅鍙戝爢鍨涙満浠诲姟鐨勫懡浠ゆ爣璁帮紝榛樿涓簍rue
+ * 涓轰簡闃叉鏃堕棿宸鑷寸殑WCS杩炵画涓嬪彂澶氱瑪浠诲姟锛學CS涓嬪彂浠诲姟鍚庯紝涓荤嚎绋嬭疆璇㈡椂杩樻湭璇诲埌鍫嗗灈鏈洪潪绌洪棽銆佹湁浠诲姟鐘舵�佹椂锛屽彲鑳戒細閲嶅涓嬪彂
+ * 涓荤嚎绋嬩笅鍙戝爢鍨涙満浠诲姟鐨勫悓鏃讹紝cmdFlag缃负false锛屽綋鍫嗗灈鏈哄浜庣瓑寰呯‘璁ょ姸鎬佸苟涓攔esetFlag涓簍rue鏃讹紝鎵嶅浣峜mdFlag涓簍rue
+ * 鎵�鏈夊爢鍨涙満浠诲姟涓嬪彂鍓嶏紝鍏堝垽鏂璫mdFlag涓簍rue鍚庢墠鑳戒笅鍙�
+ * 鏀瑰姩鍓嶏紝鏄�氳繃鍒ゆ柇宸ヤ綔妗ｆ槸鍚﹀瓨鍦ㄥ爢鍨涙満鎵ц涓伐浣滅姸鎬佸垽鏂殑锛屽鏋滀笉鐢熸垚宸ヤ綔妗ｏ紝鎴栬�呮槸鏈夊厖鐢点�佺Щ杞︾瓑浠诲姟婕忓垽鏂簡涔熶細瀛樺湪闂
+ */
+ private boolean cmdFlag = true;
+
+ /**
+ * 鍫嗗灈鏈烘槸鍚﹀湪鍥炲師鐐硅繍鍔ㄤ腑鏍囪
+ */
+ private boolean backHpFlag = false;
public SiemensCrnThread(CrnSlave slave) {
this.slave = slave;
@@ -91,6 +108,32 @@
}
}
+ /**
+ * 鍒濆鍖栧爢鍨涙満鐘舵��
+ */
+ private void initCrn() {
+ if (null == crnProtocol) {
+ crnProtocol = new CrnProtocol();
+ }
+ crnProtocol.setMode((short) -1);
+// crnProtocol.setTaskNo((short)0);
+ crnProtocol.setStatus((short)-1);
+ crnProtocol.setBay((short)0);
+ crnProtocol.setLevel((short)0);
+ crnProtocol.setForkPos((short) -1);
+ crnProtocol.setLiftPos((short) -1);
+ crnProtocol.setWalkPos((short)0);
+ crnProtocol.setLoaded((short)0);
+ crnProtocol.setAlarm((short)0);
+ crnProtocol.setxSpeed((short) 0);
+ crnProtocol.setySpeed((short) 0);
+ crnProtocol.setzSpeed((short) 0);
+ crnProtocol.setxDistance((short) 0);
+ crnProtocol.setyDistance((short) 0);
+ crnProtocol.setxDuration((short) 0);
+ crnProtocol.setyDuration((short) 0);
+ }
+
@Override
public boolean connect() {
boolean result = false;
@@ -101,12 +144,13 @@
if(connect.IsSuccess){
result = true;
OutputQueue.CRN.offer(MessageFormat.format( "銆恵0}銆戝爢鍨涙満plc杩炴帴鎴愬姛 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
- log.info("鍫嗗灈鏈簆lc杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
+ News.info("SiemensCrn"+" - 1"+" - 鍫嗗灈鏈簆lc杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
} else {
OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戝爢鍨涙満plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
- log.error("鍫嗗灈鏈簆lc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
+ News.error("SiemensCrn"+" - 2"+" - 鍫嗗灈鏈簆lc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
+ initCrn();
}
- siemensNet.ConnectClose();
+// siemensNet.ConnectClose();
return result;
}
@@ -114,195 +158,182 @@
* 璇诲彇鐘舵��
*/
private void readStatus(){
- OperateResultExOne<byte[]> result = siemensNet.Read("DB11.2", (short) 104);
- if (result.IsSuccess) {
- if (null == crnProtocol) {
- crnProtocol = new CrnProtocol();
- }
- crnProtocol.setMode(siemensNet.getByteTransform().TransInt16(result.Content, 0)); // 2
- crnProtocol.setStatus(siemensNet.getByteTransform().TransInt16(result.Content, 2)); // 4
- crnProtocol.setTaskNo(siemensNet.getByteTransform().TransInt16(result.Content, 4)); // 6
- crnProtocol.setTaskFinish(siemensNet.getByteTransform().TransInt16(result.Content, 6)); // 8
- crnProtocol.setValid(siemensNet.getByteTransform().TransInt16(result.Content, 8)); // 10
+ try {
+ OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) 54);
+ if (result.IsSuccess) {
+ if (null == crnProtocol) {
+ crnProtocol = new CrnProtocol();
+ crnProtocol.setCrnNo(slave.getId());
+ }
+ crnProtocol.setMode(siemensNet.getByteTransform().TransInt16(result.Content, 0));
+ crnProtocol.setTaskNo(siemensNet.getByteTransform().TransInt16(result.Content, 2));
+ crnProtocol.setStatus(siemensNet.getByteTransform().TransInt16(result.Content, 4));
+ crnProtocol.setBay(siemensNet.getByteTransform().TransInt16(result.Content, 6));
+ crnProtocol.setLevel(siemensNet.getByteTransform().TransInt16(result.Content, 8));
+ crnProtocol.setForkPos(siemensNet.getByteTransform().TransInt16(result.Content, 10));
+ crnProtocol.setLiftPos(siemensNet.getByteTransform().TransInt16(result.Content, 12));
+ crnProtocol.setWalkPos(siemensNet.getByteTransform().TransInt16(result.Content, 14));
+ crnProtocol.setLoaded(siemensNet.getByteTransform().TransInt16(result.Content, 16));
+ crnProtocol.setAlarm(siemensNet.getByteTransform().TransInt16(result.Content, 18));
- crnProtocol.setLevel(siemensNet.getByteTransform().TransInt16(result.Content, 14)); // 16
- crnProtocol.setBay(siemensNet.getByteTransform().TransInt16(result.Content, 16)); // 18
- crnProtocol.setRow(siemensNet.getByteTransform().TransInt16(result.Content, 18)); // 20
- crnProtocol.setLane(siemensNet.getByteTransform().TransInt16(result.Content, 20)); // 22
+ crnProtocol.setxSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 28));
+ crnProtocol.setySpeed(siemensNet.getByteTransform().TransInt16(result.Content, 32));
+ crnProtocol.setzSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 36));
+// crnProtocol.setxSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 34));
+// crnProtocol.setySpeed(siemensNet.getByteTransform().TransInt16(result.Content, 36));
+// crnProtocol.setzSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 38));
- crnProtocol.setAlarm1(siemensNet.getByteTransform().TransInt32(result.Content, 28)); // 30
- crnProtocol.setAlarm2(siemensNet.getByteTransform().TransInt32(result.Content, 32)); // 34
- crnProtocol.setAlarm3(siemensNet.getByteTransform().TransInt32(result.Content, 36)); // 38
- crnProtocol.setAlarm4(siemensNet.getByteTransform().TransInt32(result.Content, 40)); // 42
+ crnProtocol.setxDistance(siemensNet.getByteTransform().TransInt16(result.Content, 40));
+ crnProtocol.setyDistance(siemensNet.getByteTransform().TransInt16(result.Content, 44));
+ crnProtocol.setxDuration(siemensNet.getByteTransform().TransInt16(result.Content, 48));
+// crnProtocol.setxDistance(siemensNet.getByteTransform().TransInt16(result.Content, 40));
+// crnProtocol.setyDistance(siemensNet.getByteTransform().TransInt16(result.Content, 42));
+// crnProtocol.setxDuration(siemensNet.getByteTransform().TransInt16(result.Content, 44));
+ crnProtocol.setyDuration(siemensNet.getByteTransform().TransInt16(result.Content, 52));
- boolean[] bool1 = siemensNet.getByteTransform().TransBool(result.Content, 60, 1); // 62
- crnProtocol.setConnStatus(bool1[0]);
- crnProtocol.setCorrection(bool1[3]);
- crnProtocol.setTuError(bool1[4]);
- crnProtocol.setNoneError(bool1[5]);
- crnProtocol.setStockError(bool1[6]);
- crnProtocol.setJobInvalid(bool1[7]);
- boolean[] bool2 = siemensNet.getByteTransform().TransBool(result.Content, 61, 1); // 63
- crnProtocol.setIdle(bool2[0]);
- crnProtocol.setControl(bool2[1]);
- crnProtocol.setStopQuasi(bool2[2]);
- crnProtocol.setRunning(bool2[3]);
- crnProtocol.setFault(bool2[4]);
- crnProtocol.setForkHome(bool2[5]);
- crnProtocol.setForkSingleLeft(bool2[6]);
- crnProtocol.setForkSingleRight(bool2[7]);
- boolean[] bool3 = siemensNet.getByteTransform().TransBool(result.Content, 62, 1); // 64
- crnProtocol.setForkDoubleLeft(bool3[0]);
- crnProtocol.setForkDoubleRight(bool3[1]);
- crnProtocol.setSingleHigh(bool3[2]);
- crnProtocol.setSingleLow(bool3[3]);
- crnProtocol.setDoubleHigh(bool3[4]);
- crnProtocol.setDoubleLow(bool3[5]);
- crnProtocol.setPlatformHigh(bool3[6]);
- crnProtocol.setPlatformLow(bool3[7]);
- boolean[] bool4 = siemensNet.getByteTransform().TransBool(result.Content, 64, 1); // 66
- crnProtocol.setLoaded((short) (bool4[4]?1:0)); // 鏈夌墿
- // 閫熷害
- crnProtocol.setXSpeed((float) siemensNet.getByteTransform().TransInt16(result.Content, 22)); // 24
- crnProtocol.setYSpeed((float) siemensNet.getByteTransform().TransInt16(result.Content, 24)); // 26
- crnProtocol.setZSpeed((float) siemensNet.getByteTransform().TransInt16(result.Content, 26)); // 28
- // 绱閲岀▼銆佹椂闀�
- crnProtocol.setXDuration((float) siemensNet.getByteTransform().TransInt32(result.Content, 88)); // 90
- crnProtocol.setYDistance((float) siemensNet.getByteTransform().TransInt32(result.Content, 92)); // 94
- crnProtocol.setXDuration((float) siemensNet.getByteTransform().TransInt32(result.Content, 96)); // 98
- crnProtocol.setYDuration((float) siemensNet.getByteTransform().TransInt32(result.Content, 100)); // 102
+// crnProtocol.setTemp1(siemensNet.getByteTransform().TransInt16(result.Content, 20));
+// crnProtocol.setTemp2(siemensNet.getByteTransform().TransInt16(result.Content, 22));
+// crnProtocol.setTemp3(siemensNet.getByteTransform().TransInt16(result.Content, 24));
+// crnProtocol.setTemp4(siemensNet.getByteTransform().TransInt16(result.Content, 26));
- // 澧炲己
- if (crnProtocol.getForkHome()) {
- crnProtocol.setForkPos(CrnForkPosType.HOME);
- }
- if (crnProtocol.getForkSingleLeft()) {
- crnProtocol.setForkPos(CrnForkPosType.LEFT);
- }
- if (crnProtocol.getForkSingleRight()) {
- crnProtocol.setForkPos(CrnForkPosType.RIGHT);
- }
- if (crnProtocol.getForkDoubleLeft()) {
- crnProtocol.setForkPos(CrnForkPosType._LEFT);
- }
- if (crnProtocol.getForkDoubleRight()) {
- crnProtocol.setForkPos(CrnForkPosType._RIGHT);
- }
- if (crnProtocol.getSingleHigh()) {
- crnProtocol.setLiftPos(CrnLiftPosType.UP);
- }
- if (crnProtocol.getSingleLow()) {
- crnProtocol.setLiftPos(CrnLiftPosType.DOWN);
- }
- if (crnProtocol.getDoubleHigh()) {
- crnProtocol.setLiftPos(CrnLiftPosType._UP);
- }
- if (crnProtocol.getDoubleLow()) {
- crnProtocol.setLiftPos(CrnLiftPosType._DOWN);
- }
- if (crnProtocol.getIdle()) {
- crnProtocol.setStatus(CrnStatusType.IDLE);
- }
- OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
- // 澶嶄綅淇″彿
- if (crnProtocol.getTaskFinish() == 1) {
- if (resetFlag) {
- CrnCommand crnCommand = new CrnCommand();
- crnCommand.setAckFinish((short)1);
- if (write(crnCommand)) {
- resetFlag = false;
+ OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
+
+ // 澶嶄綅淇″彿
+// if (!Cools.isEmpty(crnProtocol.getStatusType()) && crnProtocol.getStatusType().equals(CrnStatusType.WAITING)) {
+// if (resetFlag) {
+// if(crnProtocol.getTaskNo()==9999){
+// backHpFlag = false;
+// }
+// CrnCommand crnCommand = new CrnCommand();
+// crnCommand.setAckFinish((short)1);
+// if (write(crnCommand)) {
+// resetFlag = false;
+// }
+// }
+// }
+
+ if (crnProtocol.getStatusType().equals(CrnStatusType.WAITING)) {
+// News.error("-------------------------------------------绗竴姝ャ�乕鍫嗗灈鏈哄彿锛歿}, 宸ヤ綔鍙凤細{}, 杞借揣鍙颁俊鍙�:{}]==>> 鐘舵�佷负10锛岀瓑寰呯‘璁わ紒锛�",
+// slave.getId(),crnProtocol.getTaskNo(), crnProtocol.getLoaded()==1 ? "鏈夌墿" : "鏃犵墿");
+ if (resetFlag) {
+ CrnCommand crnCommand = new CrnCommand();
+ crnCommand.setAckFinish((short)1);
+ if (write(crnCommand)) {
+ resetFlag = false;
+// cmdFlag = true;
+ }
}
-
}
+
+ try {
+ // 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
+ BasCrnpService basCrnpService = SpringUtils.getBean(BasCrnpService.class);
+ BasCrnp basCrnp = new BasCrnp();
+ basCrnp.setCrnNo(slave.getId());
+ basCrnp.setCrnSts((int)crnProtocol.getMode());
+ if (!basCrnpService.updateById(crnProtocol.toSqlModel(basCrnp))){
+ News.error("SiemensCrn"+" - 3"+" - 鍫嗗灈鏈簆lc鏁版嵁搴撴洿鏂板け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
+ }
+ } catch (Exception ignore){}
+
+ } else {
+ initCrn();
+ OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戣鍙栧爢鍨涙満plc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
+ News.error("SiemensCrn"+" - 4"+" - 璇诲彇鍫嗗灈鏈簆lc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
}
+ } catch (Exception e) {
+ e.printStackTrace();
+ OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戣鍙栧爢鍨涙満plc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
+ News.error("SiemensCrn"+" - 5"+" - 璇诲彇鍫嗗灈鏈簆lc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+ initCrn();
+ }
+ }
- try {
- // 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
- BasCrnpService basCrnpService = SpringUtils.getBean(BasCrnpService.class);
- BasCrnp basCrnp = new BasCrnp();
- basCrnp.setCrnNo(slave.getId());
- if (!basCrnpService.updateById(crnProtocol.toSqlModel(basCrnp))){
- log.error("鍫嗗灈鏈簆lc鏁版嵁搴撴洿鏂板け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
- }
- } catch (Exception ignore){}
-
- } else {
- OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戣鍙栧爢鍨涙満plc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
- log.error("璇诲彇鍫嗗灈鏈簆lc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
+ private void convertRow(CrnCommand crnCommand) {
+ if (crnCommand.getSourcePosX() != null && crnCommand.getSourcePosX() != 0) {
+ crnCommand.setSourcePosX((short) (crnCommand.getSourcePosX() - ((slave.getId() - 1) * 4)));
+ }
+ if (crnCommand.getDestinationPosX() != null && crnCommand.getDestinationPosX() != 0) {
+ crnCommand.setDestinationPosX((short) (crnCommand.getDestinationPosX() - ((slave.getId() - 1) * 4)));
}
}
/**
* 鍐欏叆鏁版嵁
*/
- private boolean write(CrnCommand command){
+ private boolean write(CrnCommand command) throws InterruptedException {
if (null == command) {
- log.error("鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�");
+ News.error("SiemensCrn"+" - 6"+" - 鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�");
return false;
}
- if (command.getTaskNo() == 0) {
- command.setTaskNo((short) 9999);
- }
- command.setCrnNo(slave.getId());
- short[] array = new short[9];
- if (!command.getTaskModeType().equals(CrnTaskModeType.CLEAR)) {
- array[0] = 5;
+ OperateResult result;
+// convertRow(command);
+ if (command.getAckFinish() == 1) {
+ result = siemensNet.Write("DB100.0", (short) 1);
+// result = siemensNet.Write("DB100.18", 0);
} else {
- array[0] = 7;
+ command.setCrnNo(slave.getId());
+ short[] array = new short[10];
+ array[0] = command.getAckFinish();
+ array[1] = command.getTaskNo();
+ array[2] = command.getTaskMode();
+ array[3] = command.getSourcePosX();
+ array[4] = command.getSourcePosY();
+ array[5] = command.getSourcePosZ();
+ array[6] = command.getDestinationPosX();
+ array[7] = command.getDestinationPosY();
+ array[8] = command.getDestinationPosZ();
+// array[9] = command.getSourceStaNo();
+// array[10] = command.getDestinationStaNo();
+ array[9] = command.getCommand();
+ result = siemensNet.Write("DB100.0", array);
+
+// if (command.getAckFinish() == 0) {
+// short commandFinish = 1;
+// Thread.sleep(100L);
+// result = siemensNet.Write("DB100.18", commandFinish);
+// }
}
- array[1] = command.getSourcePosZ();
- array[2] = command.getSourcePosY();
- array[3] = command.getSourcePosX();
- array[4] = command.getDestinationPosZ();
- array[5] = command.getDestinationPosY();
- array[6] = command.getDestinationPosX();
- array[7] = command.getSourceStaNo();
- array[8] = command.getDestinationStaNo();
- // 浣滀笟淇℃伅
- OperateResult result = siemensNet.Write("DB1000.0", array);
- // 浠诲姟鍙�
- OperateResult result1 = siemensNet.Write("DB1000.24", command.getTaskNo());
- // 缁撴潫浣�
- OperateResult result2 = siemensNet.Write("DB1000.28.1", true);
- // 鏃ュ織璁板綍
+
try {
- if (command.getAckFinish() != 1) {
- BasCrnOptService bean = SpringUtils.getBean(BasCrnOptService.class);
- BasCrnOpt basCrnOpt = new BasCrnOpt(
- command.getTaskNo().intValue(), // 浠诲姟鍙�
- command.getCrnNo(), // 鍫嗗灈鏈篬闈炵┖]
- new Date(), // 涓嬪彂鏃堕棿
- command.getTaskModeType().toString(), // 妯″紡
- command.getSourcePosX().intValue(), // 婧愭帓
- command.getSourcePosY().intValue(), // 婧愬垪
- command.getSourcePosZ().intValue(), // 婧愬眰
- null, // 婧愮珯
- command.getDestinationPosX().intValue(), // 鐩爣鎺�
- command.getDestinationPosY().intValue(), // 鐩爣鍒�
- command.getDestinationPosZ().intValue(), // 鐩爣灞�
- null, // 鐩爣绔�
- null, // 鍝嶅簲缁撴灉
- null, // 淇敼鏃堕棿
- null // 淇敼浜哄憳
- );
- bean.insert(basCrnOpt);
- }
+ // 鏃ュ織璁板綍
+ BasCrnOptService bean = SpringUtils.getBean(BasCrnOptService.class);
+ BasCrnOpt basCrnOpt = new BasCrnOpt(
+ command.getTaskNo().intValue(), // 浠诲姟鍙�
+ command.getCrnNo(), // 鍫嗗灈鏈篬闈炵┖]
+ new Date(), // 涓嬪彂鏃堕棿
+ command.getTaskModeType().toString(), // 妯″紡
+ command.getSourcePosX().intValue(), // 婧愭帓
+ command.getSourcePosY().intValue(), // 婧愬垪
+ command.getSourcePosZ().intValue(), // 婧愬眰
+ null, // 婧愮珯
+ command.getDestinationPosX().intValue(), // 鐩爣鎺�
+ command.getDestinationPosY().intValue(), // 鐩爣鍒�
+ command.getDestinationPosZ().intValue(), // 鐩爣灞�
+ null, // 鐩爣绔�
+ null, // 鍝嶅簲缁撴灉
+ null, // 淇敼鏃堕棿
+ null // 淇敼浜哄憳
+ );
+ bean.insert(basCrnOpt);
} catch (Exception ignore) {}
- if (result.IsSuccess && result1.IsSuccess && result2.IsSuccess) {
-
- log.info("鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), JSON.toJSON(command));
+ if (result != null && result.IsSuccess) {
+ Thread.sleep(200);
+ this.readStatus();
+ News.info("SiemensCrn"+" - 7"+" - 鍫嗗灈鏈哄懡浠や笅鍙慬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}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
- log.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
+ OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戝啓鍏ュ爢鍨涙満plc鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
+ News.error("SiemensCrn"+" - 8"+" - 鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
return false;
}
}
+
@Override
public void close() {
@@ -315,7 +346,8 @@
public static void main(String[] args) throws InterruptedException {
CrnSlave slave = new CrnSlave();
slave.setId(1);
- slave.setIp("192.168.6.9");
+ slave.setIp("10.10.10.10");
+ slave.setPort(0);
slave.setRack(0);
slave.setSlot(0);
SiemensCrnThread crnThread = new SiemensCrnThread(slave);
@@ -326,16 +358,17 @@
// 1.鍏ュ簱 婧愬拰鐩爣閮藉彂
// CrnCommand command = new CrnCommand();
-// command.setCrnNo(1); // 鍫嗗灈鏈虹紪鍙�
-// command.setTaskNo((short) 0); // 宸ヤ綔鍙�
+//// command.setCrnNo(3); // 鍫嗗灈鏈虹紪鍙�
+// command.setTaskNo((short) 2); // 宸ヤ綔鍙�
// command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
// command.setTaskMode(CrnTaskModeType.PAKIN); // 浠诲姟妯″紡
-// command.setSourcePosX((short) 1); // 婧愬簱浣嶆帓
-// command.setSourcePosY((short) 0); // 婧愬簱浣嶅垪
-// command.setSourcePosZ((short) 1); // 婧愬簱浣嶅眰
-// command.setDestinationPosX((short) 2); // 鐩爣搴撲綅鎺�
-// command.setDestinationPosY((short) 3); // 鐩爣搴撲綅鍒�
+// command.setSourcePosX((short) 6); // 婧愬簱浣嶆帓
+// command.setSourcePosY((short) 2); // 婧愬簱浣嶅垪
+// command.setSourcePosZ((short) 2); // 婧愬簱浣嶅眰
+// command.setDestinationPosX((short) 6); // 鐩爣搴撲綅鎺�
+// command.setDestinationPosY((short) 0); // 鐩爣搴撲綅鍒�
// command.setDestinationPosZ((short) 1); // 鐩爣搴撲綅灞�
+// command.setCommand((short)1);
// crnThread.write(command);
// 2.鍑哄簱 婧愬拰鐩爣閮藉彂
--
Gitblit v1.9.1