#

luxiaotao1123

2020-08-15 5769bdadc879fa93523be0e95ffc8d5ee9ba1e01

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

@@ -3,6 +3,7 @@
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.R;
import com.zy.asrs.domain.enums.CrnStatusType;
import com.zy.asrs.domain.enums.SiteStatusType;
import com.zy.asrs.domain.param.SystemSwitchParam;
import com.zy.asrs.domain.vo.*;
@@ -12,11 +13,15 @@
import com.zy.asrs.service.WrkMastService;
import com.zy.common.CodeRes;
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.DevpSlave;
import com.zy.core.model.protocol.CrnProtocol;
import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.properties.SystemProperties;
import com.zy.core.thread.CrnThread;
import com.zy.core.thread.DevpThread;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
@@ -99,11 +104,26 @@
    @ManagerAuth(memo = "堆垛机实时数据")
    public R crnLatestData(){
        List<CrnLatestDataVo> vos = new ArrayList<>();
        for (int i =1; i<=2; i++){
        for (CrnSlave crn : slaveProperties.getCrn()) {
            // 获取堆垛机信息
            CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
            CrnProtocol crnProtocol = crnThread.getCrnProtocol();
            CrnLatestDataVo vo = new CrnLatestDataVo();
            vo.setCrnId(i);
            vo.setOffset((double) new Random().nextInt(560));
            vo.setCrnId(crn.getId());   //  堆垛机编号
            vo.setOffset((double) new Random().nextInt(560));     //  堆垛机偏移量
            /**
             * 堆垛机状态判断
             */
            if (crnProtocol.getTaskNo()>0) {
                WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
                if (wrkMast != null) {
                    vo.setCrnStatusType(CrnStatusType.process(wrkMast.getIoType()));
                }
            } else {
                vo.setCrnStatusType(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.AUTO: CrnStatusType.UN_AUTO);
            }
            vos.add(vo);

        }
        return R.ok().add(vos);
    }