#
Junjie
2024-04-30 d66dc4c24233969c7649692aa37c53a8ad4c272c
#
3个文件已修改
180 ■■■■■ 已修改文件
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/model/enums/DeviceCtgType.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/NavigateSolution.java 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/NyShuttleThread.java 152 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/model/enums/DeviceCtgType.java
@@ -29,7 +29,7 @@
    public static DeviceCtgType get(String el) {
        for (DeviceCtgType value : DeviceCtgType.values()) {
            if (el.equals(value.toString())) {
            if (el.toUpperCase().equals(value.toString())) {
                return value;
            }
        }
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/NavigateSolution.java
@@ -161,19 +161,23 @@
    }
    public boolean is_valid(int x, int y) {
        // 如果结点的位置小于0,则不合法
        if (map[x][y] < 0) return false;
        for (NavigateNode node : Exist) {
            //如果结点出现过,不合法
            if (node.getX() == x && node.getY() == y) {
                return false;
        try {
            // 如果结点的位置小于0,则不合法
            if (map[x][y] < 0) return false;
            for (NavigateNode node : Exist) {
                //如果结点出现过,不合法
                if (node.getX() == x && node.getY() == y) {
                    return false;
                }
                if (is_exist(new NavigateNode(x, y))) {
                    return false;
                }
            }
            if (is_exist(new NavigateNode(x, y))) {
                return false;
            }
            //以上情况都没有则合法
            return true;
        } catch (Exception e) {
            return false;
        }
        //以上情况都没有则合法
        return true;
    }
    public boolean is_exist(NavigateNode node)
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/NyShuttleThread.java
@@ -56,7 +56,7 @@
    private ShuttleProtocol shuttleProtocol;
    private Socket socket;
    private static final boolean DEBUG = true;//调试模式
    private static final boolean DEBUG = false;//调试模式
    private List<JSONObject> socketResults = new ArrayList<>();
@@ -120,31 +120,44 @@
        }
    }
    public JSONObject getRequestBody(Integer requestId) {
        // 获取服务器响应
        JSONObject result = null;
        for (int i = 0; i < socketResults.size(); i++) {
            JSONObject socketResult = socketResults.get(i);
            if (!socketResult.get("msgType").equals("responseMsg")) {//不是响应内容
                continue;
    public JSONObject getRequestBody(String type) {
        try {
            // 获取服务器响应
            JSONObject result = null;
            if (type.equals("readState")) {
                type = "state";
            }
            JSONObject resultResponse = JSON.parseObject(socketResult.get("response").toString());
            JSONObject resultHeader = JSON.parseObject(resultResponse.get("header").toString());
            int responseId = Integer.parseInt(resultHeader.get("responseId").toString());
            if (!DEBUG && responseId != requestId) {
                continue;//响应ID与请求ID不一致,不在调试模式下
            for (int i = 0; i < socketResults.size(); i++) {
                JSONObject socketResult = socketResults.get(i);
                if (!socketResult.get("msgType").equals("responseMsg")) {//不是响应内容
                    continue;
                }
                JSONObject resultResponse = JSON.parseObject(socketResult.get("response").toString());
                JSONObject resultBody = JSON.parseObject(resultResponse.get("body").toString());
                String responseType = resultBody.get("responseType").toString();
                if (DEBUG) {
                    result = socketResult;
                    break;
                }
                if (!responseType.equals(type)) {
                    continue;//响应ID与请求ID不一致,不在调试模式下
                }
                result = socketResult;
                break;
            }
            result = socketResult;
            break;
        }
            if (result == null) {
                return null;//无响应结果
            }
        if (result == null) {
            return null;//无响应结果
            return filterBodyData(result);//返回Body结果集
        } catch (Exception e) {
            return null;
        }
        return filterBodyData(result);//返回Body结果集
    }
    private void read() {
@@ -163,22 +176,23 @@
    private void readStatus() {
        try {
            if (null == shuttleProtocol) {
                shuttleProtocol = new ShuttleProtocol();
                shuttleProtocol.setShuttleNo(Integer.valueOf(device.getDeviceNo()));
                shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.IDLE);
                shuttleProtocol.setDevice(device);
                InnerSuhttleExtend extend = new InnerSuhttleExtend();
                shuttleProtocol.setExtend(extend);
            }
            //----------读取四向穿梭车状态-----------
            NyShuttleHttpCommand readStatusCommand = getReadStatusCommand(Integer.parseInt(device.getDeviceNo()));
            JSONObject data = requestCommand(readStatusCommand);
            if (data == null) {
                shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.OFFLINE);
//                shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.OFFLINE);
                OutputQueue.SHUTTLE.offer(MessageFormat.format("【{0}】四向穿梭车Socket状态信息失败 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), device.getId(), device.getIp(), device.getPort()));
            }else {
                if (null == shuttleProtocol) {
                    shuttleProtocol = new ShuttleProtocol();
                    shuttleProtocol.setShuttleNo(Integer.valueOf(device.getDeviceNo()));
                    shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.IDLE);
                    shuttleProtocol.setDevice(device);
                    InnerSuhttleExtend extend = new InnerSuhttleExtend();
                    shuttleProtocol.setExtend(extend);
                }
                //----------读取四向穿梭车状态-----------
                //小车设备状态
@@ -186,7 +200,7 @@
                //小车模式
                shuttleProtocol.setMode(data.getInteger("workingMode"));
                //当前二维码
                shuttleProtocol.setCurrentCode(data.getString("coord"));
                shuttleProtocol.setCurrentCode(data.getString("point"));
                //电池电量
                shuttleProtocol.setBatteryPower(data.getString("powerPercent"));
                //电池电压
@@ -219,9 +233,9 @@
                shuttleProtocol.setLastOnlineTime(System.currentTimeMillis());
                ///读取四向穿梭车状态-end
                //小车处于运行中,将标记置为false
                //小车处于运行中,将标记置为true
                if (shuttleProtocol.getDeviceStatus() == 1) {
                    shuttleProtocol.setPakMk(false);
                    shuttleProtocol.setPakMk(true);
                }
                if (shuttleProtocol.getProtocolStatusType() == null && shuttleProtocol.getDeviceStatus().intValue() == 0) {
@@ -304,8 +318,9 @@
                String requestType = resultBody.getString("requestType");
                Integer requestId = resultHeader.getInteger("requestId");
                if (requestType.equals("init")) {
                    Integer code = resultBody.getInteger("code");
                    //小车复位请求
                    ShuttleCommand initCommand = getInitCommand(requestId);
                    ShuttleCommand initCommand = getInitCommand(requestId, code);
                    //发出请求
                    NyShuttleHttpCommand httpCommand = JSON.parseObject(initCommand.getBody(), NyShuttleHttpCommand.class);
                    JSONObject requestResult = requestCommand(httpCommand);
@@ -420,7 +435,7 @@
        InnerSuhttleExtend extend = (InnerSuhttleExtend) this.shuttleProtocol.getExtend();
        boolean res = this.shuttleProtocol.getDeviceStatus() == 0
        boolean res = this.shuttleProtocol.getDeviceStatus() == 1
                && this.shuttleProtocol.getMode() == 1
                && this.shuttleProtocol.getPakMk()
                && this.shuttleProtocol.getErrorCode().equals("0")
@@ -443,7 +458,7 @@
        InnerSuhttleExtend extend = (InnerSuhttleExtend) this.shuttleProtocol.getExtend();
        boolean res = this.shuttleProtocol.getDeviceStatus() == 0
        boolean res = this.shuttleProtocol.getDeviceStatus() == 1
                && this.shuttleProtocol.getMode() == 1
                && this.shuttleProtocol.getPakMk()
                && this.shuttleProtocol.getErrorCode().equals("0")
@@ -466,7 +481,7 @@
        InnerSuhttleExtend extend = (InnerSuhttleExtend) this.shuttleProtocol.getExtend();
        boolean res = this.shuttleProtocol.getDeviceStatus() == 0
        boolean res = this.shuttleProtocol.getDeviceStatus() == 1
                && this.shuttleProtocol.getMode() == 1
                && this.shuttleProtocol.getPakMk()
                && this.shuttleProtocol.getErrorCode().equals("0")
@@ -625,8 +640,8 @@
            data.put("z", z);
            data.put("x", mapNode.getXBase());
            data.put("y", mapNode.getYBase());
            path.add(data);
        }
        httpStandard.setRequest(request);
@@ -660,7 +675,7 @@
        ShuttleCommand command = new ShuttleCommand();
        command.setShuttleNo(Integer.parseInt(this.device.getDeviceNo()));
        command.setBody(JSON.toJSONString(body));
        command.setBody(JSON.toJSONString(httpStandard));
        command.setMode(lift ? ShuttleCommandModeType.PALLET_LIFT.id : ShuttleCommandModeType.PALLET_DOWN.id);
        return command;
    }
@@ -685,13 +700,46 @@
    }
    //获取小车复位响应命令
    public ShuttleCommand getInitCommand(Integer taskNo) {
    public ShuttleCommand getInitCommand(Integer taskNo, Integer code) {
        LocService locService = SpringUtils.getBean(LocService.class);
        NavigateMapData navigateMapData = SpringUtils.getBean(NavigateMapData.class);
        NyShuttleHttpCommand httpStandard = getHttpStandard(Integer.parseInt(device.getDeviceNo()), taskNo);
        NyShuttleHttpCommand.NyRequest request = httpStandard.getRequest();
        //code -> {Integer@13781} 1101101
        int lev = code % 100;
        int bay = code / 100 % 1000;
        int row = code / 100000;
        HashMap<String, Object> map = new HashMap<>();
        map.put("x", row);
        map.put("y", bay);
        map.put("z", lev);
        String mapStr = JSON.toJSONString(map);
        Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>()
                .eq(Loc::getCode, mapStr)
                .eq(Loc::getStatus, 1)
                .eq(Loc::getHostId, this.device.getHostId()));
        if (loc == null) {
            throw new CoolException("地址码不存在");
        }
        navigateMapData.setLev(lev);
        List<List<MapNode>> mapData = navigateMapData.getJsonData(NavigationMapType.NONE.id, null, null);
        List<MapNode> mapNodes = mapData.get(loc.getRow());
        MapNode mapNode = mapNodes.get(loc.getBay());
        HashMap<String, Object> location = new HashMap<>();
        location.put("xp", row);
        location.put("yp", bay);
        location.put("z", lev);
        location.put("x", mapNode.getXBase());
        location.put("y", mapNode.getYBase());
        HashMap<String, Object> body = new HashMap<>();
        body.put("responseType", "init");//复位
        body.put("location", new ArrayList<>());//初始化坐标
        body.put("location", location);//初始化坐标
        body.put("devicePoints", new ArrayList<>());//提升机点位
        body.put("specialPoints", new ArrayList<>());//特殊条码坐标
        request.setBody(body);
@@ -784,11 +832,18 @@
        writer.flush();
//            System.out.println("Sent message to server: " + JSON.toJSONString(httpCommand));
        String requestType = null;
        try {
            requestType = httpCommand.getRequest().getBody().get("requestType").toString();
        } catch (Exception e) {
            return null;
        }
        // 获取服务器响应
        // 尝试10次
        JSONObject result = null;
        for (int i = 0; i < 10; i++) {
            result = getRequestBody(httpCommand.getRequest().getHeader().getRequestId());
            result = getRequestBody(requestType);
            if (result == null) {
                try {
                    Thread.sleep(100);
@@ -796,6 +851,7 @@
                    e.printStackTrace();
                }
            }
            break;
        }
        return result;//返回Body结果集
    }
@@ -827,11 +883,13 @@
    //WCS系统坐标转牛眼坐标
    private static int[] WCSXyzToNyXyz(int x, int y, int z) {
        //WCS系统Y轴 => 牛眼X轴转换公式
        int x1 = Math.abs(y - 61) + 11;
        //WCS系统X轴 => 牛眼Y轴转换公式
        int y1 = x + 10;
        return new int[]{x1, y1, z};
//        //WCS系统Y轴 => 牛眼X轴转换公式
//        int x1 = Math.abs(y - 61) + 11;
//        //WCS系统X轴 => 牛眼Y轴转换公式
//        int y1 = x + 10;
        int x1 = x + 10;
        int y1 = y + 10;
        return new int[]{y1, x1, z};
    }
    @Data