#

luxiaotao1123

2020-08-17 c85706a1e0794dbbc7f41952d70eacb795802112

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

@@ -9,6 +9,7 @@
import com.zy.asrs.domain.vo.CrnStateTableVo;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.WrkMastService;
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.CrnModeType;
import com.zy.core.enums.SlaveType;
@@ -23,7 +24,6 @@
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;
@@ -79,10 +79,10 @@
            if (crnProtocol.getTaskNo()>0) {
                WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
                if (wrkMast != null) {
                    vo.setStatusType(CrnStatusType.process(wrkMast.getIoType()));   //  模式状态
                    vo.setStatusType(CrnStatusType.process(wrkMast.getIoType()).getDesc());   //  模式状态
                }
            } else {
                vo.setStatusType(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.AUTO: CrnStatusType.UN_AUTO);   //  模式状态
                vo.setStatusType(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.AUTO.getDesc(): CrnStatusType.UN_AUTO.getDesc());   //  模式状态
            }
            vo.setStatus(crnProtocol.getStatusType().desc);     //  状态
            vo.setWarn(""); //  报警 todo
@@ -100,33 +100,58 @@
    @ManagerAuth(memo = "堆垛机数据表")
    public R crnMsgTable(){
        List<CrnMsgTableVo> list = new ArrayList<>();
        for (int i=1;i<=4;i++){
        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();
            if (crnProtocol == null) {
                log.error("{}号堆垛机连接失败", crn.getId());
                continue;
            }
            // 表格行
            CrnMsgTableVo vo = new CrnMsgTableVo();
            vo.setCrnNo(String.valueOf(i));
            vo.setCommand("28283E23132D23");
            vo.setError("");
            vo.setLocNo("0601812");
            vo.setOrigin("0");
            vo.setSourceLocNo("");
            vo.setSourceStaNo("0");
            vo.setStaNo("2112");
            vo.setStatus("空闲");
            if (integer.get()%5 == 0) {
                vo.setWorkNo("0000");
            vo.setCrnNo(crn.getId());   //  堆垛机号
            vo.setWorkNo(crnProtocol.getTaskNo());  //  任务号
            if (crnProtocol.getTaskNo()>0) {
                WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
                if (wrkMast != null) {
                    vo.setStatus(CrnStatusType.process(wrkMast.getIoType()).getDesc());   //  模式状态
                    vo.setSourceStaNo(wrkMast.getSourceStaNo$());    //  源站
                    vo.setStaNo(wrkMast.getStaNo$());   //  目标站
                    vo.setSourceLocNo(wrkMast.getSourceLocNo());    //  源库位
                    vo.setLocNo(wrkMast.getLocNo());    //  目标库位
                }
            } else {
                vo.setWorkNo("9998");
                vo.setStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.AUTO.getDesc(): CrnStatusType.UN_AUTO.getDesc());   //  模式状态
            }
            list.add(vo);

        }
        integer.getAndIncrement();
        return R.ok().add(list);
    }

    @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++) {

        }
    }

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