#

luxiaotao1123

2020-08-17 fb02f04ec63f00398e343e4b43eda00cce75c56e

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

@@ -1,5 +1,6 @@
package com.zy.asrs.controller;

import com.alibaba.fastjson.JSON;
import com.core.annotations.ManagerAuth;
import com.core.common.R;
import com.zy.asrs.domain.enums.CrnStatusType;
@@ -9,10 +10,14 @@
import com.zy.asrs.domain.vo.CrnStateTableVo;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.WrkMastService;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.CrnModeType;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.CrnSlave;
import com.zy.core.model.Task;
import com.zy.core.model.command.CrnCommand;
import com.zy.core.model.protocol.CrnProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.CrnThread;
@@ -23,9 +28,7 @@
import org.springframework.web.bind.annotation.RestController;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicInteger;

/**
@@ -46,12 +49,25 @@
    @PostMapping("/command/ongoing")
    public R ongoingCommand(){
        List<CommandLogVo> list = new ArrayList<>();
        for (int i=1;i<=4;i++){
        for (CrnSlave crn : slaveProperties.getCrn()) {
            CommandLogVo vo = new CommandLogVo();
            vo.setCrnNo(String.valueOf(i));
            vo.setStatus(1);
            vo.setCommand(UUID.randomUUID().toString());
            vo.setCrnNo(crn.getId());   //  堆垛机号
            vo.setStatus(0);    //  状态
            list.add(vo);
            // 获取堆垛机信息
            CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
            if (crnThread == null) {
                continue;
            }
            CrnProtocol crnProtocol = crnThread.getCrnProtocol();
            if (crnProtocol == null) {
                continue;
            }
            vo.setStatus(1);    //  状态
            Task task = MessageQueue.peek(SlaveType.Crn, crn.getId());
            if (task != null) {
                vo.setCommand(JSON.toJSONString((CrnCommand)task.getData()));
            }
        }
        return R.ok().add(list);
    }
@@ -104,12 +120,10 @@
            // 获取堆垛机信息
            CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
            if (crnThread == null) {
                log.error("{}号堆垛机连接失败", crn.getId());
                continue;
            }
            CrnProtocol crnProtocol = crnThread.getCrnProtocol();
            if (crnProtocol == null) {
                log.error("{}号堆垛机连接失败", crn.getId());
                continue;
            }
            // 表格行
@@ -137,8 +151,21 @@
    @PostMapping("/output/site")
    @ManagerAuth(memo = "堆垛机报文日志输出")
    public R crnOutput(){
        String str = "\n" +new Date().toLocaleString() + "【2020-5-29 13:14:22】扫描plcA 目标站--273283723728327636432343234323422732837237283276364323432343234227328372372832763643234323432342";
        return R.ok().add(str);
        StringBuilder str = new StringBuilder();
        String s;
        int i = 0;
        while( (s = OutputQueue.CRN.poll()) != null && i <=10) {
            str.append("\n").append(s);
            i++;
        }
//        str = new StringBuilder("\n" + new Date().toLocaleString() + "【2020-5-29 13:14:22】扫描plcA 目标站--273283723728327636432343234323422732837237283276364323432343234227328372372832763643234323432342");
        return R.ok().add(str.toString());
    }

    public static void main(String[] args) {
        for (int i =0; i<10; i++) {

        }
    }

    /****************************************************************/