From c7bcef9d03f58c984d475932710c247ee778d95b Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期二, 09 四月 2024 23:31:39 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 621 ++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 488 insertions(+), 133 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 31b9ff5..aa8c63c 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -5,25 +5,31 @@
import HslCommunication.Profinet.Siemens.SiemensPLCS;
import HslCommunication.Profinet.Siemens.SiemensS7Net;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
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.asrs.entity.*;
+import com.zy.asrs.entity.param.TaskOverToWms;
+import com.zy.asrs.service.*;
+import com.zy.common.utils.HttpHandler;
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.CommandPackage;
import com.zy.core.model.command.CrnCommand;
import com.zy.core.model.protocol.CrnProtocol;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import java.text.MessageFormat;
-import java.util.Date;
+import java.util.*;
/**
* 鍫嗗灈鏈虹嚎绋�
@@ -38,10 +44,21 @@
private CrnProtocol crnProtocol;
private boolean resetFlag = false;
- /**
- * 鍫嗗灈鏈烘槸鍚﹀湪鍥炲師鐐硅繍鍔ㄤ腑鏍囪
- */
- private boolean backHpFlag = false;
+ @Value("${wms.url}")
+ private String wmsUrl;
+ public static final List<Short> rowOne = new ArrayList<Short>() {{
+ add((short) 1);add((short) 5);add((short) 7);add((short) 11);add((short) 15);add((short) 19);
+ }};
+ public static final List<Short> rowTwo = new ArrayList<Short>() {{
+ add((short) 2);add((short) 6);add((short) 8);add((short) 12);add((short) 16);add((short) 20);
+ }};
+ public static final List<Short> rowThree = new ArrayList<Short>() {{
+ add((short) 3);add((short) 9);add((short) 13);add((short) 17);add((short) 21);
+ }};
+ public static final List<Short> rowFour = new ArrayList<Short>() {{
+ add((short) 4);add((short) 10);add((short) 14);add((short) 18);
+ }};
+
public SiemensCrnThread(CrnSlave slave) {
this.slave = slave;
@@ -50,6 +67,7 @@
@Override
@SuppressWarnings("InfiniteLoopStatement")
public void run() {
+ initCrnProtocol();
this.connect();
while (true) {
try {
@@ -65,7 +83,7 @@
break;
// 鍐欏叆鏁版嵁
case 2:
- write((CrnCommand) task.getData());
+ write2((CrnCommand) task.getData());
break;
// 澶嶄綅
case 3:
@@ -85,6 +103,12 @@
command.setDestinationPosZ((short)0); // 鐩爣搴撲綅灞�
write(command);
break;
+ case 4:
+ writeAuto((CrnCommand) task.getData());
+ break;
+ case 5:
+ write((CrnCommand) task.getData());
+ break;
default:
break;
}
@@ -97,29 +121,19 @@
}
/**
- * 鍒濆鍖栧爢鍨涙満鐘舵��
+ * 鍒濆鍖栧爢鍨涙満
*/
- 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);
+ private void initCrnProtocol(){
+ crnProtocol = new CrnProtocol();
+ crnProtocol.setMode((short) 0);
+ crnProtocol.setStatus((short) 0);
+ crnProtocol.setTaskNo((short) 0);
+ crnProtocol.setTaskFinish((short) 0);
+ crnProtocol.setValid((short) 0);
+ crnProtocol.setBay((short) 0);
+ crnProtocol.setLevel((short) 0);
+ crnProtocol.setRow((short) 0);
+ crnProtocol.setLane((short) 0);
}
@Override
@@ -136,7 +150,9 @@
} 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());
- initCrn();
+// DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+// deviceErrorService.addDeviceError("crn", slave.getId(), "鍫嗗灈鏈簆lc杩炴帴澶辫触");
+ initCrnProtocol();
}
// siemensNet.ConnectClose();
return result;
@@ -146,95 +162,190 @@
* 璇诲彇鐘舵��
*/
private void readStatus(){
- try {
- OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) 56);
- if (result.IsSuccess) {
- if (null == crnProtocol) {
- crnProtocol = new CrnProtocol();
- }
- 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.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));
- 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.setxDistance(siemensNet.getByteTransform().TransInt16(result.Content, 40));
- crnProtocol.setyDistance(siemensNet.getByteTransform().TransInt16(result.Content, 44));
- crnProtocol.setxDuration(siemensNet.getByteTransform().TransInt16(result.Content, 48));
- crnProtocol.setyDuration(siemensNet.getByteTransform().TransInt16(result.Content, 52));
- OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
-
- // 澶嶄綅淇″彿
- if (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;
- }
- }
- }
-
- 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))){
- log.error("鍫嗗灈鏈簆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()));
- log.error("璇诲彇鍫嗗灈鏈簆lc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
+ OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) 56);
+ if (result.IsSuccess) {
+ if (null == crnProtocol) {
+ crnProtocol = new CrnProtocol();
}
- } 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()));
- log.error("璇诲彇鍫嗗灈鏈簆lc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
- initCrn();
- }
- }
+ 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.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));
+ crnProtocol.setXSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 28));
+ crnProtocol.setYSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 32));
+ crnProtocol.setZSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 36));
+ crnProtocol.setXDistance(siemensNet.getByteTransform().TransSingle(result.Content, 40));
+ crnProtocol.setYDistance(siemensNet.getByteTransform().TransSingle(result.Content, 44));
+ crnProtocol.setXDuration(siemensNet.getByteTransform().TransSingle(result.Content, 48));
+ crnProtocol.setYDuration(siemensNet.getByteTransform().TransSingle(result.Content, 52));
- 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)));
+
+
+ OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
+
+ // 澶嶄綅淇″彿
+ if (crnProtocol.getTaskFinish() == 0) {
+ if (resetFlag) {
+ CrnCommand crnCommand = new CrnCommand();
+ crnCommand.setAckFinish((short)1);
+ if (write(crnCommand)) {
+ resetFlag = false;
+
+ //鍫嗗灈鏈轰换鍔″畬鎴愬悗璁块棶wms璇锋眰浠诲姟瀹屾垚 locationDone 璐т綅澶勭悊瀹屾垚
+ TaskWrkService taskWrkService = SpringUtils.getBean(TaskWrkService.class);
+ TaskWrk taskWrk = taskWrkService.selectOne(new EntityWrapper<TaskWrk>().eq("wrk_no",crnProtocol.getTaskNo()));
+ String tasktype = null;
+ switch (taskWrk.getIoType()){
+ case 1:
+ tasktype= "RK";
+ break;
+ case 2:
+ tasktype= "CK";
+ break;
+ case 3:
+ tasktype= "YK";
+ break;
+ default:
+ tasktype= "鏈煡";
+ }
+ Map<String, Object> map = new HashMap<>();
+ map.put("x-api-key","7a15b5db-29b6-552c-8cff-0cfec3756da2");
+ TaskOverToWms taskOverToWms = new TaskOverToWms();
+ taskOverToWms.setFeedbackFrom("WCS"); //鏉ユ簮
+ taskOverToWms.setWarehouseId("1688469798893297665"); //浠撳簱鏍囪瘑
+ taskOverToWms.setTaskNo(taskWrk.getTaskNo()); //浠诲姟鍙�
+ taskOverToWms.setTaskType(tasktype); // 浠诲姟绫诲瀷
+ taskOverToWms.setContainerCode(taskWrk.getBarcode()); // 瀹瑰櫒缂栫爜
+ if (taskWrk.getIoType() ==1){
+ taskOverToWms.setEquipmentCode(String.valueOf(taskWrk.getCrnNo())); //璁惧缂栫爜
+ taskOverToWms.setTargetLocationCode(taskWrk.getOriginTargetPoint()); //鐩爣搴撲綅
+ }else if (taskWrk.getIoType() ==2){
+ Map<Integer,String> map1 = new HashMap<>();
+ map1.put(102,"J-1101");
+ map1.put(106,"J-1103");
+ map1.put(110,"J-1105");
+ map1.put(114,"J-1107");
+ map1.put(118,"J-1109");
+ map1.put(122,"J-1111");
+ map1.put(305,"H-1101");
+ map1.put(405,"G-1101");
+ taskOverToWms.setEquipmentCode(map1.get(taskWrk.getTargetPoint())); //璁惧缂栫爜
+ taskOverToWms.setSourceLocationCode(taskWrk.getOriginStartPoint()); //婧愬簱浣�
+ } else if (taskWrk.getIoType() == 3) {
+ taskOverToWms.setEquipmentCode(String.valueOf(taskWrk.getCrnNo())); //璁惧缂栫爜
+ taskOverToWms.setSourceLocationCode(taskWrk.getOriginStartPoint());
+ taskOverToWms.setTargetLocationCode(taskWrk.getOriginTargetPoint()); //鐩爣搴撲綅
+ }
+ taskOverToWms.setTaskStatus("location_done"); //浠诲姟鐘舵��
+ String response = null;
+ try {
+ response = new HttpHandler.Builder()
+ .setHeaders(map)
+ .setUri("10.32.53.195:8080")
+ .setPath("wcsManager/wcsInterface/taskStatusFeedback")
+ .setJson(JSON.toJSONString(taskOverToWms))
+ .build()
+ .doPost();
+ }catch (Exception e){
+ log.error("鍫嗗灈鏈轰换鍔″畬鎴愶紝璇锋眰wms浠诲姟瀹屾垚鎺ュ彛澶辫触");
+ }
+ ApiLogService apiLogService = SpringUtils.getBean(ApiLogService.class);
+ apiLogService.save("Wms浠诲姟瀹屾垚鎺ュ彛"
+ ,"10.32.53.195:8080"+"/wcsManager/wcsInterface/taskStatusFeedback"
+ ,null
+ ,"127.0.0.1"
+ ,JSON.toJSONString(taskOverToWms)
+ ,response
+ ,true
+ );
+ JSONObject jsonObject = JSON.parseObject(response);
+ if (jsonObject.getInteger("code").equals(200)){
+ if (taskWrk.getIoType() == 3){
+ taskWrk.setWrkSts(4);
+ }
+ taskWrk.setStatus(5);
+ if (!taskWrkService.update(taskWrk,new EntityWrapper<TaskWrk>().eq("wrk_no",crnProtocol.getTaskNo()))){
+ log.error("鍫嗗灈鏈轰换鍔″畬鎴愶紝鏀瑰彉浠诲姟鐘舵�佸け璐�");
+ }
+
+ log.info("鍫嗗灈鏈轰换鍔″畬鎴愶紝璇锋眰wms浠诲姟瀹屾垚鎺ュ彛鎴愬姛");
+ }else {
+ log.error("鍫嗗灈鏈轰换鍔″畬鎴愶紝璇锋眰wms浠诲姟瀹屾垚鎺ュ彛瀹屾垚锛屼絾杩斿洖澶辫触");
+ }
+
+ }
+
+
+
+ }
+ }
+
+ 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))){
+ log.error("鍫嗗灈鏈簆lc鏁版嵁搴撴洿鏂板け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
+ }
+ } catch (Exception ignore){}
+
+ DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+ deviceErrorService.deleteDeviceError("crn", slave.getId());
+ } 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());
+ DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+ deviceErrorService.addDeviceError("crn", slave.getId(), "璇诲彇鍫嗗灈鏈簆lc鐘舵�佷俊鎭け璐�");
}
}
/**
* 鍐欏叆鏁版嵁
*/
- private boolean write(CrnCommand command) throws InterruptedException {
+ private boolean write(CrnCommand command){
if (null == command) {
log.error("鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�");
return false;
}
- convertRow(command);
+ //杞崲鍓嶅厠闅嗕竴浠�
+ CrnCommand crnCommand = new CrnCommand();
+ crnCommand.setCrnNo(command.getCrnNo());
+ crnCommand.setAckFinish(command.getAckFinish());
+ crnCommand.setTaskNo(command.getTaskNo());
+ crnCommand.setTaskMode(command.getTaskMode());
+ crnCommand.setSourcePosX(command.getSourcePosX());
+ crnCommand.setSourcePosY(command.getSourcePosY());
+ crnCommand.setSourcePosZ(command.getSourcePosZ());
+ crnCommand.setDestinationPosX(command.getDestinationPosX());
+ crnCommand.setDestinationPosY(command.getDestinationPosY());
+ crnCommand.setDestinationPosZ(command.getDestinationPosZ());
+// crnCommand.setSourceStaNo(command.getSourceStaNo());
+// crnCommand.setDestinationStaNo(command.getDestinationStaNo());
+ crnCommand.setCommand(command.getCommand());
+ if (command.getTaskNo() == 0 && command.getAckFinish() == 0 && command.getAuto() != 1) {
+ command.setTaskNo((short) 999);
+ }
+
command.setCrnNo(slave.getId());
- short[] array = new short[12];
- array[0] = command.getAckFinish();
+ short[] array = new short[10];
+ if (Cools.isEmpty(command.getAckFinish())) {
+ array[0] = 5;
+ } else {
+ array[0] = command.getAckFinish();
+ }
array[1] = command.getTaskNo();
array[2] = command.getTaskMode();
array[3] = command.getSourcePosX();
@@ -243,52 +354,296 @@
array[6] = command.getDestinationPosX();
array[7] = command.getDestinationPosY();
array[8] = command.getDestinationPosZ();
- array[9] = command.getSourceStaNo();
- array[10] = command.getDestinationStaNo();
- array[11] = command.getCommand();
+ array[9] = command.getCommand();
+
+ // 浣滀笟淇℃伅
OperateResult result = siemensNet.Write("DB100.0", array);
- if (command.getAckFinish() == 0) {
- short commandFinish = 1;
- result = siemensNet.Write("DB100.22", commandFinish);
- }
-
- 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(), // 婧愬眰
+ command.getTaskModeType() == null ? null : command.getTaskModeType().toString(), // 妯″紡
+ command.getSourcePosZ().intValue(), // 婧愭帓
+ command.getSourcePosX().intValue(), // 婧愬垪
+ command.getSourcePosY().intValue(), // 婧愬眰
null, // 婧愮珯
- command.getDestinationPosX().intValue(), // 鐩爣鎺�
- command.getDestinationPosY().intValue(), // 鐩爣鍒�
- command.getDestinationPosZ().intValue(), // 鐩爣灞�
+ command.getDestinationPosZ().intValue(), // 鐩爣鎺�
+ command.getDestinationPosX().intValue(), // 鐩爣鍒�
+ command.getDestinationPosY().intValue(), // 鐩爣灞�
null, // 鐩爣绔�
null, // 鍝嶅簲缁撴灉
null, // 淇敼鏃堕棿
null // 淇敼浜哄憳
);
bean.insert(basCrnOpt);
- } catch (Exception ignore) {}
+ }
- if (result != null && result.IsSuccess) {
- Thread.sleep(200);
- this.readStatus();
- log.info("鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), JSON.toJSON(command));
+ if (result.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;
+ }
+
+
+ try{
+ //鍫嗗灈鏈轰换鍔″啓鍏ュ悗锛屽洖璇讳竴娆★紝鐪嬫槸鍚︽垚鍔�
+ Thread.sleep(500);
+ OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 24);
+ if (resultRead.IsSuccess) {
+ CrnCommand one = new CrnCommand();
+ one.setAckFinish(siemensNet.getByteTransform().TransInt16(resultRead.Content, 0));
+ one.setTaskNo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 2));
+ //one.setTaskMode(siemensNet.getByteTransform().TransInt16(resultRead.Content, 4));
+ one.setSourcePosZ(siemensNet.getByteTransform().TransInt16(resultRead.Content, 6));
+ one.setSourcePosX(siemensNet.getByteTransform().TransInt16(resultRead.Content, 8));
+ one.setSourcePosY(siemensNet.getByteTransform().TransInt16(resultRead.Content, 10));
+ one.setDestinationPosZ(siemensNet.getByteTransform().TransInt16(resultRead.Content, 12));
+ one.setDestinationPosX(siemensNet.getByteTransform().TransInt16(resultRead.Content, 14));
+ one.setDestinationPosY(siemensNet.getByteTransform().TransInt16(resultRead.Content, 16));
+// one.setSourceStaNo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 18));
+// one.setDestinationStaNo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 20));
+ if (!crnCommand.getTaskNo().equals(one.getTaskNo()) || !crnCommand.getAckFinish().equals(one.getAckFinish())
+ || !crnCommand.getSourcePosZ().equals(one.getSourcePosZ()) || !crnCommand.getSourcePosX().equals(one.getSourcePosX()) || !crnCommand.getSourcePosY().equals(one.getSourcePosY())
+ || !crnCommand.getDestinationPosZ().equals(one.getDestinationPosZ()) || !crnCommand.getDestinationPosX().equals(one.getDestinationPosX()) || !crnCommand.getDestinationPosY().equals(one.getDestinationPosY())
+ ){
+ log.error("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲け璐id:{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), JSON.toJSON(command),JSON.toJSON(one));
+ log.error("鍫嗗灈鏈哄懡浠ゅ洖璇诲け璐ュ悗锛岄噸鏂版坊鍔犱换鍔″埌闃熷垪 ===>> [id:{}],{}", slave.getId(), JSON.toJSON(crnCommand));
+ MessageQueue.offer(SlaveType.Crn, slave.getId(), new Task(5, crnCommand));
+ Thread.sleep(100);
+ readStatus();
+ return false;
+ } else {
+ log.info("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇绘垚鍔焄id:{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), JSON.toJSON(command),JSON.toJSON(one));
+ OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
+ }
+ }
+ }catch (Exception e){
+ log.error("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲嚭閿�");
+ log.error("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲嚭閿�:寮傚父淇℃伅锛�"+e);
+ }
+ return true;
+ }
+
+ /**
+ * 鍐欏叆鏁版嵁
+ */
+ private boolean write2(CrnCommand command){
+ if (null == command) {
+ log.error("鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�");
+ return false;
+ }
+ //杞崲鍓嶅厠闅嗕竴浠�
+ CrnCommand crnCommand = new CrnCommand();
+ crnCommand.setCrnNo(command.getCrnNo());
+ crnCommand.setAckFinish(command.getAckFinish());
+ crnCommand.setTaskNo(command.getTaskNo());
+ crnCommand.setTaskMode(command.getTaskMode());
+ crnCommand.setSourcePosX(command.getSourcePosX());
+ crnCommand.setSourcePosY(command.getSourcePosY());
+ crnCommand.setSourcePosZ(command.getSourcePosZ());
+ crnCommand.setDestinationPosX(command.getDestinationPosX());
+ crnCommand.setDestinationPosY(command.getDestinationPosY());
+ crnCommand.setDestinationPosZ(command.getDestinationPosZ());
+// crnCommand.setSourceStaNo(command.getSourceStaNo());
+// crnCommand.setDestinationStaNo(command.getDestinationStaNo());
+ crnCommand.setCommand(command.getCommand());
+ if (command.getTaskNo() == 0 && command.getAckFinish() == 0 && command.getAuto() != 1) {
+ command.setTaskNo((short) 999);
+ }
+
+ command.setCrnNo(slave.getId());
+ short[] array = new short[10];
+ if (Cools.isEmpty(command.getAckFinish())) {
+ array[0] = 5;
+ } else {
+ 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 = siemensNet.Write("DB100.0", array);
+ // 鏃ュ織璁板綍
+ if (command.getAckFinish() != 1) {
+ BasCrnOptService bean = SpringUtils.getBean(BasCrnOptService.class);
+ BasCrnOpt basCrnOpt = new BasCrnOpt(
+ command.getTaskNo().intValue(), // 浠诲姟鍙�
+ command.getCrnNo(), // 鍫嗗灈鏈篬闈炵┖]
+ new Date(), // 涓嬪彂鏃堕棿
+ command.getTaskModeType() == null ? null : 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) {}
+
+ //鏇存柊鍛戒护鏃ュ織
+ CommandInfoLogService commandInfoLogService = SpringUtils.getBean(CommandInfoLogService.class);
+ CommandInfoService commandInfoService = SpringUtils.getBean(CommandInfoService.class);
+ CommandInfo commandInfo = commandInfoService.selectById(command.getCommandId());
+ if (Cools.isEmpty(commandInfo)){
+ commandInfo = commandInfoService.selectOne(new EntityWrapper<CommandInfo>()
+ .eq("wrk_no",crnProtocol.getTaskNo())
+ .eq("device","Crn"));
+ }
+ CommandInfoLog commandInfoLog = JSON.parseObject(JSON.toJSONString(commandInfo), CommandInfoLog.class);
+ commandInfoLog.setId(null);
+// CommandInfoLog commandInfoLog = new CommandInfoLog();
+// if (commandInfo != null) {
+// commandInfoLog = JSON.parseObject(JSON.toJSONString(commandInfo), CommandInfoLog.class);
+// commandInfoLog.setId(null);
+// }else {
+// Date now = new Date();
+// commandInfoLog.setCommand(JSON.toJSONString(command));
+// commandInfoLog.setCommandStatus(3);
+// commandInfoLog.setStartTime(now);
+// commandInfoLog.setExecuteTime(now);
+// commandInfoLog.setCompleteTime(now);
+// commandInfoLog.setDevice(SlaveType.Devp.toString());
+// commandInfoLog.setWrkNo(9999);
+// commandInfoLog.setTaskNo("9999");
+// commandInfoLog.setCommandDesc("鎵嬪姩鍛戒护");
+// }
+
+
+ if (result.IsSuccess) {
+// log.warn("鍫嗗灈鏈哄懡浠や笅鍙慬id:{},鏃堕棿锛歿}] >>>>> {}", slave.getId(), DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmsssss_F), JSON.toJSON(command));
+
+ Date now = new Date();
+ //鏇存柊鎸囦护鏃ュ織
+ commandInfoLog.setDeviceLog("鎸囦护涓嬪彂鎴愬姛");
+ commandInfoLogService.insert(commandInfoLog);
+
+ //绾跨▼鏆傚瓨鎸囦护ID
+ crnProtocol.setCommandId(command.getCommandId());
+
+ //鏇存柊鎸囦护鐘舵��
+ commandInfo.setCommandStatus(CommandStatusType.EXECUTE.id);//鎵ц涓�
+ commandInfo.setExecuteTime(now);
+ commandInfoService.updateById(commandInfo);
+
+ //鏇存柊浠诲姟姝ュ簭
+ TaskWrkService taskWrkService = SpringUtils.getBean(TaskWrkService.class);
+ TaskWrk taskWrk = taskWrkService.selectByWrkNo(command.getTaskNo().intValue());
+ if (taskWrk != null) {
+ taskWrk.setCommandStep(taskWrk.getCommandStep() + 1);//鏇存柊鎸囦护姝ュ簭
+ taskWrkService.updateById(taskWrk);
+ }
+
+
+ } 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());
+
+ //鏇存柊鎸囦护鏃ュ織
+ commandInfoLog.setDeviceLog("鎸囦护涓嬪彂澶辫触");
+ commandInfoLogService.insert(commandInfoLog);
+ return false;
+ }
+ try{
+ //鍫嗗灈鏈轰换鍔″啓鍏ュ悗锛屽洖璇讳竴娆★紝鐪嬫槸鍚︽垚鍔�
+ Thread.sleep(500);
+ OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 24);
+ if (resultRead.IsSuccess) {
+ CrnCommand one = new CrnCommand();
+ one.setAckFinish(siemensNet.getByteTransform().TransInt16(resultRead.Content, 0));
+ one.setTaskNo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 2));
+ //one.setTaskMode(siemensNet.getByteTransform().TransInt16(resultRead.Content, 4));
+ one.setSourcePosZ(siemensNet.getByteTransform().TransInt16(resultRead.Content, 6));
+ one.setSourcePosX(siemensNet.getByteTransform().TransInt16(resultRead.Content, 8));
+ one.setSourcePosY(siemensNet.getByteTransform().TransInt16(resultRead.Content, 10));
+ one.setDestinationPosZ(siemensNet.getByteTransform().TransInt16(resultRead.Content, 12));
+ one.setDestinationPosX(siemensNet.getByteTransform().TransInt16(resultRead.Content, 14));
+ one.setDestinationPosY(siemensNet.getByteTransform().TransInt16(resultRead.Content, 16));
+// one.setSourceStaNo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 18));
+// one.setDestinationStaNo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 20));
+ if (!crnCommand.getTaskNo().equals(one.getTaskNo()) || !crnCommand.getAckFinish().equals(one.getAckFinish())
+ || !crnCommand.getSourcePosZ().equals(one.getSourcePosZ()) || !crnCommand.getSourcePosX().equals(one.getSourcePosX()) || !crnCommand.getSourcePosY().equals(one.getSourcePosY())
+ || !crnCommand.getDestinationPosZ().equals(one.getDestinationPosZ()) || !crnCommand.getDestinationPosX().equals(one.getDestinationPosX()) || !crnCommand.getDestinationPosY().equals(one.getDestinationPosY())
+ ){
+ log.error("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲け璐id:{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), JSON.toJSON(command),JSON.toJSON(one));
+ log.error("鍫嗗灈鏈哄懡浠ゅ洖璇诲け璐ュ悗锛岄噸鏂版坊鍔犱换鍔″埌闃熷垪 ===>> [id:{}],{}", slave.getId(), JSON.toJSON(crnCommand));
+ MessageQueue.offer(SlaveType.Crn, slave.getId(), new Task(5, crnCommand));
+ Thread.sleep(100);
+ readStatus();
+ return false;
+ } else {
+ log.info("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇绘垚鍔焄id:{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), JSON.toJSON(command),JSON.toJSON(one));
+ OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
+ }
+ }
+ }catch (Exception e){
+ log.error("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲嚭閿�");
+ }
+ return true;
+ }
+
+ private boolean writeAuto(CrnCommand command){
+ if (null == command) {
+ log.error("鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�");
+ return false;
+ }
+ OperateResult result = new OperateResult();
+ short[] array = new short[1];
+ array[0] = command.getAuto();
+ if(command.getAuto() !=0){
+ array[0] = command.getAuto();
+ result = siemensNet.Write("DB103.0", array);
+ }else if (command.getOnlineWrk1() != 0){
+ array[0] = command.getOnlineWrk1();
+ result = siemensNet.Write("DB103.2", array);
+ }else if (command.getOnlineWrk2() !=0){
+ array[0] = command.getOnlineWrk2();
+ result = siemensNet.Write("DB103.4", array);
+ }else if (command.getOnlineWrk3() != 0){
+ array[0] = command.getOnlineWrk3();
+ result = siemensNet.Write("DB103.6", array);
+ }else if (command.getOnlineWrk4() != 0){
+ array[0] = command.getOnlineWrk4();
+ result = siemensNet.Write("DB103.8", array);
+ } else if (command.getReset() != 0) {
+ array[0] = command.getReset();
+ result = siemensNet.Write("DB103.10", array);
+ }
+
+
+ if (result.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}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
- log.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+ 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() {
--
Gitblit v1.9.1