#

luxiaotao1123

2020-08-15 71333f8fbfc321bced0d7a3916e996de7fdac284

 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());   // 工作号