From ab43a814da847a9e533732191b4ed54c01b95d09 Mon Sep 17 00:00:00 2001 From: lsh <lsh> Date: 星期五, 12 七月 2024 22:11:36 +0800 Subject: [PATCH] # --- src/main/java/com/zy/core/thread/SiemensCrnThread.java | 759 ++++++++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 604 insertions(+), 155 deletions(-) diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java index 5bfc407..0adeb16 100644 --- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java +++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java @@ -5,6 +5,7 @@ import HslCommunication.Profinet.Siemens.SiemensPLCS; import HslCommunication.Profinet.Siemens.SiemensS7Net; import com.alibaba.fastjson.JSON; +import com.core.common.Cools; import com.core.common.DateUtils; import com.core.common.SpringUtils; import com.zy.asrs.entity.BasCrnOpt; @@ -18,6 +19,7 @@ import com.zy.core.model.CrnSlave; import com.zy.core.model.Task; 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; @@ -37,6 +39,17 @@ private CrnSlave slave; private CrnProtocol crnProtocol; private boolean resetFlag = false; + private boolean resetFlagTwo = false; + + public Long sign = System.currentTimeMillis(); + + public boolean isRunning = true; + + /** + * 鍫嗗灈鏈烘槸鍚﹀湪鍥炲師鐐硅繍鍔ㄤ腑鏍囪 + */ + private boolean backHpFlag = false; + private boolean backHpFlagTwo = false; public SiemensCrnThread(CrnSlave slave) { this.slave = slave; @@ -46,7 +59,8 @@ @SuppressWarnings("InfiniteLoopStatement") public void run() { this.connect(); - while (true) { + sign = System.currentTimeMillis(); + while (isRunning) { try { int step = 1; Task task = MessageQueue.poll(SlaveType.Crn, slave.getId()); @@ -80,6 +94,32 @@ command.setDestinationPosZ((short)0); // 鐩爣搴撲綅灞� write(command); break; + // 鍐欏叆鏁版嵁 + case 5: + 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 7: + write9((CrnCommandParam) task.getData()); + break; default: break; } @@ -87,7 +127,45 @@ } catch (Exception e) { // e.printStackTrace(); } +// System.out.println("绗�"+slave.getId()+"涓爢鍨涙満绾跨▼杩愯涓�杞細"+(System.currentTimeMillis()-sign)); + sign = System.currentTimeMillis(); + } + } + /** + * 鍒濆鍖栧爢鍨涙満鐘舵�� + */ + 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()); } } @@ -105,8 +183,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(); } - siemensNet.ConnectClose(); +// siemensNet.ConnectClose(); return result; } @@ -114,195 +193,560 @@ * 璇诲彇鐘舵�� */ private void readStatus(){ - OperateResultExOne<byte[]> result = siemensNet.Read("DB11.2", (short) 104); - 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)); // 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 + if (result.IsSuccess) { + if (null == crnProtocol) { + crnProtocol = new CrnProtocol(); + crnProtocol.setCrnNo(slave.getId()); + } + crnProtocol.setMode(siemensNet.getByteTransform().TransInt16(result.Content, 0)); + crnProtocol.setTaskNo(siemensNet.getByteTransform().TransInt16(result.Content, 2)); + crnProtocol.setStatus(siemensNet.getByteTransform().TransInt16(result.Content, 4)); + crnProtocol.setBay(siemensNet.getByteTransform().TransInt16(result.Content, 6)); + crnProtocol.setLevel(siemensNet.getByteTransform().TransInt16(result.Content, 8)); + crnProtocol.setForkPos(siemensNet.getByteTransform().TransInt16(result.Content, 10)); - crnProtocol.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 + 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.setAlarm1(siemensNet.getByteTransform().TransInt32(result.Content, 28)); // 30 - crnProtocol.setAlarm2(siemensNet.getByteTransform().TransInt32(result.Content, 32)); // 34 - crnProtocol.setAlarm3(siemensNet.getByteTransform().TransInt32(result.Content, 36)); // 38 - crnProtocol.setAlarm4(siemensNet.getByteTransform().TransInt32(result.Content, 40)); // 42 + crnProtocol.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)); - 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.setWalkPos(siemensNet.getByteTransform().TransInt16(result.Content, 26)); + crnProtocol.setWalkPosTwo(siemensNet.getByteTransform().TransInt16(result.Content, 28)); - // 閫熷害 - crnProtocol.setXSpeed((float) siemensNet.getByteTransform().TransInt16(result.Content, 22)); // 24 - crnProtocol.setYSpeed((float) siemensNet.getByteTransform().TransInt16(result.Content, 24)); // 26 - crnProtocol.setZSpeed((float) siemensNet.getByteTransform().TransInt16(result.Content, 26)); // 28 - // 绱閲岀▼銆佹椂闀� - crnProtocol.setXDuration((float) siemensNet.getByteTransform().TransInt32(result.Content, 88)); // 90 - crnProtocol.setYDistance((float) siemensNet.getByteTransform().TransInt32(result.Content, 92)); // 94 - crnProtocol.setXDuration((float) siemensNet.getByteTransform().TransInt32(result.Content, 96)); // 98 - crnProtocol.setYDuration((float) siemensNet.getByteTransform().TransInt32(result.Content, 100)); // 102 + crnProtocol.setLiftPos(siemensNet.getByteTransform().TransInt16(result.Content, 30)); + crnProtocol.setAlarm(siemensNet.getByteTransform().TransInt16(result.Content, 32)); - // 澧炲己 - 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); - } + 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)); - OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId())); + 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)); + } - // 澶嶄綅淇″彿 - if (crnProtocol.getTaskFinish() == 1) { - if (resetFlag) { - CrnCommand crnCommand = new CrnCommand(); - crnCommand.setAckFinish((short)1); - if (write(crnCommand)) { - resetFlag = false; + OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId())); + + // 澶嶄綅淇″彿 + if (!Cools.isEmpty(crnProtocol.getStatusType()) && (crnProtocol.getStatusType().equals(CrnStatusType.WAITING) || 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; + } + CrnCommand crnCommand = new CrnCommand(); + crnCommand.setAckFinish((short)1); + if (write(crnCommand)) { + resetFlag = false; + } } - } + + // 澶嶄綅淇″彿 + 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()); - if (!basCrnpService.updateById(crnProtocol.toSqlModel(basCrnp))){ - log.error("鍫嗗灈鏈簆lc鏁版嵁搴撴洿鏂板け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()); - } - } catch (Exception ignore){} - - } else { - OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戣鍙栧爢鍨涙満plc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot())); - log.error("璇诲彇鍫嗗灈鏈簆lc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()); + private void convertRow(CrnCommand crnCommand) { + if (crnCommand.getSourcePosX() != null && crnCommand.getSourcePosX() != 0) { + crnCommand.setSourcePosX((short) (crnCommand.getSourcePosX() - ((slave.getId() - 1) * 4))); + } + if (crnCommand.getDestinationPosX() != null && crnCommand.getDestinationPosX() != 0) { + crnCommand.setDestinationPosX((short) (crnCommand.getDestinationPosX() - ((slave.getId() - 1) * 4))); } } /** * 鍐欏叆鏁版嵁 */ - private boolean write(CrnCommand command){ + private boolean write(CrnCommand command) throws InterruptedException { if (null == command) { log.error("鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�"); return false; } - if (command.getTaskNo() == 0) { - command.setTaskNo((short) 9999); - } +// convertRow(command); command.setCrnNo(slave.getId()); - short[] array = new short[9]; - if (!command.getTaskModeType().equals(CrnTaskModeType.CLEAR)) { - array[0] = 5; - } else { - array[0] = 7; - } - array[1] = command.getSourcePosZ(); - array[2] = command.getSourcePosY(); + short[] array = new short[10]; + array[0] = command.getAckFinish(); + array[1] = command.getTaskNo(); + array[2] = command.getTaskMode(); array[3] = command.getSourcePosX(); - array[4] = command.getDestinationPosZ(); - array[5] = command.getDestinationPosY(); + array[4] = command.getSourcePosY(); + array[5] = command.getSourcePosZ(); array[6] = command.getDestinationPosX(); - array[7] = command.getSourceStaNo(); - array[8] = command.getDestinationStaNo(); - // 浣滀笟淇℃伅 - OperateResult result = siemensNet.Write("DB1000.0", array); - // 浠诲姟鍙� - OperateResult result1 = siemensNet.Write("DB1000.24", command.getTaskNo()); - // 缁撴潫浣� - OperateResult result2 = siemensNet.Write("DB1000.28.1", true); - // 鏃ュ織璁板綍 - try { - if (command.getAckFinish() != 1) { - BasCrnOptService bean = SpringUtils.getBean(BasCrnOptService.class); - BasCrnOpt basCrnOpt = new BasCrnOpt( - command.getTaskNo().intValue(), // 浠诲姟鍙� - command.getCrnNo(), // 鍫嗗灈鏈篬闈炵┖] - new Date(), // 涓嬪彂鏃堕棿 - command.getTaskModeType().toString(), // 妯″紡 - command.getSourcePosX().intValue(), // 婧愭帓 - command.getSourcePosY().intValue(), // 婧愬垪 - command.getSourcePosZ().intValue(), // 婧愬眰 - null, // 婧愮珯 - command.getDestinationPosX().intValue(), // 鐩爣鎺� - command.getDestinationPosY().intValue(), // 鐩爣鍒� - command.getDestinationPosZ().intValue(), // 鐩爣灞� - null, // 鐩爣绔� - null, // 鍝嶅簲缁撴灉 - null, // 淇敼鏃堕棿 - null // 淇敼浜哄憳 - ); - bean.insert(basCrnOpt); + 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); + + + + //鍫嗗灈鏈轰换鍔″啓鍏ュ悗锛屽洖璇讳竴娆★紝鐪嬫槸鍚︽垚鍔� + 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().toString(), // 妯″紡 + command.getSourcePosX().intValue(), // 婧愭帓 + command.getSourcePosY().intValue(), // 婧愬垪 + command.getSourcePosZ().intValue(), // 婧愬眰 + null, // 婧愮珯 + command.getDestinationPosX().intValue(), // 鐩爣鎺� + command.getDestinationPosY().intValue(), // 鐩爣鍒� + command.getDestinationPosZ().intValue(), // 鐩爣灞� + null, // 鐩爣绔� + null, // 鍝嶅簲缁撴灉 + null, // 淇敼鏃堕棿 + null // 淇敼浜哄憳 + ); + bean.insert(basCrnOpt); } catch (Exception ignore) {} - if (result.IsSuccess && result1.IsSuccess && result2.IsSuccess) { + 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; + } + } + /** + * 鍐欏叆鏁版嵁 宸ヤ綅2 + */ + private boolean write5(CrnCommand command) throws InterruptedException { + if (null == command) { + log.error("鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�"); + return false; + } +// convertRow(command); + command.setCrnNo(slave.getId()); + short[] array = new short[10]; + array[0] = command.getAckFinish(); + array[1] = command.getTaskNo(); + array[2] = command.getTaskMode(); + array[3] = command.getSourcePosX(); + array[4] = command.getSourcePosY(); + array[5] = command.getSourcePosZ(); + array[6] = command.getDestinationPosX(); + array[7] = command.getDestinationPosY(); + array[8] = command.getDestinationPosZ(); +// array[9] = command.getSourceStaNo(); +// array[10] = command.getDestinationStaNo(); + array[9] = command.getCommand(); + OperateResult result18 = siemensNet.Write("DB100.38", (short)0); + 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.toJSONString(command),writeCount); + result = siemensNet.Write("DB100.20", array); + Thread.sleep(100); + 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; + } + } + } + + 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; + } + } + + /** + * 鍐欏叆鏁版嵁 宸ヤ綅2 + */ + private boolean write9(CrnCommandParam command) throws InterruptedException { + if (null == command) { + log.error("鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�"); + return false; + } +// convertRow(command); + command.setCrnNo(slave.getId()); + short[] array = new short[10]; + array[0] = command.getAckFinish(); + array[1] = command.getTaskNo(); + array[2] = command.getTaskMode(); + array[3] = command.getSourcePosX(); + array[4] = command.getSourcePosY(); + array[5] = command.getSourcePosZ(); + array[6] = command.getDestinationPosX(); + array[7] = command.getDestinationPosY(); + array[8] = command.getDestinationPosZ(); +// array[9] = command.getSourceStaNo(); +// array[10] = command.getDestinationStaNo(); + array[9] = command.getCommand(); + OperateResult result18 = siemensNet.Write("DB100.38", (short)0); + 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.20", array); + Thread.sleep(100); + 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.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.20", 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); + 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; + } + } + } + + 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.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() { @@ -424,4 +868,9 @@ } + // 鎻愪緵涓�涓柟娉曟潵鍋滄绾跨▼ + public void requestStop() { + isRunning = false; + } + } -- Gitblit v1.9.1