From e7e49e01c56362fed2b9655dd286a74bb0fb1db2 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 01 四月 2025 08:29:59 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 1049 ++++++++++++++++++++++++++++++++--------------------------
1 files changed, 579 insertions(+), 470 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 6e394fd..ab05097 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -5,31 +5,29 @@
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.*;
-import com.zy.asrs.entity.param.TaskOverToWms;
-import com.zy.asrs.service.*;
-import com.zy.common.utils.HttpHandler;
+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.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.CommandPackage;
import com.zy.core.model.command.CrnCommand;
+import com.zy.core.model.cpmmandParam.CrnCommandParam;
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.*;
+import java.util.Date;
/**
* 鍫嗗灈鏈虹嚎绋�
@@ -43,22 +41,17 @@
private CrnSlave slave;
private CrnProtocol crnProtocol;
private boolean resetFlag = false;
+ private boolean resetFlagTwo = 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 Long sign = System.currentTimeMillis();
+ public boolean isRunning = true;
+
+ /**
+ * 鍫嗗灈鏈烘槸鍚﹀湪鍥炲師鐐硅繍鍔ㄤ腑鏍囪
+ */
+ private boolean backHpFlag = false;
+ private boolean backHpFlagTwo = false;
public SiemensCrnThread(CrnSlave slave) {
this.slave = slave;
@@ -67,9 +60,9 @@
@Override
@SuppressWarnings("InfiniteLoopStatement")
public void run() {
- initCrnProtocol();
this.connect();
- while (true) {
+ sign = System.currentTimeMillis();
+ while (isRunning) {
try {
int step = 1;
Task task = MessageQueue.poll(SlaveType.Crn, slave.getId());
@@ -83,7 +76,7 @@
break;
// 鍐欏叆鏁版嵁
case 2:
- write2((CrnCommand) task.getData());
+ write((CrnCommand) task.getData());
break;
// 澶嶄綅
case 3:
@@ -103,11 +96,31 @@
command.setDestinationPosZ((short)0); // 鐩爣搴撲綅灞�
write(command);
break;
- case 4:
- writeAuto((CrnCommand) task.getData());
- break;
+ // 鍐欏叆鏁版嵁
case 5:
- write((CrnCommand) task.getData());
+ write5((CrnCommand) task.getData());
+ break;
+ // 澶嶄綅
+ case 6:
+ CrnCommand command2 = (CrnCommand) task.getData();
+ if (null == command2) {
+ command2 = new CrnCommand();
+ }
+ command2.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙�
+ command2.setTaskNo((short) 0); // 宸ヤ綔鍙�
+ command2.setAckFinish((short) 1); // 浠诲姟瀹屾垚纭浣�
+ command2.setTaskMode(CrnTaskModeType.NONE); // 浠诲姟妯″紡
+ command2.setSourcePosX((short)0); // 婧愬簱浣嶆帓
+ command2.setSourcePosY((short)0); // 婧愬簱浣嶅垪
+ command2.setSourcePosZ((short)0); // 婧愬簱浣嶅眰
+ command2.setDestinationPosX((short)0); // 鐩爣搴撲綅鎺�
+ command2.setDestinationPosY((short)0); // 鐩爣搴撲綅鍒�
+ command2.setDestinationPosZ((short)0); // 鐩爣搴撲綅灞�
+ write5(command2);
+ break;
+ // 鍙屽伐浣嶅悓鏃朵綔涓�
+ case 9:
+ write9((CrnCommandParam) task.getData());
break;
default:
break;
@@ -116,24 +129,46 @@
} catch (Exception e) {
// e.printStackTrace();
}
-
+// System.out.println("绗�"+slave.getId()+"涓爢鍨涙満绾跨▼杩愯涓�杞細"+(System.currentTimeMillis()-sign));
+ sign = System.currentTimeMillis();
}
}
/**
- * 鍒濆鍖栧爢鍨涙満
+ * 鍒濆鍖栧爢鍨涙満鐘舵��
*/
- 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);
+ private void initCrn() {
+ if (null == crnProtocol) {
+ crnProtocol = new CrnProtocol();
+ }
+ crnProtocol.setMode((short) -1);
+// crnProtocol.setTaskNo((short)0);
+ crnProtocol.setStatus((short)-1);
+ crnProtocol.setStatusTwo((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);
+
+ // 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
+ BasCrnpService basCrnpService = SpringUtils.getBean(BasCrnpService.class);
+ BasCrnp basCrnp = basCrnpService.selectById(slave.getId());
+ basCrnp.setCrnSts((int)crnProtocol.getMode());
+ basCrnp.setCrnStatusOne(-1);
+ basCrnp.setCrnStatusTwo(-1);
+ if (!basCrnpService.updateById(basCrnp)){
+ log.error("鍫嗗灈鏈簆lc鏁版嵁搴撴洿鏂板け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
+ }
}
@Override
@@ -150,9 +185,7 @@
} 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杩炴帴澶辫触");
- initCrnProtocol();
+ initCrn();
}
// siemensNet.ConnectClose();
return result;
@@ -162,190 +195,148 @@
* 璇诲彇鐘舵��
*/
private void readStatus(){
-
- OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) 56);
- if (result.IsSuccess) {
- if (null == crnProtocol) {
- crnProtocol = new CrnProtocol();
+ try {
+ OperateResultExOne<byte[]> result = new OperateResultExOne<byte[]>();
+ if (slave.getId()>2 && slave.getId()<6){
+ result = siemensNet.Read("DB101.0", (short) 66);
+ } else {
+ result = siemensNet.Read("DB101.0", (short) 56);
}
- 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));
+ if (result.IsSuccess) {
+ if (null == crnProtocol) {
+ crnProtocol = new CrnProtocol();
+ crnProtocol.setCrnNo(slave.getId());
+ }
+ 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));
+ if (slave.getId()<3 || slave.getId()>5){
+ 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));
+ } else {
+ crnProtocol.setLoaded(siemensNet.getByteTransform().TransInt16(result.Content, 12));
+ crnProtocol.setTaskNoTwo(siemensNet.getByteTransform().TransInt16(result.Content, 14));
+ crnProtocol.setStatusTwo(siemensNet.getByteTransform().TransInt16(result.Content, 16));
+ crnProtocol.setBayTwo(siemensNet.getByteTransform().TransInt16(result.Content, 18));
+ crnProtocol.setLevelTwo(siemensNet.getByteTransform().TransInt16(result.Content, 20));
+ crnProtocol.setForkPosTwo(siemensNet.getByteTransform().TransInt16(result.Content, 22));
+ crnProtocol.setLoadedTwo(siemensNet.getByteTransform().TransInt16(result.Content, 24));
- OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
+ crnProtocol.setWalkPos(siemensNet.getByteTransform().TransInt16(result.Content, 26));
+ crnProtocol.setWalkPosTwo(siemensNet.getByteTransform().TransInt16(result.Content, 28));
- // 澶嶄綅淇″彿
- if (crnProtocol.getTaskFinish() == 0) {
- if (resetFlag) {
- CrnCommand crnCommand = new CrnCommand();
- crnCommand.setAckFinish((short)1);
- if (write(crnCommand)) {
- resetFlag = false;
+ crnProtocol.setLiftPos(siemensNet.getByteTransform().TransInt16(result.Content, 30));
+ crnProtocol.setAlarm(siemensNet.getByteTransform().TransInt16(result.Content, 32));
- //鍫嗗灈鏈轰换鍔″畬鎴愬悗璁块棶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= "鏈煡";
+ crnProtocol.setxSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 34));
+ crnProtocol.setySpeed(siemensNet.getByteTransform().TransInt16(result.Content, 38));
+ crnProtocol.setzSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 42));
+// crnProtocol.setzSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 42));
+
+ crnProtocol.setxDistance(siemensNet.getByteTransform().TransInt16(result.Content, 50));
+ crnProtocol.setyDistance(siemensNet.getByteTransform().TransInt16(result.Content, 54));
+ crnProtocol.setxDuration(siemensNet.getByteTransform().TransInt16(result.Content, 58));
+ crnProtocol.setyDuration(siemensNet.getByteTransform().TransInt16(result.Content, 62));
+ }
+
+ OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
+
+ // 澶嶄綅淇″彿
+ if (!Cools.isEmpty(crnProtocol.getStatusType()) && (crnProtocol.getStatusType().equals(CrnStatusType.WAITING) || crnProtocol.getStatusType().equals(CrnStatusType.SEPARATE_WAITING))) {
+ log.error("-------------------------宸ヤ綅1-------------------------绗竴姝ャ�乕鍫嗗灈鏈哄彿锛歿}, 宸ヤ綔鍙凤細{}, 杞借揣鍙�:{}]==>> 鐘舵�佷负{}锛岀瓑寰呯‘璁わ紒锛�",
+ slave.getId(),crnProtocol.getTaskNo(), crnProtocol.getLoaded()==1 ? "鏈夌墿" : "鏃犵墿",crnProtocol.getStatusType());
+ if (resetFlag) {
+ if(crnProtocol.getTaskNo()==9999){
+ backHpFlag = false;
}
- 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()); //鐩爣搴撲綅
+ CrnCommand crnCommand = new CrnCommand();
+ crnCommand.setAckFinish((short)1);
+ if (write(crnCommand)) {
+ resetFlag = false;
}
- 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浠诲姟瀹屾垚鎺ュ彛瀹屾垚锛屼絾杩斿洖澶辫触");
- }
-
}
-
-
-
}
+
+ // 澶嶄綅淇″彿
+ if (!Cools.isEmpty(crnProtocol.getStatusTypeTwo()) && (crnProtocol.getStatusTypeTwo().equals(CrnStatusType.WAITING) || crnProtocol.getStatusTypeTwo().equals(CrnStatusType.SEPARATE_WAITING))) {
+ log.error("-------------------------宸ヤ綅2-------------------------绗竴姝ャ�乕鍫嗗灈鏈哄彿锛歿}, 宸ヤ綔鍙凤細{}, 杞借揣鍙�:{}]==>> 鐘舵�佷负{}锛岀瓑寰呯‘璁わ紒锛�",
+ slave.getId(),crnProtocol.getTaskNoTwo(), crnProtocol.getLoadedTwo()==1 ? "鏈夌墿" : "鏃犵墿",crnProtocol.getStatusTypeTwo());
+ if (resetFlagTwo) {
+ if(crnProtocol.getTaskNoTwo()==9999){
+ backHpFlagTwo = false;
+ }
+ CrnCommand crnCommand = new CrnCommand();
+ crnCommand.setAckFinish((short)1);
+ if (write5(crnCommand)) {
+ resetFlagTwo = 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());
}
+ } 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();
+ }
+ }
- 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 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("鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�");
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);
- }
-
+// convertRow(command);
command.setCrnNo(slave.getId());
short[] array = new short[10];
- if (Cools.isEmpty(command.getAckFinish())) {
- array[0] = 5;
- } else {
- array[0] = command.getAckFinish();
- }
+ array[0] = command.getAckFinish();
array[1] = command.getTaskNo();
array[2] = command.getTaskMode();
array[3] = command.getSourcePosX();
@@ -354,120 +345,141 @@
array[6] = command.getDestinationPosX();
array[7] = command.getDestinationPosY();
array[8] = command.getDestinationPosZ();
+// array[9] = command.getSourceStaNo();
+// array[10] = command.getDestinationStaNo();
array[9] = command.getCommand();
-
- // 浣滀笟淇℃伅
+ OperateResult result18 = siemensNet.Write("DB100.18", (short)0);
OperateResult result = siemensNet.Write("DB100.0", array);
+ log.info("鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), array);
- if (command.getAckFinish() != 1) {
+
+
+ //鍫嗗灈鏈轰换鍔″啓鍏ュ悗锛屽洖璇讳竴娆★紝鐪嬫槸鍚︽垚鍔�
+ Thread.sleep(200);
+ int writeCount = 1;
+ do {
+ try{
+ if(!result.IsSuccess){
+ log.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(command),writeCount);
+ result = siemensNet.Write("DB100.0", array);
+ Thread.sleep(100);
+ writeCount++;
+ continue;
+ }
+ OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 24);
+ if (resultRead.IsSuccess) {
+ CrnCommand one = new CrnCommand();
+ one.setTaskNo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 2));
+ one.setTaskMode(siemensNet.getByteTransform().TransInt16(resultRead.Content, 4));
+ one.setSourcePosX(siemensNet.getByteTransform().TransInt16(resultRead.Content, 6));
+ one.setSourcePosY(siemensNet.getByteTransform().TransInt16(resultRead.Content, 8));
+ one.setSourcePosZ(siemensNet.getByteTransform().TransInt16(resultRead.Content, 10));
+ one.setDestinationPosX(siemensNet.getByteTransform().TransInt16(resultRead.Content, 12));
+ one.setDestinationPosY(siemensNet.getByteTransform().TransInt16(resultRead.Content, 14));
+ one.setDestinationPosZ(siemensNet.getByteTransform().TransInt16(resultRead.Content, 16));
+ if (!command.getTaskNo().equals(one.getTaskNo()) || !command.getTaskMode().equals(one.getTaskMode())
+ || !command.getSourcePosX().equals(one.getSourcePosX()) || !command.getSourcePosY().equals(one.getSourcePosY())
+ || !command.getSourcePosZ().equals(one.getSourcePosZ()) || !command.getDestinationPosX().equals(one.getDestinationPosX())
+ || !command.getDestinationPosY().equals(one.getDestinationPosY()) || !command.getDestinationPosZ().equals(one.getDestinationPosZ())
+ ){
+ try{
+ log.error("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲け璐�==>涓嶄竴鑷碵id:{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), JSON.toJSONString(command),JSON.toJSONString(one));
+ }catch (Exception e){
+ try{
+ log.error("鏃ュ織鎵撳嵃澶辫触锛�===>>鍙傛暟one鎶ラ敊 [id:{}],{}", slave.getId(), JSON.toJSONString(command),JSON.toJSONString(resultRead));
+ }catch (Exception e1){
+ log.error("鏃ュ織鎵撳嵃澶辫触锛�===>> [id:{}],{}", slave.getId(), JSON.toJSONString(command));
+ }
+ }
+ try{
+ Thread.sleep(100);
+ }catch (Exception e){
+
+ }
+ log.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍥炶涓嶄竴鑷� ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(command),writeCount);
+ result = siemensNet.Write("DB100.0", array);
+ writeCount++;
+ continue;
+ } else {
+ log.info("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇绘垚鍔焄id:{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), JSON.toJSONString(command),JSON.toJSONString(one));
+ break;
+ }
+ }
+ }catch (Exception e){
+ log.error("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲嚭閿�,寮傚父锛�"+e);
+ }
+ writeCount++;
+ } while (writeCount<6);
+
+ if (command.getAckFinish() == 0) {
+ short commandFinish = 1;
+ Thread.sleep(100L);
+ result = siemensNet.Write("DB100.18", commandFinish);
+ int signFinish = 1;
+ while (signFinish<5){
+ OperateResultExOne<byte[]> result10018 = siemensNet.Read("DB100.18", (short) 2);
+ short transInt16 = siemensNet.getByteTransform().TransInt16(result10018.Content, 0);
+ if (transInt16 != commandFinish){
+ log.info("涓嬪彂DB100.18 鍥炶澶辫触" + "commandFinish:"+commandFinish);
+ log.info("涓嬪彂DB100.18 鍥炶澶辫触" + "array:"+ JSON.toJSONString(array));
+ result = siemensNet.Write("DB100.18", commandFinish);
+ signFinish++;
+ }else {
+ log.info("涓嬪彂DB100.18" + "commandFinish:"+commandFinish);
+ log.info("涓嬪彂DB100.18" + "array:"+ JSON.toJSONString(array));
+ break;
+ }
+ }
+ }
+
+ try {
+ // 鏃ュ織璁板綍
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.getSourcePosZ().intValue(), // 婧愭帓
- command.getSourcePosX().intValue(), // 婧愬垪
- command.getSourcePosY().intValue(), // 婧愬眰
+ command.getTaskModeType().toString(), // 妯″紡
+ command.getSourcePosX().intValue(), // 婧愭帓
+ command.getSourcePosY().intValue(), // 婧愬垪
+ command.getSourcePosZ().intValue(), // 婧愬眰
null, // 婧愮珯
- command.getDestinationPosZ().intValue(), // 鐩爣鎺�
- command.getDestinationPosX().intValue(), // 鐩爣鍒�
- command.getDestinationPosY().intValue(), // 鐩爣灞�
+ command.getDestinationPosX().intValue(), // 鐩爣鎺�
+ command.getDestinationPosY().intValue(), // 鐩爣鍒�
+ command.getDestinationPosZ().intValue(), // 鐩爣灞�
null, // 鐩爣绔�
null, // 鍝嶅簲缁撴灉
null, // 淇敼鏃堕棿
null // 淇敼浜哄憳
);
bean.insert(basCrnOpt);
- }
+ } catch (Exception ignore) {}
- 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;
+ if (result != null && result.IsSuccess) {
+ Thread.sleep(200);
+ this.readStatus();
+ log.info("鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), JSON.toJSONString(command));
+ OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSONString(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()));
+ log.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
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.setSourcePosX(siemensNet.getByteTransform().TransInt16(resultRead.Content, 6));
- one.setSourcePosY(siemensNet.getByteTransform().TransInt16(resultRead.Content, 8));
- one.setSourcePosZ(siemensNet.getByteTransform().TransInt16(resultRead.Content, 10));
- one.setDestinationPosX(siemensNet.getByteTransform().TransInt16(resultRead.Content, 12));
- one.setDestinationPosY(siemensNet.getByteTransform().TransInt16(resultRead.Content, 14));
- one.setDestinationPosZ(siemensNet.getByteTransform().TransInt16(resultRead.Content, 16));
-// one.setSourceStaNo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 18));
-// one.setDestinationStaNo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 20));
- if (!one.getTaskNo().equals(array[1]) || !one.getAckFinish().equals(array[0])
- || !one.getSourcePosZ().equals(array[5]) || !one.getSourcePosX().equals(array[3])
- || !one.getSourcePosY().equals(array[4])
- || !one.getDestinationPosZ().equals(array[8]) || !one.getDestinationPosX().equals(array[6])
- || !one.getDestinationPosY().equals(array[7])
- ){
- log.error("浼犲弬==鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲け璐id:{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), JSON.toJSON(command),JSON.toJSON(one));
- 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;
}
/**
- * 鍐欏叆鏁版嵁
+ * 鍐欏叆鏁版嵁 宸ヤ綅2
*/
- private boolean write2(CrnCommand command){
+ private boolean write5(CrnCommand command) throws InterruptedException {
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);
- }
-
+// convertRow(command);
command.setCrnNo(slave.getId());
short[] array = new short[10];
- if (Cools.isEmpty(command.getAckFinish())) {
- array[0] = 5;
- } else {
- array[0] = command.getAckFinish();
- }
+ array[0] = command.getAckFinish();
array[1] = command.getTaskNo();
array[2] = command.getTaskMode();
array[3] = command.getSourcePosX();
@@ -476,204 +488,296 @@
array[6] = command.getDestinationPosX();
array[7] = command.getDestinationPosY();
array[8] = command.getDestinationPosZ();
+// array[9] = command.getSourceStaNo();
+// array[10] = command.getDestinationStaNo();
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) {}
+ OperateResult result18 = siemensNet.Write("DB100.38", (short)0);
+ OperateResult result = siemensNet.Write("DB100.20", array);
+ log.info("鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), array);
- //鏇存柊鍛戒护鏃ュ織
- 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 (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 (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.setSourcePosX(siemensNet.getByteTransform().TransInt16(resultRead.Content, 6));
- one.setSourcePosY(siemensNet.getByteTransform().TransInt16(resultRead.Content, 8));
- one.setSourcePosZ(siemensNet.getByteTransform().TransInt16(resultRead.Content, 10));
- one.setDestinationPosX(siemensNet.getByteTransform().TransInt16(resultRead.Content, 12));
- one.setDestinationPosY(siemensNet.getByteTransform().TransInt16(resultRead.Content, 14));
- one.setDestinationPosZ(siemensNet.getByteTransform().TransInt16(resultRead.Content, 16));
-// one.setSourceStaNo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 18));
-// one.setDestinationStaNo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 20));
- if (!one.getTaskNo().equals(array[1]) || !one.getAckFinish().equals(array[0])
- || !one.getSourcePosZ().equals(array[5]) || !one.getSourcePosX().equals(array[3])
- || !one.getSourcePosY().equals(array[4])
- || !one.getDestinationPosZ().equals(array[8]) || !one.getDestinationPosX().equals(array[6])
- || !one.getDestinationPosY().equals(array[7])
- ){
- 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(200);
+ int writeCount = 1;
+ do {
+ try{
+ if(!result.IsSuccess){
+ log.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(command),writeCount);
+ result = siemensNet.Write("DB100.20", array);
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)));
+ writeCount++;
+ continue;
+ }
+ OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.20", (short) 24);
+ if (resultRead.IsSuccess) {
+ CrnCommand one = new CrnCommand();
+ one.setTaskNo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 2));
+ one.setTaskMode(siemensNet.getByteTransform().TransInt16(resultRead.Content, 4));
+ one.setSourcePosX(siemensNet.getByteTransform().TransInt16(resultRead.Content, 6));
+ one.setSourcePosY(siemensNet.getByteTransform().TransInt16(resultRead.Content, 8));
+ one.setSourcePosZ(siemensNet.getByteTransform().TransInt16(resultRead.Content, 10));
+ one.setDestinationPosX(siemensNet.getByteTransform().TransInt16(resultRead.Content, 12));
+ one.setDestinationPosY(siemensNet.getByteTransform().TransInt16(resultRead.Content, 14));
+ one.setDestinationPosZ(siemensNet.getByteTransform().TransInt16(resultRead.Content, 16));
+ if (!command.getTaskNo().equals(one.getTaskNo()) || !command.getTaskMode().equals(one.getTaskMode())
+ || !command.getSourcePosX().equals(one.getSourcePosX()) || !command.getSourcePosY().equals(one.getSourcePosY())
+ || !command.getSourcePosZ().equals(one.getSourcePosZ()) || !command.getDestinationPosX().equals(one.getDestinationPosX())
+ || !command.getDestinationPosY().equals(one.getDestinationPosY()) || !command.getDestinationPosZ().equals(one.getDestinationPosZ())
+ ){
+ try{
+ log.error("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲け璐�==>涓嶄竴鑷碵id:{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), JSON.toJSONString(command),JSON.toJSONString(one));
+ }catch (Exception e){
+ try{
+ log.error("鏃ュ織鎵撳嵃澶辫触锛�===>>鍙傛暟one鎶ラ敊 [id:{}],{}", slave.getId(), JSON.toJSONString(command),JSON.toJSONString(resultRead));
+ }catch (Exception e1){
+ log.error("鏃ュ織鎵撳嵃澶辫触锛�===>> [id:{}],{}", slave.getId(), JSON.toJSONString(command));
+ }
+ }
+ try{
+ Thread.sleep(100);
+ }catch (Exception e){
+
+ }
+ log.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍥炶涓嶄竴鑷� ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(command),writeCount);
+ result = siemensNet.Write("DB100.20", array);
+ writeCount++;
+ continue;
+ } else {
+ log.info("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇绘垚鍔焄id:{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), JSON.toJSONString(command),JSON.toJSONString(one));
+ break;
+ }
+ }
+ }catch (Exception e){
+ log.error("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲嚭閿�,寮傚父锛�"+e);
+ }
+ writeCount++;
+ } while (writeCount<6);
+
+ if (command.getAckFinish() == 0) {
+ short commandFinish = 1;
+ Thread.sleep(100L);
+ result = siemensNet.Write("DB100.38", commandFinish);
+ int signFinish = 1;
+ while (signFinish<5){
+ OperateResultExOne<byte[]> result10018 = siemensNet.Read("DB100.38", (short) 2);
+ short transInt16 = siemensNet.getByteTransform().TransInt16(result10018.Content, 0);
+ if (transInt16 != commandFinish){
+ log.info("涓嬪彂DB100.38 鍥炶澶辫触" + "commandFinish:"+commandFinish);
+ log.info("涓嬪彂DB100.38 鍥炶澶辫触" + "array:"+ JSON.toJSONString(array));
+ result = siemensNet.Write("DB100.38", commandFinish);
+ signFinish++;
+ }else {
+ log.info("涓嬪彂DB100.38" + "commandFinish:"+commandFinish);
+ log.info("涓嬪彂DB100.38" + "array:"+ JSON.toJSONString(array));
+ break;
}
}
- }catch (Exception e){
- log.error("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲嚭閿�");
}
- return true;
+
+ try {
+ // 鏃ュ織璁板綍
+ 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 != null && result.IsSuccess) {
+ Thread.sleep(200);
+ this.readStatus();
+ log.info("鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), JSON.toJSONString(command));
+ OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSONString(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;
+ }
}
- private boolean writeAuto(CrnCommand command){
+ /**
+ * 鍐欏叆鏁版嵁 鍙屽伐浣�
+ */
+ private boolean write9(CrnCommandParam command) throws InterruptedException {
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);
+ command.setCrnNo(slave.getId());
+ short[] array = new short[22];
+ 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();
+ array[10] = command.getAckFinish2();
+ array[11] = command.getTaskNo2();
+ array[12] = command.getTaskMode2();
+ array[13] = command.getSourcePosX2();
+ array[14] = command.getSourcePosY2();
+ array[15] = command.getSourcePosZ2();
+ array[16] = command.getDestinationPosX2();
+ array[17] = command.getDestinationPosY2();
+ array[18] = command.getDestinationPosZ2();
+ array[19] = command.getCommand();
+ array[20] = (short)1;
+ array[21] = (short)1;
+ OperateResult result18 = siemensNet.Write("DB100.18", (short)0);
+ OperateResult result38 = siemensNet.Write("DB100.38", (short)0);
+ OperateResult result = siemensNet.Write("DB100.0", array);
+// OperateResult result = siemensNet.Write("DB100.20", array);
+ log.info("鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), array);
+
+ //鍫嗗灈鏈轰换鍔″啓鍏ュ悗锛屽洖璇讳竴娆★紝鐪嬫槸鍚︽垚鍔�
+ Thread.sleep(200);
+ int writeCount = 1;
+ do {
+ try{
+ if(!result.IsSuccess){
+ log.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(command),writeCount);
+ result = siemensNet.Write("DB100.0", array);
+ Thread.sleep(100);
+ writeCount++;
+ continue;
+ }
+ OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 40);
+ if (resultRead.IsSuccess) {
+ CrnCommandParam one = new CrnCommandParam();
+ one.setTaskNo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 2));
+ one.setTaskMode(siemensNet.getByteTransform().TransInt16(resultRead.Content, 4));
+ one.setSourcePosX(siemensNet.getByteTransform().TransInt16(resultRead.Content, 6));
+ one.setSourcePosY(siemensNet.getByteTransform().TransInt16(resultRead.Content, 8));
+ one.setSourcePosZ(siemensNet.getByteTransform().TransInt16(resultRead.Content, 10));
+ one.setDestinationPosX(siemensNet.getByteTransform().TransInt16(resultRead.Content, 12));
+ one.setDestinationPosY(siemensNet.getByteTransform().TransInt16(resultRead.Content, 14));
+ one.setDestinationPosZ(siemensNet.getByteTransform().TransInt16(resultRead.Content, 16));
+ one.setTaskNo2(siemensNet.getByteTransform().TransInt16(resultRead.Content, 22));
+ one.setTaskMode2(siemensNet.getByteTransform().TransInt16(resultRead.Content, 24));
+ one.setSourcePosX2(siemensNet.getByteTransform().TransInt16(resultRead.Content, 26));
+ one.setSourcePosY2(siemensNet.getByteTransform().TransInt16(resultRead.Content, 28));
+ one.setSourcePosZ2(siemensNet.getByteTransform().TransInt16(resultRead.Content, 30));
+ one.setDestinationPosX2(siemensNet.getByteTransform().TransInt16(resultRead.Content, 32));
+ one.setDestinationPosY2(siemensNet.getByteTransform().TransInt16(resultRead.Content, 34));
+ one.setDestinationPosZ2(siemensNet.getByteTransform().TransInt16(resultRead.Content, 36));
+ if (!command.getTaskNo().equals(one.getTaskNo()) || !command.getTaskMode().equals(one.getTaskMode())
+ || !command.getSourcePosX().equals(one.getSourcePosX()) || !command.getSourcePosY().equals(one.getSourcePosY())
+ || !command.getSourcePosZ().equals(one.getSourcePosZ()) || !command.getDestinationPosX().equals(one.getDestinationPosX())
+ || !command.getDestinationPosY().equals(one.getDestinationPosY()) || !command.getDestinationPosZ().equals(one.getDestinationPosZ())
+ ||
+ !command.getTaskNo2().equals(one.getTaskNo2()) || !command.getTaskMode2().equals(one.getTaskMode2())
+ || !command.getSourcePosX2().equals(one.getSourcePosX2()) || !command.getSourcePosY2().equals(one.getSourcePosY2())
+ || !command.getSourcePosZ2().equals(one.getSourcePosZ2()) || !command.getDestinationPosX2().equals(one.getDestinationPosX2())
+ || !command.getDestinationPosY2().equals(one.getDestinationPosY2()) || !command.getDestinationPosZ2().equals(one.getDestinationPosZ2())
+ ){
+ try{
+ log.error("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲け璐�==>涓嶄竴鑷碵id:{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), JSON.toJSON(command),JSON.toJSON(one));
+ }catch (Exception e){
+ try{
+ log.error("鏃ュ織鎵撳嵃澶辫触锛�===>>鍙傛暟one鎶ラ敊 [id:{}],{}", slave.getId(), JSON.toJSON(command),JSON.toJSON(resultRead));
+ }catch (Exception e1){
+ log.error("鏃ュ織鎵撳嵃澶辫触锛�===>> [id:{}],{}", slave.getId(), JSON.toJSON(command));
+ }
+ }
+ try{
+ Thread.sleep(100);
+ }catch (Exception e){
+
+ }
+ log.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍥炶涓嶄竴鑷� ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(command),writeCount);
+ result = siemensNet.Write("DB100.0", array);
+ writeCount++;
+ continue;
+ } else {
+ log.info("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇绘垚鍔焄id:{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), JSON.toJSON(command),JSON.toJSON(one));
+ break;
+ }
+ }
+ }catch (Exception e){
+ log.error("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲嚭閿�,寮傚父锛�"+e);
+ }
+ writeCount++;
+ } while (writeCount<6);
+
+ if (command.getAckFinish() == 0) {
+ short commandFinish = 1;
+ Thread.sleep(100L);
+ result18 = siemensNet.Write("DB100.18", commandFinish);
+ result38 = siemensNet.Write("DB100.38", commandFinish);
+ int signFinish = 1;
+ while (signFinish<5){
+ OperateResultExOne<byte[]> result10018 = siemensNet.Read("DB100.18", (short) 2);
+ OperateResultExOne<byte[]> result10038 = siemensNet.Read("DB100.38", (short) 2);
+ short transInt1618 = siemensNet.getByteTransform().TransInt16(result10018.Content, 0);
+ short transInt1638 = siemensNet.getByteTransform().TransInt16(result10038.Content, 0);
+ if (transInt1618 != commandFinish || transInt1638 != commandFinish){
+ log.info("涓嬪彂DB100.18/DB100.38 鍥炶澶辫触" + "commandFinish:"+commandFinish);
+ log.info("涓嬪彂DB100.18/DB100.38 鍥炶澶辫触" + "array:"+ JSON.toJSONString(array));
+ result18 = siemensNet.Write("DB100.18", commandFinish);
+ result38 = siemensNet.Write("DB100.38", commandFinish);
+ signFinish++;
+ }else {
+ log.info("涓嬪彂DB100.18/DB100.38" + "commandFinish:"+commandFinish);
+ log.info("涓嬪彂DB100.18/DB100.38" + "array:"+ JSON.toJSONString(array));
+ break;
+ }
+ }
}
+ try {
+ // 鏃ュ織璁板綍
+ 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) {
- log.warn("鍫嗗灈鏈哄懡浠や笅鍙慬id:{},鏃堕棿锛歿}] >>>>> {}", slave.getId(), DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmsssss_F), JSON.toJSON(command));
+ if (result != null && result.IsSuccess) {
+ Thread.sleep(200);
+ this.readStatus();
+ 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}] [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()));
+ log.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
return false;
}
}
+
@Override
public void close() {
@@ -795,4 +899,9 @@
}
+ // 鎻愪緵涓�涓柟娉曟潵鍋滄绾跨▼
+ public void requestStop() {
+ isRunning = false;
+ }
+
}
--
Gitblit v1.9.1