#

Junjie

1 天以前 5eb299fcff5db1bcb49629b311809dd7ae086f27

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

@@ -118,7 +118,7 @@
    //入库任务
    @PostMapping("/createInTask")
    @OpenApiLog(memo = "入库任务")
    public R createInTask(@RequestBody CreateInTaskParam param) {
    public synchronized R createInTask(@RequestBody CreateInTaskParam param) {
        if (param == null) {
            return R.error("参数不能为空");
        }
@@ -148,7 +148,7 @@
    //出库任务
    @PostMapping("/createOutTask")
    @OpenApiLog(memo = "出库任务")
    public R createOutTask(@RequestBody CreateOutTaskParam param) {
    public synchronized R createOutTask(@RequestBody CreateOutTaskParam param) {
        if (param == null) {
            return R.error("参数不能为空");
        }
@@ -292,28 +292,10 @@
        map.put("forkLift", forkLiftProtocols);
        map.put("lift", liftProtocols);

        apiLogService.insert(new ApiLog(
                null
                , "获取设备状态"
                , "/deviceStatus"
                , null
                , null
                , null
                , null
                , JSON.toJSONString(map)
                , null
                , null
                , 1
                , new Date()
                , null
                , null
        ));

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

    @RequestMapping("/liftDeviceOriginData")
//    @OpenApiLog(memo = "获取提升机原始数据")
    public R getLiftDeviceOriginData() {
        HashMap<Integer, String> map = new HashMap<>();

@@ -328,23 +310,6 @@

            map.put(device.getDeviceNo(), liftThread.getRealtimeOriginData());
        }

        apiLogService.insert(new ApiLog(
                null
                , "获取提升机原始数据"
                , "/liftDeviceOriginData"
                , null
                , null
                , null
                , null
                , JSON.toJSONString(map)
                , null
                , null
                , 1
                , new Date()
                , null
                , null
        ));

        return R.ok().add(map);
    }
@@ -364,23 +329,6 @@
        map.put("locNo", locMast.getLocNo());
        map.put("locSts", locMast.getLocSts());

        apiLogService.insert(new ApiLog(
                null
                , "获取指定库位信息"
                , "/getLocInformation"
                , null
                , null
                , null
                , JSON.toJSONString(param)
                , JSON.toJSONString(map)
                , null
                , null
                , 1
                , new Date()
                , null
                , null
        ));

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

@@ -399,23 +347,6 @@
            map.put("locSts", locMast.getLocSts());
            list.add(map);
        }

        apiLogService.insert(new ApiLog(
                null
                , "获取全部库位信息"
                , "/getAllLocInformation"
                , null
                , null
                , null
                , null
                , JSON.toJSONString(list)
                , null
                , null
                , 1
                , new Date()
                , null
                , null
        ));

        return R.ok().add(list);
    }
@@ -506,6 +437,11 @@
        return R.ok().add(wrkMasts);
    }

    @GetMapping("/systemStatus")
    public R systemStatus() {
        return R.ok();
    }

    @GetMapping("/test")
    public R test() {
        notifyUtils.notify("task", 1, "9999", "W9999", NotifyMsgType.SHUTTLE_MOVING, "data");