From 123a6f57a1e52980b323de65e5642148e4348ff3 Mon Sep 17 00:00:00 2001 From: yxFwq <1> Date: 星期二, 10 六月 2025 15:04:53 +0800 Subject: [PATCH] # --- src/main/java/com/zy/core/thread/JarThread.java | 435 ++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 404 insertions(+), 31 deletions(-) diff --git a/src/main/java/com/zy/core/thread/JarThread.java b/src/main/java/com/zy/core/thread/JarThread.java index 1268aff..3f3fdc2 100644 --- a/src/main/java/com/zy/core/thread/JarThread.java +++ b/src/main/java/com/zy/core/thread/JarThread.java @@ -4,11 +4,14 @@ import HslCommunication.Core.Types.OperateResultExOne; import HslCommunication.Profinet.Siemens.SiemensPLCS; import HslCommunication.Profinet.Siemens.SiemensS7Net; +import com.alibaba.fastjson.JSON; import com.core.common.DateUtils; import com.core.common.SpringUtils; import com.core.exception.CoolException; import com.zy.asrs.entity.BasJar; +import com.zy.asrs.entity.BasSteOpt; import com.zy.asrs.service.BasJarService; +import com.zy.asrs.service.BasSteOptService; import com.zy.core.News; import com.zy.core.ThreadHandler; import com.zy.core.cache.MessageQueue; @@ -17,6 +20,7 @@ import com.zy.core.enums.SlaveType; import com.zy.core.model.JarSlave; import com.zy.core.model.Task; +import com.zy.core.model.command.JarCommand; import com.zy.core.model.protocol.JarProtocol; import lombok.Data; import lombok.extern.slf4j.Slf4j; @@ -26,8 +30,7 @@ /** * shuttle 纭寲缃愮嚎绋� - * Created by vincent on 2020/8/4 - * 涓嶈兘鏈� 妲藉彿 鍜� 鏈烘灦鍙� + * Created by vincent on 2024/3/01 */ @Data @Slf4j @@ -37,6 +40,8 @@ private JarSlave slave; private JarProtocol jarProtocol; private short heartBeatVal = 1; + private boolean connectJar = false; + public JarThread(JarSlave slave) { this.slave = slave; @@ -45,7 +50,33 @@ @Override @SuppressWarnings("InfiniteLoopStatement") public void run() { - this.connect(); + + connectJar = this.connect(); + while(!connectJar){ + try { + connectJar = this.connect(); + Thread.sleep(100); + } catch (Exception e){ + + } + } + + // 鍚姩绾跨▼鑷姩閲嶈繛 + new Thread(this::jarConnect).start(); + + // 鍚姩璇绘暟鎹嚎绋� + new Thread(this::readStatusJar).start(); + + // 鍚姩浠诲姟涓嬪彂绾跨▼ + new Thread(this::taskIssued).start(); + + + } + + /** + * 浠诲姟涓嬪彂 + */ + private void taskIssued() { while (true) { try { int step = 1; @@ -56,53 +87,107 @@ switch (step) { // 璇绘暟鎹� case 1: - readStatus(); +// readStatus(); + break; + // 鍐欐暟鎹� ID+鐩爣绔� + case 2: + write((JarCommand) task.getData()); break; default: break; } // 蹇冭烦 // heartbeat(); - Thread.sleep(500); + Thread.sleep(200); } catch (Exception e) { - e.printStackTrace(); + log.error("JAR鍐欑嚎绋嬪紓甯�"+e.getMessage()); + +// e.printStackTrace(); } } + } + + private void jarConnect() { + while (true) { + try { + Thread.sleep(1000); + if(!connectJar){ + try { + connectJar = this.connect(); + Thread.sleep(100); + } catch (Exception e){ + + } + } + } catch (Exception e) { + log.error("jar杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort()); + initSte(); +// e.printStackTrace(); + } + } + } + + private void readStatusJar() { + while (true) { + try { + Thread.sleep(50); +// System.out.println("璇荤嚎绋�"+ slave.getId()); + + readStatus(); + + } catch (Exception e) { + log.error("JAR鏁版嵁璇诲彇绾跨▼寮傚父锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort()); + + initSte(); +// e.printStackTrace(); + } + + } + } /** * 鍒濆鍖栧爢鍨涙満鐘舵�� */ private void initSte() { - if (null == jarProtocol) { - jarProtocol = new JarProtocol(); + try{ + if (null == jarProtocol) { + jarProtocol = new JarProtocol(); + } + jarProtocol.setJarNo(slave.getId()); + jarProtocol.setMode( 0); + jarProtocol.setStatus(JarStatusType.OFF_LINE); + jarProtocol.setJarErr(0); + } catch (Exception e){ + log.error("JAR鍒濆鍖栧紓甯革紒锛侊紒 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort()); } - jarProtocol.setJarNo(slave.getId()); - jarProtocol.setMode( 0); - jarProtocol.setStatus(JarStatusType.OFF_LINE); - jarProtocol.setJarErr(0); } @Override public boolean connect() { boolean result = false; - // 涓嶈兘鏈� 妲藉彿 鍜� 鏈烘灦鍙� - siemensS7Net = new SiemensS7Net(SiemensPLCS.S200Smart, slave.getIp()); + + try{ + // 涓嶈兘鏈� 妲藉彿 鍜� 鏈烘灦鍙� + siemensS7Net = new SiemensS7Net(SiemensPLCS.S200Smart, slave.getIp()); // siemensS7Net.setRack(slave.getRack().byteValue()); // siemensS7Net.setSlot(slave.getSlot().byteValue()); - OperateResult connect = siemensS7Net.ConnectServer(); - if(connect.IsSuccess){ - result = true; - OutputQueue.STE.offer(MessageFormat.format( "銆恵0}銆戠~鍖栫綈plc杩炴帴鎴愬姛 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort())); - News.info("纭寲缃恜lc杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort()); - } else { - OutputQueue.STE.offer(MessageFormat.format("銆恵0}銆戠~鍖栫綈plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{1}] [ip:{2}] [port:{3}] ", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort())); - News.error("纭寲缃恜lc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort()); - initSte(); + OperateResult connect = siemensS7Net.ConnectServer(); + if(connect.IsSuccess){ + result = true; + OutputQueue.STE.offer(MessageFormat.format( "銆恵0}銆戠~鍖栫綈plc杩炴帴鎴愬姛 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort())); + News.info("纭寲缃恜lc杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort()); + } else { + OutputQueue.STE.offer(MessageFormat.format("銆恵0}銆戠~鍖栫綈plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{1}] [ip:{2}] [port:{3}] ", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort())); + News.error("纭寲缃恜lc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort()); + initSte(); + } + } catch (Exception e){ + log.error("纭寲缃恜lc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort()); } -// melsecMcNet.ConnectClose(); return result; +// melsecMcNet.ConnectClose(); } /** @@ -110,22 +195,137 @@ */ private void readStatus(){ try { - OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) 10); - if (result.IsSuccess) { + if (slave.getId()>4){ if (null == jarProtocol) { jarProtocol = new JarProtocol(); jarProtocol.setJarNo(slave.getId()); } - jarProtocol.setMode(siemensS7Net.getByteTransform().TransInt32(result.Content, 2)); - jarProtocol.setStatus(siemensS7Net.getByteTransform().TransInt16(result.Content, 4)); + jarProtocol.setJarNo(slave.getId()); + jarProtocol.setMode(2);//妯″紡 + jarProtocol.setStatus((short)0);//鐘舵�� + jarProtocol.setAutoing(true);//鑷姩 + + jarProtocol.setRightDoor(true);//宸﹂棬鐘舵�� //鍑烘枡闂� + jarProtocol.setLeftDoor(true);//鍙抽棬鐘舵�� //杩涙枡闂� + + jarProtocol.setLeftDoorOpen(0);//open the left door //杩涙枡闂� + jarProtocol.setLeftDoorClose(0);//close the left door //杩涙枡闂� + jarProtocol.setRightDoorOpen(0);//open the right door //鍑烘枡闂� + jarProtocol.setRightDoorClose(0);//close the right door //鍑烘枡闂� + + jarProtocol.setJarTemperature(0.0F); + return; + } + OperateResultExOne<byte[]> result = siemensS7Net.Read("V300", (short) 30); + OperateResultExOne<byte[]> result338 = siemensS7Net.Read("V338", (short) 4); + if (result.IsSuccess && result338.IsSuccess) { + if (null == jarProtocol) { + jarProtocol = new JarProtocol(); + jarProtocol.setJarNo(slave.getId()); + } + jarProtocol.setJarNo(slave.getId()); + if (slave.getId() == 1 || slave.getId() == 3){ + jarProtocol.setRightDoor(siemensS7Net.getByteTransform().TransInt16(result.Content, 0) != 0);//宸﹂棬鐘舵�� //鍑烘枡闂� + jarProtocol.setLeftDoor(siemensS7Net.getByteTransform().TransInt16(result.Content, 2) != 0);//鍙抽棬鐘舵�� //杩涙枡闂� + jarProtocol.setRightInEnable(siemensS7Net.getByteTransform().TransInt16(result.Content, 4) != 0);//宸﹂棬鍙紑 //鍑烘枡闂� + jarProtocol.setRightOutEnable(siemensS7Net.getByteTransform().TransInt16(result.Content, 6) != 0);//宸﹂棬鍙叧 //鍑烘枡闂� + jarProtocol.setLeftInEnable(siemensS7Net.getByteTransform().TransInt16(result.Content, 8) != 0);//鍙抽棬鍙紑 //杩涙枡闂� + jarProtocol.setLeftOutEnable(siemensS7Net.getByteTransform().TransInt16(result.Content, 10) != 0);//鍙抽棬鍙叧 //杩涙枡闂� + jarProtocol.setRightDoorOpen((int)siemensS7Net.getByteTransform().TransInt16(result.Content, 18));//open the left door //鍑烘枡闂� + jarProtocol.setRightDoorClose((int)siemensS7Net.getByteTransform().TransInt16(result.Content, 20));//close the left door //鍑烘枡闂� + jarProtocol.setLeftDoorOpen((int)siemensS7Net.getByteTransform().TransInt16(result.Content, 22));//open the right door //杩涙枡闂� + jarProtocol.setLeftDoorClose((int)siemensS7Net.getByteTransform().TransInt16(result.Content, 24));//close the right door //杩涙枡闂� + } else { + jarProtocol.setLeftDoor(siemensS7Net.getByteTransform().TransInt16(result.Content, 0) != 0);//宸﹂棬鐘舵�� //杩涙枡闂� + jarProtocol.setRightDoor(siemensS7Net.getByteTransform().TransInt16(result.Content, 2) != 0);//鍙抽棬鐘舵�� //鍑烘枡闂� + jarProtocol.setLeftInEnable(siemensS7Net.getByteTransform().TransInt16(result.Content, 4) != 0);//宸﹂棬鍙紑 //杩涙枡闂� + jarProtocol.setLeftOutEnable(siemensS7Net.getByteTransform().TransInt16(result.Content, 6) != 0);//宸﹂棬鍙叧 //杩涙枡闂� + jarProtocol.setRightInEnable(siemensS7Net.getByteTransform().TransInt16(result.Content, 8) != 0);//鍙抽棬鍙紑 //鍑烘枡闂� + jarProtocol.setRightOutEnable(siemensS7Net.getByteTransform().TransInt16(result.Content, 10) != 0);//鍙抽棬鍙叧 //鍑烘枡闂� + jarProtocol.setLeftDoorOpen((int)siemensS7Net.getByteTransform().TransInt16(result.Content, 18));//open the left door //杩涙枡闂� + jarProtocol.setLeftDoorClose((int)siemensS7Net.getByteTransform().TransInt16(result.Content, 20));//close the left door //杩涙枡闂� + jarProtocol.setRightDoorOpen((int)siemensS7Net.getByteTransform().TransInt16(result.Content, 22));//open the right door //鍑烘枡闂� + jarProtocol.setRightDoorClose((int)siemensS7Net.getByteTransform().TransInt16(result.Content, 24));//close the right door //鍑烘枡闂� + } + jarProtocol.setMode((int)siemensS7Net.getByteTransform().TransInt16(result.Content, 12));//妯″紡 + jarProtocol.setJarErr((int)siemensS7Net.getByteTransform().TransInt16(result.Content, 14));//寮傚父鐮� + jarProtocol.setStatus(siemensS7Net.getByteTransform().TransInt16(result.Content, 16));//鐘舵�� + jarProtocol.setJarTemperature(siemensS7Net.getByteTransform().TransSingle(result.Content, 26));//娓╁害 + + jarProtocol.setJarPressure(siemensS7Net.getByteTransform().TransSingle(result338.Content, 0));//鍘嬪姏 + + jarProtocol.setAutoing(siemensS7Net.getByteTransform().TransInt16(result.Content, 12) == 2);//鑷姩 + +// if (jarProtocol.statusType .equals(JarStatusType.SOS)){ +// jarProtocol.setHoldingSign(!jarProtocol.getStatus().equals(jarProtocol.getUpStatus())); +// } else + if (jarProtocol.statusType .equals(JarStatusType.SOS2)){ + jarProtocol.setHoldingSign(!jarProtocol.getStatus().equals(jarProtocol.getUpStatus())); + if (!jarProtocol.rightDoorClose.equals(jarProtocol.leftDoorClose)) { + if (jarProtocol.rightDoorClose == 0 || jarProtocol.leftDoorClose == 0){ + if (jarProtocol.rightDoorClose == 2 || jarProtocol.leftDoorClose == 2){ + jarProtocol.setLeftDoorClose(0);//close the left door //杩涙枡闂� + jarProtocol.setRightDoorClose(0);//close the right door //鍑烘枡闂� + } + } + if (jarProtocol.rightDoorOpen == 0 || jarProtocol.leftDoorOpen == 0){ + if (jarProtocol.rightDoorOpen == 2 || jarProtocol.leftDoorOpen == 2){ + jarProtocol.setLeftDoorOpen(0);//open the left door //杩涙枡闂� + jarProtocol.setRightDoorOpen(0);//open the right door //鍑烘枡闂� + } + } + } + } else if (jarProtocol.statusType .equals(JarStatusType.WAITING3) || jarProtocol.statusType .equals(JarStatusType.WAITING4)){ + jarProtocol.setOpenDoorSign(!jarProtocol.getStatus().equals(jarProtocol.getUpStatus())); + } else if (jarProtocol.statusType .equals(JarStatusType.WAITING5) || jarProtocol.statusType .equals(JarStatusType.OFF_LINE)){ + jarProtocol.setCloseDoorSign(!jarProtocol.getStatus().equals(jarProtocol.getUpStatus())); + } else if (jarProtocol.leftDoorOpen==1 || jarProtocol.leftDoorClose==1 || + jarProtocol.rightDoorOpen==1 || jarProtocol.rightDoorClose==1){ + + } else { + if (jarProtocol.statusType .equals(JarStatusType.WAITING2)){ + + if (jarProtocol.rightDoorOpen == 2 || jarProtocol.leftDoorOpen == 2){ + jarProtocol.setLeftDoorOpen(0);//open the left door //杩涙枡闂� + jarProtocol.setRightDoorOpen(0);//open the right door //鍑烘枡闂� + } + if (jarProtocol.rightDoorClose == 2 || jarProtocol.leftDoorClose == 2){ + jarProtocol.setLeftDoorClose(0);//close the left door //杩涙枡闂� + jarProtocol.setRightDoorClose(0);//close the right door //鍑烘枡闂� + } + } else if (jarProtocol.statusType .equals(JarStatusType.WAITING1) || jarProtocol.statusType .equals(JarStatusType.MOVING)){ + if (!jarProtocol.rightDoorOpen.equals(jarProtocol.leftDoorOpen)) { + if (jarProtocol.rightDoorOpen == 0 || jarProtocol.leftDoorOpen == 0){ + if (jarProtocol.rightDoorOpen == 2 || jarProtocol.leftDoorOpen == 2){ + jarProtocol.setLeftDoorOpen(0);//open the left door //杩涙枡闂� + jarProtocol.setRightDoorOpen(0);//open the right door //鍑烘枡闂� + } + } + } + if (jarProtocol.rightDoorClose == 0 || jarProtocol.leftDoorClose == 0){ + if (jarProtocol.rightDoorClose == 2 || jarProtocol.leftDoorClose == 2){ + jarProtocol.setLeftDoorClose(0);//close the left door //杩涙枡闂� + jarProtocol.setRightDoorClose(0);//close the right door //鍑烘枡闂� + } + } + } + } + + jarProtocol.setUpStatus(jarProtocol.getStatus()); +// +// jarProtocol.setMode(2);//妯″紡 +// jarProtocol.setStatus((short)6);//鐘舵�� +// jarProtocol.setLeftDoorOpen(0);//open the left door //杩涙枡闂� +// jarProtocol.setLeftDoorClose(0);//close the left door //杩涙枡闂� +// jarProtocol.setRightDoorOpen(0);//open the right door //鍑烘枡闂� +// jarProtocol.setRightDoorClose(0);//close the right door //鍑烘枡闂� + // 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴� BasJarService service = SpringUtils.getBean(BasJarService.class); if (null != service) { // 鍚屾pakMk - BasJar one = service.selectById(slave.getId()); - - BasJar basJar = new BasJar(); + BasJar basJar = service.selectById(slave.getId()); basJar.setJarNo(slave.getId()); if (!service.updateById(jarProtocol.toSqlModel(basJar))){ News.error("纭寲缃恜lc鏁版嵁搴撴洿鏂板け璐� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort()); @@ -138,6 +338,7 @@ } } catch (Exception e) { // e.printStackTrace(); + log.error("纭寲缃恜lc鐘舵�佷俊鎭け璐�"+e.getMessage()); OutputQueue.STE.offer(MessageFormat.format("銆恵0}銆戣鍙栫~鍖栫綈plc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort())); // News.error("璇诲彇绌挎杞lc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort()); initSte(); @@ -145,6 +346,178 @@ } + /** + * 鍐欏叆鏁版嵁 + */ + private synchronized boolean write(JarCommand command){ + if (null == command) { + News.error("绌挎杞﹀啓鍏ュ懡浠や负绌�"); + return false; + } + + command.setJarNo(slave.getId()); + OperateResult result1 = null; + String resultV1 = ""; + short resultS1 = 0; + OperateResult result2 = null; + String resultV2 = null; + short resultS2 = 0; + + switch (command.getTaskModeType().id){ + case 1: + case 2: + case 3: + case 4: + return false; + case 5://寮�闂� + resultV1 = "V318"; + resultV2 = "V320"; + resultS1 = (short)1; + resultS2 = (short)1; + break; + case 6://鍏抽棬 + resultV1 = "V322"; + resultV2 = "V324"; + resultS1 = (short)1; + resultS2 = (short)1; + break; + case 7: + case 8: + return false; + case 9: + resultV1 = "V318"; + resultV2 = "V320"; + break; + case 10: + resultV1 = "V322"; + resultV2 = "V324"; + break; + default: + return false; + } + + result1 = siemensS7Net.Write(resultV1, resultS1); + result2 = siemensS7Net.Write(resultV2, resultS2); + //纭寲缃愪换鍔″啓鍏ュ悗锛屽洖璇讳竴娆★紝鐪嬫槸鍚︽垚鍔� + try { + Thread.sleep(200); + } catch (InterruptedException e) { + e.printStackTrace(); + } + int writeCount = 1; + do { + try{ + if(!result1.IsSuccess){ + log.error("鍐欏叆纭寲缃恜lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(command),writeCount); + result1 = siemensS7Net.Write(resultV1, resultS1); + Thread.sleep(100); + writeCount++; + continue; + } + OperateResultExOne<byte[]> resultRead1 = siemensS7Net.Read(resultV1, (short) 2); + if (resultRead1.IsSuccess) { + short transInt16 = siemensS7Net.getByteTransform().TransInt16(resultRead1.Content, 0); + if (transInt16 == resultS1 || transInt16 == (short) 2 || transInt16 == (short) 3){ + break; + } else { + log.error("鍐欏叆纭寲缃恜lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(command),writeCount); + result1 = siemensS7Net.Write(resultV1, resultS1); + Thread.sleep(100); + writeCount++; + continue; + } + } else { + log.error("鍐欏叆纭寲缃恜lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(command),writeCount); + result1 = siemensS7Net.Write(resultV1, resultS1); + Thread.sleep(100); + writeCount++; + continue; + } + }catch (Exception e){ + log.error("鍐欏叆纭寲缃恜lc鏁版嵁鍚庡洖璇诲嚭閿�,寮傚父锛�"+e); + } + writeCount++; + } while (writeCount<6); + + writeCount = 1; + do { + try{ + if(!result2.IsSuccess){ + log.error("鍐欏叆纭寲缃恜lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(command),writeCount); + result2 = siemensS7Net.Write(resultV2, resultS2); + Thread.sleep(100); + writeCount++; + continue; + } + OperateResultExOne<byte[]> resultRead2 = siemensS7Net.Read(resultV2, (short) 2); + if (resultRead2.IsSuccess) { + short transInt16 = siemensS7Net.getByteTransform().TransInt16(resultRead2.Content, 0); + if (transInt16 == resultS2 || transInt16 == (short) 3){ + break; + } else { + log.error("鍐欏叆纭寲缃恜lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(command),writeCount); + result2 = siemensS7Net.Write(resultV2, resultS2); + Thread.sleep(100); + writeCount++; + continue; + } + } else { + log.error("鍐欏叆纭寲缃恜lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(command),writeCount); + result2 = siemensS7Net.Write(resultV2, resultS2); + Thread.sleep(100); + writeCount++; + continue; + } + }catch (Exception e){ + log.error("鍐欏叆纭寲缃恜lc鏁版嵁鍚庡洖璇诲嚭閿�,寮傚父锛�"+e); + } + writeCount++; + } while (writeCount<6); + + try { + // 鏃ュ織璁板綍 + if (command.getTaskMode() != 0) { + BasSteOptService bean = SpringUtils.getBean(BasSteOptService.class); + if (null != bean) { + BasSteOpt basSteOpt = new BasSteOpt( + command.getTaskNo(), // 浠诲姟鍙� + command.getJarNo(), // 纭寲缃� + new Date(), // 涓嬪彂鏃堕棿 + command.getTaskModeType().desc, // 浣滀笟 + null, // 婧愭帓 + null, // 婧愬垪 + null, // 婧愬眰 + null, // 婧愮珯 + null, // 鐩爣鎺� + null, // 鐩爣鍒� + null, // 鐩爣灞� + null, // 鐩爣绔� + null, // 鍝嶅簲缁撴灉 + null, // 淇敼鏃堕棿 + null, // 淇敼浜哄憳 + null // 澶囨敞 + ); + bean.insert(basSteOpt); + } + } + } catch (Exception ignore) {} + + if (result1 != null && result1.IsSuccess && result2 != null && result2.IsSuccess ) { + + News.info("纭寲缃愬懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), JSON.toJSONString(command)); + OutputQueue.STE.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 纭寲缃愬懡浠や笅鍙戯細 {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSONString(command))); + try { + Thread.sleep(500); + } catch (Exception e){ } + return true; + } else { + OutputQueue.STE.offer(MessageFormat.format("銆恵0}銆戝啓鍏ョ~鍖栫綈plc鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort())); + News.error("鍐欏叆纭寲缃恜lc鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort()); + initSte(); + return false; + } + } + @Override public void close() { // siemensS7Net.ConnectClose(); -- Gitblit v1.9.1