#

luxiaotao1123

2020-08-06 687d250bf7f02bebc03e660933a2669fa28d93b5

#

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

@@ -11,9 +11,11 @@
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.WrkDetlService;
import com.zy.common.model.StartupDto;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.DevpSlave;
import com.zy.core.model.Task;
import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.BarcodeThread;
@@ -124,8 +126,12 @@
                        throw new CoolException("改变库位状态失败");
                    }

                    // 下发plc命令

                    // 更新站点信息 且 下发plc命令
                    staProtocol
                    boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task<>(4, staProtocol));
                    if (!result) {
                        throw new CoolException("更新plc站点信息失败");
                    }

                }

@@ -135,4 +141,8 @@

    }

    public static void main(String[] args) {

    }

}

 src/main/java/com/zy/core/model/Task.java

@@ -6,8 +6,17 @@
 * Created by vincent on 2020/8/5
 */
@Data
public class Task {
public class Task<T> {

    private int id;
    private Integer step;

    private T data;

    public Task() {
    }

    public Task(Integer step, T data) {
        this.step = step;
        this.data = data;
    }
}

 src/main/java/com/zy/core/model/protocol/StaProtocol.java

@@ -9,6 +9,9 @@
@Data
public class StaProtocol {

    // 站点编号
    private Integer siteId;

    // 自动
    private boolean autoing;


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

@@ -37,9 +37,23 @@
    public void run() {
        while (true) {
            try {
                int step = 1;
                Task task = MessageQueue.poll(SlaveType.Devp, slave.getId());
                if (task != null) {
                    System.out.println("任务"+task.getId());
                    step = task.getStep();
                }
                switch (step) {
                    // 读数据
                    case 1:
                        readWorkNo();   // 读取工作号
                        readStaDest();  // 读取目标站
                        readStatus();   // 读取状态
                        readError();    // 读取异常信息
                        break;
                    case 2:
                        break;
                    default:
                        break;
                }
                Thread.sleep(3000);
            } catch (Exception e) {
@@ -64,6 +78,35 @@
        return result;
    }

    /**
     * 读取工作号
     */
    private void readWorkNo(){

    }

    /**
     * 读取目标站
     */
    private void readStaDest(){

    }

    /**
     * 读取状态
     */
    private void readStatus(){

    }

    /**
     * 读取异常信息
     */
    private void readError(){

    }


    @Override
    public void close() {