#

luxiaotao1123

2020-08-27 45213eb52bf46d8734802f6d64ddf31ab8192946

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

@@ -47,7 +47,7 @@
        while (true) {
            try {
                int step = 1;
                Task task = MessageQueue.poll(SlaveType.Devp, slave.getId());
                Task task = MessageQueue.poll(SlaveType.Crn, slave.getId());
                if (task != null) {
                    step = task.getStep();
                }
@@ -130,7 +130,7 @@
                crnProtocol.setLoaded(melsecMcNet.getByteTransform().TransInt16(result.Content, 20));
                crnProtocol.setAlarm(melsecMcNet.getByteTransform().TransInt16(result.Content, 22));
                crnProtocol.setError1(melsecMcNet.getByteTransform().TransBool(result.Content, 24, 2));
                crnProtocol.setTemp1(melsecMcNet.getByteTransform().TransInt16(result.Content, 26));
                crnProtocol.setTemp1(melsecMcNet.getByteTransform().TransBool(result.Content, 26, 2));
                crnProtocol.setTemp2(melsecMcNet.getByteTransform().TransInt16(result.Content, 28));
                crnProtocol.setTemp3(melsecMcNet.getByteTransform().TransInt16(result.Content, 30));
                crnProtocol.setTemp4(melsecMcNet.getByteTransform().TransInt16(result.Content, 32));
@@ -182,7 +182,7 @@
        BasCrnpService basCrnpService = SpringUtils.getBean(BasCrnpService.class);
        BasCrnp basCrnp = new BasCrnp();
        basCrnp.setCrnNo(slave.getId());
        if (basCrnpService.updateById(crnProtocol.toSqlModel(basCrnp))){
        if (!basCrnpService.updateById(crnProtocol.toSqlModel(basCrnp))){
            log.error("堆垛机plc数据库更新失败 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
        }

@@ -212,6 +212,7 @@
            System.out.println(MessageFormat.format("【{0}】[id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
            OutputQueue.CRN.offer(MessageFormat.format("【{0}】[id:{1}] >>>>> 命令下发： {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));

            return;
        } while (false);


@@ -253,7 +254,8 @@
    public static void main(String[] args) throws InterruptedException {
        CrnSlave slave = new CrnSlave();
        slave.setId(1);
        slave.setIp("192.168.6.9");
        slave.setIp("192.168.3.39");
        slave.setPort(5015);
        slave.setRack(0);
        slave.setSlot(0);
        CrnThread crnThread = new CrnThread(slave);