Merge remote-tracking branch 'origin/Four-Way-Rack' into Four-Way-Rack

Junjie

2024-06-18 0b0fcf4de34a670def794a699270663dd72f07c1

Merge remote-tracking branch 'origin/Four-Way-Rack' into Four-Way-Rack

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/BasLiftController.java

@@ -137,7 +137,7 @@
    @PostMapping("/basLift/getMapLev")
    public R getMapLev() {
        List<Dict> dicts = dictService.list(new LambdaQueryWrapper<Dict>()
                .like(Dict::getFlag, "map")
                .like(Dict::getFlag, "map-")
                .eq(Dict::getStatus, 1));
        return R.ok().add(dicts.size());
    }

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayLiftThread.java

@@ -92,7 +92,7 @@
                //模式
                liftProtocol.setModel(true);
                //运行状态
                liftProtocol.setRun(data.getInteger("runningstate") == 1);
                liftProtocol.setRun(data.getInteger("runningState") == 1);
                //就绪状态
                liftProtocol.setReady(data.getInteger("readyState") == 1);
                //有托盘
@@ -100,7 +100,7 @@
                //有小车
                liftProtocol.setHasCar(data.getString("haveCar").equals("Y"));
                //故障码
                liftProtocol.setErrorCode("");
                liftProtocol.setErrorCode("0");
                //层
                liftProtocol.setLev(data.getInteger("curFloor"));

@@ -346,9 +346,9 @@
        if (this.liftProtocol.getModel()
                && !this.liftProtocol.getRun()
                && this.liftProtocol.getReady()
                && this.liftProtocol.getPakMk()
//                && this.liftProtocol.getPakMk()
                && this.liftProtocol.getErrorCode().equals("0")
                && this.liftProtocol.getProtocolStatus().equals(LiftProtocolStatusType.IDLE)
                && this.liftProtocol.getProtocolStatusType().equals(LiftProtocolStatusType.IDLE)
                && !extend.getLock()
        ) {
            return true;
@@ -403,37 +403,37 @@
    //获取设备状态
    private JSONObject requestDeviceStatus() {
        //模拟数据
        String data = "[{\"taskNo\":1244,\"curFloor\":2,\"readyState\":1,\"haveCar\":'N',\"completeTaskNo\":0,\"haveCargo\":\"Y\",\"runningstate\":0,\"floors\":[{\"floor\":1,\"location\":1,\"run\":1,\"error\":1,\"cargoState\":\"Y\"},{\"floor\":1,\"location\":2,\"run\":0,\"error\":0,\"cargoState\":\"N\"}]}]";
        return JSON.parseArray(data).getJSONObject(0);
//        try {
//            String loginToken = requestLoginToken();
//            if (loginToken == null) {
//                return null;
//            }
//
//            HashMap<String, Object> headers = new HashMap<>();
//            headers.put("Authorization", "Bearer " + loginToken);
//
//            HashMap<String, Object> param = new HashMap<>();
//            param.put("messageName", "deviceRgvStatus");
//            param.put("msgTime", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
//            param.put("deviceNo", device.getDeviceNo());
//            String response = new HttpHandler.Builder()
//                    .setUri(API_URL)
//                    .setPath("/RDS/deviceLifterStatus")
//                    .setHeaders(headers)
//                    .setJson(JSON.toJSONString(param))
//                    .build()
//                    .doPost();
//            JSONObject jsonObject = JSON.parseObject(response);
//            Integer code = jsonObject.getInteger("code");
//            if (code.equals(200)) {
//                return jsonObject.getJSONArray("data").getJSONObject(0);
//            }
//        } catch (Exception e) {
//            e.printStackTrace();
//        }
//        return null;
//        String data = "[{\"taskNo\":1244,\"curFloor\":2,\"readyState\":1,\"haveCar\":'N',\"completeTaskNo\":0,\"haveCargo\":\"Y\",\"runningstate\":0,\"floors\":[{\"floor\":1,\"location\":1,\"run\":1,\"error\":1,\"cargoState\":\"Y\"},{\"floor\":1,\"location\":2,\"run\":0,\"error\":0,\"cargoState\":\"N\"}]}]";
//        return JSON.parseArray(data).getJSONObject(0);
        try {
            String loginToken = requestLoginToken();
            if (loginToken == null) {
                return null;
            }

            HashMap<String, Object> headers = new HashMap<>();
            headers.put("Authorization", "Bearer " + loginToken);

            HashMap<String, Object> param = new HashMap<>();
            param.put("messageName", "deviceRgvStatus");
            param.put("msgTime", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
            param.put("deviceNo", device.getDeviceNo());
            String response = new HttpHandler.Builder()
                    .setUri(API_URL)
                    .setPath("/RDS/deviceLifterStatus")
                    .setHeaders(headers)
                    .setJson(JSON.toJSONString(param))
                    .build()
                    .doPost();
            JSONObject jsonObject = JSON.parseObject(response);
            Integer code = jsonObject.getInteger("code");
            if (code.equals(200)) {
                return jsonObject.getJSONArray("data").getJSONObject(0);
            }
        } catch (Exception e) {
            e.printStackTrace();
        }
        return null;
    }

    //空载移动