map_1.json

Junjie

2023-07-03 586605cbe95aaca03844763b74392ba70644fecc

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

@@ -11,6 +11,7 @@
import com.zy.asrs.entity.BasLift;
import com.zy.asrs.service.BasLiftService;
import com.zy.asrs.service.WrkMastService;
import com.zy.common.service.CommonService;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
@@ -42,7 +43,7 @@
    @Autowired
    private BasLiftService basLiftService;
    @Autowired
    private WrkMastService wrkMastService;
    private CommonService commonService;

    @PostMapping("/table/lift/state")
    @ManagerAuth(memo = "提升机信息表")
@@ -121,6 +122,7 @@
            vo.setLineEndHasStock(liftProtocol.getLineEndHasStock());
            vo.setInConveyLineCardTrayAlarm(liftProtocol.getInConveyLineCardTrayAlarm());
            vo.setOutConveyLineCardTrayAlarm(liftProtocol.getOutConveyLineCardTrayAlarm());
            vo.setShuttleNo(liftProtocol.getShuttleNo().intValue());
        }
        return R.ok().add(list);
    }
@@ -201,9 +203,10 @@

                LiftAssignCommand assignCommand = new LiftAssignCommand();
                assignCommand.setLiftNo(liftSlave.getId().shortValue()); // 提升机编号
                assignCommand.setTaskNo((short) 9999);
                assignCommand.setTaskNo((short) commonService.getWorkNo(3));//获取任务号
                assignCommand.setTaskMode(param.getLiftTaskMode().shortValue());
                assignCommand.setAuto(false);//手动模式
                assignCommand.setLev(param.getLev());//移动楼层

                if (MessageQueue.offer(SlaveType.Lift, liftSlave.getId(), new Task(3, assignCommand))) {
                    return R.ok();
@@ -215,4 +218,28 @@
        return R.error();
    }

    @PostMapping("/detl/update")
    @ManagerAuth(memo = "修改数据")
    public R liftUpdate(@RequestParam Integer liftNo,
                            @RequestParam Short workNo,
                            @RequestParam String pakMk){
        for (LiftSlave liftSlave : slaveProperties.getLift()) {
            LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, liftSlave.getId());
            if (liftThread == null) {
                return R.error("plc已掉线");
            }
            LiftProtocol liftProtocol = liftThread.getLiftProtocol();
            if (liftProtocol == null) {
                return R.error("plc已掉线");
            }
            if (workNo != null) {
                liftProtocol.setTaskNo(workNo);
            }
            if (pakMk != null) {
                liftProtocol.setPakMk(pakMk.equals("Y"));
            }
        }
        return R.error("plc已掉线");
    }

}