Merge remote-tracking branch 'gitbit/gzynwcs' into gzynwcs

tqs

2022-10-11 9ff1f1f221aeafc99653c846b2c2442f9c033ee5

 src/main/java/com/zy/core/ServerBootstrap.java

@@ -74,10 +74,10 @@
        for (Slave car : slaveProperties.getCar()) {
            MessageQueue.init(SlaveType.Car, car);
        }
        // 初始化socket mq
        for (Slave socket : slaveProperties.getSocket()) {
            MessageQueue.init(SlaveType.Socket, socket);
        }
//        // 初始化socket mq
//        for (Slave socket : slaveProperties.getSocket()) {
//            MessageQueue.init(SlaveType.Socket, socket);
//        }
    }

    private void initThread(){
@@ -103,13 +103,13 @@
            SlaveConnection.put(SlaveType.Barcode, barcode.getId(), barcodeThread);
        }

        // 初始化条码扫描仪线程
        log.info("初始化Socket线程...................................................");
        for (SocketSlave socket : slaveProperties.getSocket()) {
            SocketThread socketThread = new SocketThread(socket);
            new Thread(socketThread).start();
            SlaveConnection.put(SlaveType.Socket, socket.getId(), socketThread);
        }
//        // 初始化条码扫描仪线程
//        log.info("初始化Socket线程...................................................");
//        for (SocketSlave socket : slaveProperties.getSocket()) {
//            SocketThread socketThread = new SocketThread(socket);
//            new Thread(socketThread).start();
//            SlaveConnection.put(SlaveType.Socket, socket.getId(), socketThread);
//        }
//        // 初始化LED线程
//        log.info("初始化LED线程...................................................");
//        for (LedSlave led : slaveProperties.getLed()) {