#

qlsxk

昨天 22d407815c830a571eeff91713860d65271f38de

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

@@ -22,8 +22,10 @@
import com.zy.core.enums.SlaveType;
import com.zy.core.enums.WrkIoType;
import com.zy.core.model.protocol.ForkLiftProtocol;
import com.zy.core.model.protocol.LiftProtocol;
import com.zy.core.model.protocol.ShuttleProtocol;
import com.zy.core.thread.ForkLiftThread;
import com.zy.core.thread.LiftThread;
import com.zy.core.thread.ShuttleThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -231,8 +233,8 @@
        return R.error("任务取消失败");
    }

    @PostMapping("/deviceStatus")
    @OpenApiLog(memo = "获取设备状态")
    @RequestMapping("/deviceStatus")
//    @OpenApiLog(memo = "获取设备状态")
    public R getDeviceStatus() {
        HashMap<String, Object> map = new HashMap<>();
        //获取小车数据
@@ -269,25 +271,45 @@
            forkLiftProtocols.add(forkLiftProtocol);
        }

        //获取提升机数据
        ArrayList<LiftProtocol> liftProtocols = new ArrayList<>();
        List<DeviceConfig> liftList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
                .eq("device_type", String.valueOf(SlaveType.Lift)));
        for (DeviceConfig device : liftList) {
            LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, device.getDeviceNo());
            if (liftThread == null) {
                continue;
            }

            LiftProtocol liftProtocol = liftThread.getStatus();
            if (liftProtocol == null) {
                continue;
            }
            liftProtocols.add(liftProtocol);
        }

        map.put("shuttle", shuttleProtocols);
        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")
    public R getLiftDeviceOriginData() {
        HashMap<Integer, String> map = new HashMap<>();

        //获取提升机数据
        List<DeviceConfig> liftList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
                .eq("device_type", String.valueOf(SlaveType.Lift)));
        for (DeviceConfig device : liftList) {
            LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, device.getDeviceNo());
            if (liftThread == null) {
                continue;
            }

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

        return R.ok().add(map);
    }
@@ -307,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);
    }

@@ -342,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);
    }