#newVersion

luxiaotao1123

2020-12-24 5b95602d75b61294e307d11b8a896312ef72ab60

#newVersion

 src/main/java/com/zy/asrs/controller/ConsoleController.java

@@ -25,7 +25,7 @@
import com.zy.core.properties.SystemProperties;
import com.zy.core.thread.BarcodeThread;
import com.zy.core.thread.SiemensCrnThread;
import com.zy.core.thread.DevpThread;
import com.zy.core.DevpThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;

 src/main/java/com/zy/asrs/controller/SiteController.java

@@ -15,7 +15,7 @@
import com.zy.core.model.Task;
import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.DevpThread;
import com.zy.core.DevpThread;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;


 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -29,7 +29,7 @@
import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.BarcodeThread;
import com.zy.core.thread.DevpThread;
import com.zy.core.DevpThread;
import com.zy.core.thread.LedThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;

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

New file
@@ -0,0 +1,13 @@
package com.zy.core;

import com.zy.core.model.protocol.StaProtocol;

import java.util.Map;

public interface DevpThread extends ThreadHandler  {

    Map<Integer, StaProtocol> getStation();

    void setPakMk(Integer siteId, boolean pakMk);

}

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

@@ -92,8 +92,18 @@
        // 初始化输送线线程
        log.info("初始化输送线线程...................................................");
        for (DevpSlave devp : slaveProperties.getDevp()) {
            DevpThread devpThread = new DevpThread(devp);
            new Thread(devpThread).start();
            DevpThread devpThread = null;
            switch (devp.getId()) {
                case 1:
                    devpThread = new SiemensDevpThread(devp);
                    break;
                case 2:

                    break;
                default:
                    break;
            }
            new Thread((Runnable) devpThread).start();
            SlaveConnection.put(SlaveType.Devp, devp.getId(), devpThread);
        }