From 9338cdee4bae84f74825fbd86786e35ddfbd2d64 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 05 一月 2022 16:10:01 +0800
Subject: [PATCH] #
---
/dev/null | 522 -----------------------------------------------
src/main/java/com/zy/asrs/controller/ConsoleController.java | 6
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 25 +-
src/main/java/com/zy/core/thread/MelsecCrnThread.java | 49 +--
src/main/java/com/zy/asrs/controller/CrnController.java | 29 --
src/main/java/com/zy/core/model/protocol/CrnProtocol.java | 10
src/main/java/com/zy/core/ServerBootstrap.java | 2
7 files changed, 40 insertions(+), 603 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index b5792d8..43336a3 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -27,7 +27,7 @@
import com.zy.core.properties.SystemProperties;
import com.zy.core.thread.BarcodeThread;
import com.zy.core.thread.ScaleThread;
-import com.zy.core.thread.SiemensCrnThread;
+import com.zy.core.thread.MelsecCrnThread;
import com.zy.core.DevpThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -131,7 +131,7 @@
/**
* 鍫嗗灈鏈虹姸鎬佸垽鏂�
*/
- if (crn.getId() == 1 && crnProtocol.getAlarm1() > 0) {
+ if (crn.getId() == 1 && crnProtocol.getAlarm() > 0) {
vo.setCrnStatus(CrnStatusType.MACHINE_ERROR);
} else {
if (crnProtocol.getTaskNo()>0) {
@@ -243,7 +243,7 @@
CrnDetailVo vo = new CrnDetailVo();
for (CrnSlave crnSlave : slaveProperties.getCrn()) {
if (crnSlave.getId().equals(crnNo)) {
- SiemensCrnThread crnThread = (SiemensCrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId());
+ MelsecCrnThread crnThread = (MelsecCrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId());
CrnProtocol crnProtocol = crnThread.getCrnProtocol();
vo.setCrnNo(crnNo);
vo.setWorkNo(crnProtocol.getTaskNo());
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index 1911e3e..ad76d25 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -127,42 +127,21 @@
//
// }
vo.setStatusType(crnProtocol.modeType.desc); // 妯″紡鐘舵��
- if (crnProtocol.getTaskFinish() == 1) {
+ if (crnProtocol.statusType == com.zy.core.enums.CrnStatusType.WAITING) {
vo.setStatus("绛夊緟纭");
} else {
vo.setStatus(crnProtocol.getStatusType().desc); // 鐘舵��
- if (crnProtocol.getStatusType().equals(com.zy.core.enums.CrnStatusType.PUT_COMPLETE)) {
- vo.setStatus("姝ｅ湪浣滀笟");
- }
}
vo.setLoading(crnProtocol.getLoaded()==1?"鏈夌墿":"鏃犵墿"); // 鏈夌墿
vo.setBay(crnProtocol.getBay()); // 鍒�
vo.setLev(crnProtocol.getLevel()); // 灞�
vo.setLiftPos(crnProtocol.getLiftPosType().desc);
- if (crnProtocol.getPlatformHigh()) {
- vo.setSitePos("绔欏彴楂樹綅");
- }
- if (crnProtocol.getPlatformLow()) {
- vo.setSitePos("绔欏彴楂樹綅");
- }
vo.setForkOffset(crnProtocol.getForkPosType().desc); // 璐у弶浣嶇疆
vo.setXLocation(crnProtocol.getWalkPos() == 1?"鏄�":"鍚�"); // 璧拌瀹氫綅
vo.setYLocation(crnProtocol.getLiftPosType().equals(CrnLiftPosType.NONE)?"鍚�":"鏄�"); // 鍗囬檷瀹氫綅
- if (crnProtocol.getAlarm1() > 0) {
- BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm1());
+ if (crnProtocol.getAlarm() > 0) {
+ BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm());
vo.setAlarm1(crnError==null?"鏈煡寮傚父":crnError.getErrName());
- }
- if (crnProtocol.getAlarm2() > 0) {
- BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm2());
- vo.setAlarm2(crnError==null?"鏈煡寮傚父":crnError.getErrName());
- }
- if (crnProtocol.getAlarm3() > 0) {
- BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm3());
- vo.setAlarm3(crnError==null?"鏈煡寮傚父":crnError.getErrName());
- }
- if (crnProtocol.getAlarm4() > 0) {
- BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm4());
- vo.setAlarm4(crnError==null?"鏈煡寮傚父":crnError.getErrName());
}
// vo.setAlarm1(String.valueOf(crnProtocol.getAlarm1()));
// vo.setAlarm2(String.valueOf(crnProtocol.getAlarm2()));
@@ -335,7 +314,7 @@
command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
command.setTaskNo((short) 0); // 宸ヤ綔鍙�
command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
- command.setTaskMode(CrnTaskModeType.SITE_MOVE); // 浠诲姟妯″紡
+ command.setTaskMode(CrnTaskModeType.LOC_MOVE); // 浠诲姟妯″紡
command.setSourcePosX(param.getSourceStaNo()); // 婧愬簱浣嶆帓
command.setSourcePosY((short) 0); // 婧愬簱浣嶅垪
command.setSourcePosZ((short) 1); // 婧愬簱浣嶅眰
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index a4ad86e..2bf12e2 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -395,7 +395,7 @@
}
// 鍒ゆ柇鍫嗗灈鏈虹姸鎬佺瓑寰呯‘璁�
if (crnProtocol.modeType == CrnModeType.AUTO && crnProtocol.getTaskNo().equals(wrkMast.getWrkNo().shortValue())
- && crnProtocol.getTaskFinish() == 1 // todo:luxiaotao 绛夊緟纭
+ && crnProtocol.statusType == CrnStatusType.WAITING
&& crnProtocol.forkPosType == CrnForkPosType.HOME) {
// 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
@@ -746,8 +746,7 @@
CrnProtocol crnProtocol = crnThread.getCrnProtocol();
if (crnProtocol == null) { continue; }
// 鐘舵�侊細绛夊緟纭 骞朵笖 浠诲姟瀹屾垚浣� = 1
- if (crnProtocol.getTaskFinish() == 1 // todo:luxiaotao 绛夊緟纭
- && crnProtocol.getTaskNo() != 0) {
+ if (crnProtocol.statusType == CrnStatusType.WAITING && crnProtocol.getTaskNo() != 0) {
// 鑾峰彇鍏ュ簱寰呯‘璁ゅ伐浣滄。
WrkMast wrkMast = wrkMastMapper.selectPakInStep3(crnProtocol.getTaskNo().intValue());
if (wrkMast == null) {
@@ -793,13 +792,13 @@
BasErrLog latest = basErrLogService.findLatestByTaskNo(crn.getId(), crnProtocol.getTaskNo().intValue());
// 鏈夊紓甯�
if (latest == null) {
- if (crnProtocol.getAlarm1() != null && crnProtocol.getAlarm1() > 0) {
+ if (crnProtocol.getAlarm() != null && crnProtocol.getAlarm() > 0) {
WrkMast wrkMast = wrkMastMapper.selectById(crnProtocol.getTaskNo());
if (wrkMast == null) {
continue;
}
- BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm1());
- String errName = crnError==null? String.valueOf(crnProtocol.getAlarm1()):crnError.getErrName();
+ BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm());
+ String errName = crnError==null? String.valueOf(crnProtocol.getAlarm()):crnError.getErrName();
BasErrLog basErrLog = new BasErrLog(
null, // 缂栧彿
wrkMast.getWrkNo(), // 宸ヤ綔鍙�
@@ -814,7 +813,7 @@
wrkMast.getSourceStaNo(), // 婧愮珯
wrkMast.getSourceLocNo(), // 婧愬簱浣�
wrkMast.getBarcode(), // 鏉＄爜
- crnProtocol.getAlarm1(), // 寮傚父鐮�
+ (int) crnProtocol.getAlarm(), // 寮傚父鐮�
errName, // 寮傚父
1, // 寮傚父鎯呭喌
now, // 娣诲姞鏃堕棿
@@ -829,7 +828,7 @@
}
} else {
// 寮傚父淇
- if (crnProtocol.getAlarm1() == null || crnProtocol.getAlarm1() == 0) {
+ if (crnProtocol.getAlarm() == null || crnProtocol.getAlarm() == 0) {
latest.setEndTime(now);
latest.setUpdateTime(now);
latest.setStatus(2);
@@ -842,11 +841,11 @@
} else {
BasErrLog latest = basErrLogService.findLatest(crn.getId());
// 鏈夊紓甯�
- if (crnProtocol.getAlarm1() != null && crnProtocol.getAlarm1() > 0) {
+ if (crnProtocol.getAlarm() != null && crnProtocol.getAlarm() > 0) {
// 璁板綍鏂板紓甯�
- if (latest == null || (latest.getErrCode() != crnProtocol.getAlarm1().intValue())) {
- BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm1());
- String errName = crnError==null? String.valueOf(crnProtocol.getAlarm1()):crnError.getErrName();
+ if (latest == null || (latest.getErrCode() != crnProtocol.getAlarm().intValue())) {
+ BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm());
+ String errName = crnError==null? String.valueOf(crnProtocol.getAlarm()):crnError.getErrName();
BasErrLog basErrLog = new BasErrLog(
null, // 缂栧彿
null, // 宸ヤ綔鍙�
@@ -861,7 +860,7 @@
null, // 婧愮珯
null, // 婧愬簱浣�
null, // 鏉＄爜
- crnProtocol.getAlarm1(), // 寮傚父鐮�
+ (int)crnProtocol.getAlarm(), // 寮傚父鐮�
errName, // 寮傚父
1, // 寮傚父鎯呭喌
now, // 娣诲姞鏃堕棿
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 26d14a9..551ee70 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -74,7 +74,7 @@
// 鍒濆鍖栧爢鍨涙満绾跨▼
log.info("鍒濆鍖栧爢鍨涙満绾跨▼...................................................");
for (CrnSlave crn : slaveProperties.getCrn()) {
- CrnThread crnThread = new SiemensCrnThread(crn);
+ CrnThread crnThread = new MelsecCrnThread(crn);
new Thread((Runnable) crnThread).start();
SlaveConnection.put(SlaveType.Crn, crn.getId(), crnThread);
}
diff --git a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
index a47b9c0..147eef5 100644
--- a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
@@ -94,19 +94,9 @@
public Short walkPos;
/**
- * 鍫嗗灈鏈轰换鍔″畬鎴�
- */
- public Short taskFinish;
-
- /**
* 杞借揣鍙版湁鐗�
*/
public Short loaded;
-
- /**
- * 寮傚父鐮侊紙鏁板�兼樉绀猴級
- */
- private Short alarm1;
private Short temp1;
diff --git a/src/main/java/com/zy/core/thread/CrnThread.java b/src/main/java/com/zy/core/thread/MelsecCrnThread.java
similarity index 94%
rename from src/main/java/com/zy/core/thread/CrnThread.java
rename to src/main/java/com/zy/core/thread/MelsecCrnThread.java
index dd6d4f9..57d10ea 100644
--- a/src/main/java/com/zy/core/thread/CrnThread.java
+++ b/src/main/java/com/zy/core/thread/MelsecCrnThread.java
@@ -11,6 +11,7 @@
import com.zy.asrs.entity.BasCrnp;
import com.zy.asrs.service.BasCrnOptService;
import com.zy.asrs.service.BasCrnpService;
+import com.zy.core.CrnThread;
import com.zy.core.ThreadHandler;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
@@ -33,14 +34,14 @@
*/
@Data
@Slf4j
-public class CrnThread implements Runnable, ThreadHandler {
+public class MelsecCrnThread implements Runnable, ThreadHandler, CrnThread {
private MelsecMcNet melsecMcNet;
private CrnSlave slave;
private CrnProtocol crnProtocol;
private boolean resetFlag = false;
- public CrnThread(CrnSlave slave) {
+ public MelsecCrnThread(CrnSlave slave) {
this.slave = slave;
}
@@ -187,32 +188,22 @@
}
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.getCommand();
+ OperateResult result = melsecMcNet.Write("D0", array);
- OperateResult result;
if (command.getAckFinish() == 0) {
- 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.getCommand();
- result = melsecMcNet.Write("D0", array);
-
- short[] array0 = new short[1];
- array0[0] = 1;
- result = melsecMcNet.Write("D9", array);
-
- } else {
-
+ short commandFinish = 1;
+ result = melsecMcNet.Write("D9", commandFinish);
}
-
-
-
-
try {
// 鏃ュ織璁板綍
@@ -264,10 +255,10 @@
slave.setPort(5015);
slave.setRack(0);
slave.setSlot(0);
- CrnThread crnThread = new CrnThread(slave);
- crnThread.connect();
- crnThread.readStatus();
- System.out.println(JSON.toJSONString(crnThread.crnProtocol));
+ MelsecCrnThread melsecCrnThread = new MelsecCrnThread(slave);
+ melsecCrnThread.connect();
+ melsecCrnThread.readStatus();
+ System.out.println(JSON.toJSONString(melsecCrnThread.crnProtocol));
// 1.鍏ュ簱 婧愬拰鐩爣閮藉彂
// CrnCommand command = new CrnCommand();
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
deleted file mode 100644
index 69a6c19..0000000
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ /dev/null
@@ -1,522 +0,0 @@
-package com.zy.core.thread;
-
-import HslCommunication.Core.Types.OperateResult;
-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.zy.asrs.entity.BasCrnOpt;
-import com.zy.asrs.entity.BasCrnp;
-import com.zy.asrs.service.BasCrnOptService;
-import com.zy.asrs.service.BasCrnpService;
-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.model.CrnSlave;
-import com.zy.core.model.Task;
-import com.zy.core.model.command.CrnCommand;
-import com.zy.core.model.protocol.CrnProtocol;
-import lombok.Data;
-import lombok.extern.slf4j.Slf4j;
-
-import java.text.MessageFormat;
-import java.util.Date;
-
-/**
- * 鍫嗗灈鏈虹嚎绋�
- * Created by vincent on 2020/8/4
- */
-@Data
-@Slf4j
-public class SiemensCrnThread implements Runnable, CrnThread {
-
- private SiemensS7Net siemensNet;
- private CrnSlave slave;
- private CrnProtocol crnProtocol;
- private boolean resetFlag = false;
-
- public SiemensCrnThread(CrnSlave slave) {
- this.slave = slave;
- }
-
- @Override
- @SuppressWarnings("InfiniteLoopStatement")
- public void run() {
- this.connect();
- while (true) {
- try {
- int step = 1;
- Task task = MessageQueue.poll(SlaveType.Crn, slave.getId());
- if (task != null) {
- step = task.getStep();
- }
- switch (step) {
- // 璇绘暟鎹�
- case 1:
- readStatus();
- break;
- // 鍐欏叆鏁版嵁
- case 2:
- write((CrnCommand) task.getData());
- break;
- // 澶嶄綅
- case 3:
- CrnCommand command = (CrnCommand) task.getData();
- if (null == command) {
- command = new CrnCommand();
- }
- command.setCrnNo(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;
- }
- Thread.sleep(500);
- } catch (Exception e) {
-// e.printStackTrace();
- }
-
- }
- }
-
- @Override
- public boolean connect() {
- boolean result = false;
- siemensNet = new SiemensS7Net(SiemensPLCS.S1200, slave.getIp());
- siemensNet.setRack(slave.getRack().byteValue());
- siemensNet.setSlot(slave.getSlot().byteValue());
- OperateResult connect = siemensNet.ConnectServer();
- 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());
- } 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());
- }
- siemensNet.ConnectClose();
- return result;
- }
-
- /**
- * 璇诲彇鐘舵��
- */
- 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
-
- 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.setAlarm1(0);
- crnProtocol.setAlarm2(0);
- crnProtocol.setAlarm3(0);
- crnProtocol.setAlarm4(0);
- boolean[] err1 = siemensNet.getByteTransform().TransBool(result.Content, 28, 1); // 30
- if (err1[0]) { crnProtocol.setAlarm1(1); }
- if (err1[1]) { crnProtocol.setAlarm1(2); }
- if (err1[2]) { crnProtocol.setAlarm1(3); }
- boolean[] err2 = siemensNet.getByteTransform().TransBool(result.Content, 29, 1); // 31
- if (err2[0]) { crnProtocol.setAlarm1(4); }
- if (err2[1]) { crnProtocol.setAlarm1(5); }
- if (err2[2]) { crnProtocol.setAlarm1(6); }
- boolean[] err3 = siemensNet.getByteTransform().TransBool(result.Content, 30, 1); // 32
- if (err3[6]) { crnProtocol.setAlarm1(7); }
- if (err3[7]) { crnProtocol.setAlarm1(8); }
- boolean[] err4 = siemensNet.getByteTransform().TransBool(result.Content, 31, 1); // 33
- if (err4[1]) { crnProtocol.setAlarm1(9); }
- if (err4[5]) { crnProtocol.setAlarm1(10); }
- if (err4[6]) { crnProtocol.setAlarm1(11); }
- if (err4[7]) { crnProtocol.setAlarm1(12); }
- boolean[] err5 = siemensNet.getByteTransform().TransBool(result.Content, 32, 1); // 34
- if (err5[0]) { crnProtocol.setAlarm2(13); }
- if (err5[2]) { crnProtocol.setAlarm2(14); }
- if (err5[3]) { crnProtocol.setAlarm2(15); }
- if (err5[5]) { crnProtocol.setAlarm2(16); }
- if (err5[6]) { crnProtocol.setAlarm2(17); }
- if (err5[7]) { crnProtocol.setAlarm2(18); }
- boolean[] err6 = siemensNet.getByteTransform().TransBool(result.Content, 33, 1); // 35
- if (err6[1]) { crnProtocol.setAlarm2(19); }
- if (err6[2]) { crnProtocol.setAlarm2(20); }
- if (err6[3]) { crnProtocol.setAlarm2(21); }
- if (err6[4]) { crnProtocol.setAlarm2(22); }
- boolean[] err7 = siemensNet.getByteTransform().TransBool(result.Content, 34, 1); // 36
- if (err7[4]) { crnProtocol.setAlarm2(23); }
- if (err7[5]) { crnProtocol.setAlarm2(24); }
- if (err7[6]) { crnProtocol.setAlarm2(25); }
- boolean[] err8 = siemensNet.getByteTransform().TransBool(result.Content, 36, 1); // 38
- if (err8[0]) { crnProtocol.setAlarm3(26); }
- if (err8[1]) { crnProtocol.setAlarm3(27); }
- if (err8[2]) { crnProtocol.setAlarm3(28); }
- if (err8[3]) { crnProtocol.setAlarm3(29); }
- if (err8[4]) { crnProtocol.setAlarm3(30); }
- if (err8[5]) { crnProtocol.setAlarm3(31); }
- if (err8[6]) { crnProtocol.setAlarm3(32); }
- if (err8[7]) { crnProtocol.setAlarm3(33); }
- boolean[] err9 = siemensNet.getByteTransform().TransBool(result.Content, 37, 1); // 39
- if (err9[0]) { crnProtocol.setAlarm3(34); }
- if (err9[1]) { crnProtocol.setAlarm3(35); }
- if (err9[2]) { crnProtocol.setAlarm3(36); }
- if (err9[3]) { crnProtocol.setAlarm3(37); }
- if (err9[4]) { crnProtocol.setAlarm3(38); }
- if (err9[5]) { crnProtocol.setAlarm3(39); }
- if (err9[6]) { crnProtocol.setAlarm3(40); }
- if (err9[7]) { crnProtocol.setAlarm3(41); }
- boolean[] err10 = siemensNet.getByteTransform().TransBool(result.Content, 38, 1); // 40
- if (err10[0]) { crnProtocol.setAlarm3(42); }
- if (err10[1]) { crnProtocol.setAlarm3(43); }
- if (err10[2]) { crnProtocol.setAlarm3(44); }
- if (err10[3]) { crnProtocol.setAlarm3(45); }
- if (err10[4]) { crnProtocol.setAlarm3(46); }
- boolean[] err11 = siemensNet.getByteTransform().TransBool(result.Content, 39, 1); // 41
- if (err11[0]) { crnProtocol.setAlarm3(47); }
- if (err11[1]) { crnProtocol.setAlarm3(48); }
- if (err11[2]) { crnProtocol.setAlarm3(49); }
- boolean[] err12 = siemensNet.getByteTransform().TransBool(result.Content, 40, 1); // 42
- if (err12[0]) { crnProtocol.setAlarm4(50); }
- if (err12[1]) { crnProtocol.setAlarm4(51); }
- if (err12[2]) { crnProtocol.setAlarm4(52); }
- if (err12[3]) { crnProtocol.setAlarm4(53); }
- if (err12[4]) { crnProtocol.setAlarm4(54); }
- if (err12[5]) { crnProtocol.setAlarm4(55); }
- boolean[] err13 = siemensNet.getByteTransform().TransBool(result.Content, 41, 1); // 43
- if (err13[0]) { crnProtocol.setAlarm4(56); }
- if (err13[1]) { crnProtocol.setAlarm4(57); }
- if (err13[2]) { crnProtocol.setAlarm4(58); }
- if (err13[3]) { crnProtocol.setAlarm4(59); }
- boolean[] err14 = siemensNet.getByteTransform().TransBool(result.Content, 42, 1); // 44
- if (err14[0]) { crnProtocol.setAlarm4(60); }
- if (err14[1]) { crnProtocol.setAlarm4(61); }
- if (err14[2]) { crnProtocol.setAlarm4(62); }
- if (err14[3]) { crnProtocol.setAlarm4(63); }
- if (err14[4]) { crnProtocol.setAlarm4(64); }
- if (err14[5]) { crnProtocol.setAlarm4(65); }
- if (err14[6]) { crnProtocol.setAlarm4(66); }
- if (err14[7]) { crnProtocol.setAlarm4(67); }
- boolean[] err15 = siemensNet.getByteTransform().TransBool(result.Content, 43, 1); // 45
- if (err15[1]) { crnProtocol.setAlarm4(68); }
- if (err15[2]) { crnProtocol.setAlarm4(69); }
- if (err15[3]) { crnProtocol.setAlarm4(70); }
- if (err15[4]) { crnProtocol.setAlarm4(71); }
- if (err15[5]) { crnProtocol.setAlarm4(72); }
- if (err15[6]) { crnProtocol.setAlarm4(73); }
-
- 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.setXDistance((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
-
- // 澧炲己
- 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;
- }
-
- }
- }
-
- 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 boolean write(CrnCommand command){
- if (null == command) {
- log.error("鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�");
- return false;
- }
- if (command.getTaskNo() == 0 && command.getAckFinish() == 0) {
- command.setTaskNo((short) 9999);
- }
- command.setCrnNo(slave.getId());
- short[] array = new short[9];
- if (command.getAckFinish() == 0) {
- array[0] = 5;
- } else {
- array[0] = 0;
- }
- 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);
- // 浠诲姟鍙� + 瀹屾垚浣�
- short[] array2 = new short[2];
- array2[0] = command.getTaskNo();
- array2[1] = command.getAckFinish();
- OperateResult result1 = siemensNet.Write("DB1000.24", array2);
-
- // 缁撴潫浣�
- if (command.getAckFinish() == 0) {
- 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);
- }
- } catch (Exception ignore) {}
-
- if (result.IsSuccess && result1.IsSuccess) {
- log.warn("鍫嗗灈鏈哄懡浠や笅鍙慬id:{},鏃堕棿锛歿}] >>>>> {}", slave.getId(), DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmsssss_F), 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());
- return false;
- }
- }
-
- @Override
- public void close() {
- siemensNet.ConnectClose();
- }
-
- /******************************************************************************************/
- /**************************************** 娴嬭瘯涓撶敤 *****************************************/
- /*****************************************************************************************/
- public static void main(String[] args) throws InterruptedException {
- CrnSlave slave = new CrnSlave();
- slave.setId(1);
- slave.setIp("192.168.6.9");
- slave.setRack(0);
- slave.setSlot(0);
- SiemensCrnThread crnThread = new SiemensCrnThread(slave);
- crnThread.connect();
- crnThread.readStatus();
- System.out.println(JSON.toJSONString(crnThread.crnProtocol));
- Thread.sleep(3000L);
-
- // 1.鍏ュ簱 婧愬拰鐩爣閮藉彂
-// CrnCommand command = new CrnCommand();
-// command.setCrnNo(1); // 鍫嗗灈鏈虹紪鍙�
-// command.setTaskNo((short) 0); // 宸ヤ綔鍙�
-// 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.setDestinationPosZ((short) 1); // 鐩爣搴撲綅灞�
-// crnThread.write(command);
-
- // 2.鍑哄簱 婧愬拰鐩爣閮藉彂
-// CrnCommand command = new CrnCommand();
-// command.setCrnNo(1); // 鍫嗗灈鏈虹紪鍙�
-// command.setTaskNo((short) 0); // 宸ヤ綔鍙�
-// command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
-// command.setTaskMode(CrnTaskModeType.PAKOUT); // 浠诲姟妯″紡
-// command.setSourcePosX((short) 2); // 婧愬簱浣嶆帓
-// command.setSourcePosY((short) 4); // 婧愬簱浣嶅垪
-// command.setSourcePosZ((short) 3); // 婧愬簱浣嶅眰
-// command.setDestinationPosX((short) 1); // 鐩爣搴撲綅鎺�
-// command.setDestinationPosY((short) 0); // 鐩爣搴撲綅鍒�
-// command.setDestinationPosZ((short) 1); // 鐩爣搴撲綅灞�
-// crnThread.write(command);
-
-
-// // 3.搴撲綅绉昏浆 婧愬拰鐩爣閮藉彂 pass
-// CrnCommand command = new CrnCommand();
-// command.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙�
-// command.setTaskNo((short) 0); // 宸ヤ綔鍙�
-// command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
-// command.setTaskMode(CrnTaskModeType.LOC_MOVE); // 浠诲姟妯″紡: 搴撲綅绉昏浆
-// command.setSourcePosX((short)2); // 婧愬簱浣嶆帓
-// command.setSourcePosY((short)2); // 婧愬簱浣嶅垪
-// command.setSourcePosZ((short)3); // 婧愬簱浣嶅眰
-// command.setDestinationPosX((short)2); // 鐩爣搴撲綅鎺�
-// command.setDestinationPosY((short)4); // 鐩爣搴撲綅鍒�
-// command.setDestinationPosZ((short)4); // 鐩爣搴撲綅灞�
-// crnThread.write(command);
-
- // 4.绔欎綅绉昏浆 婧愬拰鐩爣閮藉彂
-// CrnCommand command = new CrnCommand();
-// command.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙�
-// command.setTaskNo((short) 0); // 宸ヤ綔鍙�
-// command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
-// command.setTaskMode(CrnTaskModeType.SITE_MOVE); // 浠诲姟妯″紡: 搴撲綅绉昏浆
-// command.setSourcePosX((short)1); // 婧愬簱浣嶆帓
-// command.setSourcePosY((short)0); // 婧愬簱浣嶅垪
-// command.setSourcePosZ((short)1); // 婧愬簱浣嶅眰
-// command.setDestinationPosX((short)2); // 鐩爣搴撲綅鎺�
-// command.setDestinationPosY((short)0); // 鐩爣搴撲綅鍒�
-// command.setDestinationPosZ((short)1); // 鐩爣搴撲綅灞�
-// crnThread.write(command);
-
-// // 5.鍥炲師鐐� 涓嶇敤鍙� pass
-// CrnCommand command = new CrnCommand();
-// command.setCrnNo(1); // 鍫嗗灈鏈虹紪鍙�
-// command.setTaskNo((short) 0); // 宸ヤ綔鍙�
-// command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
-// command.setTaskMode(CrnTaskModeType.GO_ORIGIN); // 浠诲姟妯″紡
-// command.setSourcePosX((short) 0); // 婧愬簱浣嶆帓
-// command.setSourcePosY((short) 0); // 婧愬簱浣嶅垪
-// command.setSourcePosZ((short) 0); // 婧愬簱浣嶅眰
-// command.setDestinationPosX((short) 0); // 鐩爣搴撲綅鎺�
-// command.setDestinationPosY((short) 0); // 鐩爣搴撲綅鍒�
-// command.setDestinationPosZ((short) 0); // 鐩爣搴撲綅灞�
-// crnThread.write(command);
-
-// // 7.鍧愭爣绉昏 鐩爣鍙� pass
-// CrnCommand command = new CrnCommand();
-// command.setCrnNo(1); // 鍫嗗灈鏈虹紪鍙�
-// command.setTaskNo((short) 0); // 宸ヤ綔鍙�
-// command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
-// command.setTaskMode(CrnTaskModeType.OFFSET_MOVE); // 浠诲姟妯″紡
-// command.setSourcePosX((short) 0); // 婧愬簱浣嶆帓
-// command.setSourcePosY((short) 0); // 婧愬簱浣嶅垪
-// command.setSourcePosZ((short) 0); // 婧愬簱浣嶅眰
-// command.setDestinationPosX((short) 2); // 鐩爣搴撲綅鎺�
-// command.setDestinationPosY((short) 1); // 鐩爣搴撲綅鍒�
-// command.setDestinationPosZ((short) 1); // 鐩爣搴撲綅灞�
-// crnThread.write(command);
-
- // 鍙湁鍑虹幇鎸囧畾寮傚父鎵嶈繘琛屽浣�
-// if (crnThread.crnProtocol.getCrnError2().leftTakeNoneErr
-// || crnThread.crnProtocol.getCrnError2().rightTakeNoneErr
-// || crnThread.crnProtocol.getCrnError2().leftPutLoadErr
-// || crnThread.crnProtocol.getCrnError2().rightPutLoadErr) {
-// CrnCommand command = new CrnCommand();
-// command.setCrnNo(1); // 鍫嗗灈鏈虹紪鍙�
-// command.setAckFinish((short) 1); // 浠诲姟瀹屾垚纭浣�
-// command.setTaskMode(CrnTaskModeType.NONE); // 浠诲姟妯″紡
-// Thread.sleep(3000L);
-// crnThread.write(command);
-// }
-
- }
-
-}
--
Gitblit v1.9.1