#

luxiaotao1123

2020-08-15 71333f8fbfc321bced0d7a3916e996de7fdac284

#

 src/main/java/com/zy/Boot.java

@@ -1,6 +1,8 @@
package com.zy;

import com.core.common.SpringUtils;
import com.zy.common.utils.RandomValidateCodeUtil;
import com.zy.core.ServerBootstrap;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
@@ -11,6 +13,11 @@
    public static void main(String[] args) {
        RandomValidateCodeUtil.init();
        SpringApplication.run(Boot.class, args);
        new Thread(()-> {
            ServerBootstrap serverBootstrap = SpringUtils.getBean(ServerBootstrap.class);
            serverBootstrap.init();
        }).start();

    }

//    @Override

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

@@ -23,6 +23,7 @@
import com.zy.core.properties.SystemProperties;
import com.zy.core.thread.CrnThread;
import com.zy.core.thread.DevpThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -36,6 +37,7 @@
 * 主控图接口
 * Created by vincent on 2020-06-01
 */
@Slf4j
@RestController
@RequestMapping("/console")
public class ConsoleController {
@@ -107,6 +109,10 @@
        for (CrnSlave crn : slaveProperties.getCrn()) {
            // 获取堆垛机信息
            CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
            if (crnThread == null) {
                log.error("{}号堆垛机连接失败", crn.getId());
                continue;
            }
            CrnProtocol crnProtocol = crnThread.getCrnProtocol();
            CrnLatestDataVo vo = new CrnLatestDataVo();
            vo.setCrnId(crn.getId());   //  堆垛机编号
@@ -166,7 +172,6 @@
                    if (basDevp == null) {
                        return R.error("数据库维护异常");
                    }

                    vo.setSiteId(siteId);   // 站点编号
                    vo.setWorkNo(staProtocol.getWorkNo());   // 工作号


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

@@ -12,7 +12,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;

/**
@@ -28,7 +27,7 @@
    private MainProcess mainProcess;


    @PostConstruct
//    @PostConstruct
    public void init(){
        // 初始化消息队列
        initMq();

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

@@ -28,12 +28,12 @@

    public BarcodeThread(Slave slave) {
        this.slave = slave;
        connect();
    }

    @Override
    @SuppressWarnings("InfiniteLoopStatement")
    public void run() {
        connect();
        while (true) {
            try {
                write("T".getBytes(), "T".length());

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

@@ -30,12 +30,12 @@

    public CrnThread(CrnSlave slave) {
        this.slave = slave;
        this.connect();
    }

    @Override
    @SuppressWarnings("InfiniteLoopStatement")
    public void run() {
        this.connect();
        while (true) {
            try {
                int step = 1;
@@ -177,22 +177,25 @@
    /*****************************************************************************************/
    public static void main(String[] args) {
        CrnSlave slave = new CrnSlave();
        slave.setIp("192.168.2.9");
        slave.setRack(1);
        slave.setSlot(0);
        CrnThread crnThread = new CrnThread(slave);
        crnThread.readStatus();
        System.out.println(JSON.toJSONString(crnThread.crnProtocol));
        // 写
        CrnCommand command = new CrnCommand();
        command.setCrnNo(slave.getId()); // 堆垛机编号
        command.setTaskNo((short) 0); // 工作号
        command.setAckFinish((short) 1);  // 任务完成确认位
        command.setTaskMode(CrnTaskModeType.NONE); // 任务模式:  库位移转
        command.setSourcePosX((short)0);     // 源库位排
        command.setSourcePosY((short)0);     // 源库位列
        command.setSourcePosZ((short)0);     // 源库位层
        command.setDestinationPosX((short)0);     // 目标库位排
        command.setDestinationPosY((short)0);     // 目标库位列
        command.setDestinationPosZ((short)0);     // 目标库位层
        crnThread.write(command);
//        // 写
//        CrnCommand command = new CrnCommand();
//        command.setCrnNo(slave.getId()); // 堆垛机编号
//        command.setTaskNo((short) 0); // 工作号
//        command.setAckFinish((short) 1);  // 任务完成确认位
//        command.setTaskMode(CrnTaskModeType.NONE); // 任务模式:  库位移转
//        command.setSourcePosX((short)0);     // 源库位排
//        command.setSourcePosY((short)0);     // 源库位列
//        command.setSourcePosZ((short)0);     // 源库位层
//        command.setDestinationPosX((short)0);     // 目标库位排
//        command.setDestinationPosY((short)0);     // 目标库位列
//        command.setDestinationPosZ((short)0);     // 目标库位层
//        crnThread.write(command);

    }


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

@@ -31,12 +31,12 @@

    public DevpThread(Slave slave) {
        this.slave = slave;
        connect();
    }

    @Override
    @SuppressWarnings("InfiniteLoopStatement")
    public void run() {
        connect();
        while (true) {
            try {
                int step = 1;

 src/main/resources/application.yml

@@ -38,7 +38,7 @@
  # 堆垛机
  crn[0]:
    id: 1
    ip: 192.168.6.10
    ip: 192.168.6.9
    port: 102
    rack: 0
    slot: 2

 src/main/webapp/views/console.html

@@ -405,7 +405,7 @@
        getCrnInfo();
        getSystemRunningStatus();
        getBarcodeInfo()
    }, 500);
    }, 1000);
    setInterval(function () {
        getSitesInfo();
    }, 3000);