#

lsh

2023-03-03 669f4a3c5480172a83b94f604f3cd0448ce8aad4

 src/main/java/com/zy/core/thread/SteThread.java

@@ -11,12 +11,16 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.BasSte;
import com.zy.asrs.entity.BasSteOpt;
import com.zy.asrs.entity.WrkCharge;
import com.zy.asrs.service.BasSteOptService;
import com.zy.asrs.service.BasSteService;
import com.zy.common.model.enums.WrkChargeType;
import com.zy.core.DevpThread;
import com.zy.core.News;
import com.zy.core.ThreadHandler;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
import com.zy.core.enums.SteStatusType;
import com.zy.core.model.SteSlave;
@@ -175,7 +179,13 @@
                steProtocol.setCrnStopRun(siemensS7Net.getByteTransform().TransInt16(result.Content, 38));
                steProtocol.setCrnStopFork(siemensS7Net.getByteTransform().TransInt16(result.Content, 40));
                steProtocol.setCrnAllowRun(siemensS7Net.getByteTransform().TransInt16(result.Content, 42));
                steProtocol.setChargeStatus(siemensS7Net.getByteTransform().TransInt16(result.Content, 44));
                SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
                if (!devpThread.charge0 || devpThread.charge1){
                    steProtocol.setChargeStatus((short)1);
                }else {
                    steProtocol.setChargeStatus((short)0);
                }


                OutputQueue.STE.offer(MessageFormat.format("【{0}】[id:{1}] <<<<< 实时数据更新成功",DateUtils.convert(new Date()), slave.getId()));

@@ -286,6 +296,21 @@
            News.error("穿梭车写入命令为空");
            return false;
        }
        //判断小车是否在充电
        SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
        if (!devpThread.charge0 || devpThread.charge1){
            // led 异常显示
            LedThread ledThread1 = (LedThread) SlaveConnection.get(SlaveType.Led, 1);
            LedThread ledThread2 = (LedThread) SlaveConnection.get(SlaveType.Led, 1);
            LedThread ledThread3 = (LedThread) SlaveConnection.get(SlaveType.Led, 1);
            if (ledThread1 != null && ledThread2 != null && ledThread3 != null) {
                MessageQueue.offer(SlaveType.Led, 1, new Task(3, "穿梭车正在充电"));
                MessageQueue.offer(SlaveType.Led, 2, new Task(3, "穿梭车正在充电"));
                MessageQueue.offer(SlaveType.Led, 3, new Task(3, "穿梭车正在充电"));
            }
            News.error("穿梭车正在充电");
            return false;
        }
        command.setSteNo(slave.getId());
        OperateResult result = null;
        // 开始任务