初步调试

zc

3 天以前 61dbf118522a9ac98027b624b5d46761fe536bbe

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

@@ -225,13 +225,13 @@
     */
    @GetMapping("/led")
    public R monitorLed(@RequestParam("ledId") Integer ledId) {
        int dev_no = 1012;
        int dev_no = 1011;
        if (ledId == 1) {
            dev_no = 1012;
            dev_no = 1011;
        } else if (ledId == 2) {
            dev_no = 1014;
        } else if (ledId == 3) {
            dev_no = 1022;
            dev_no = 1021;
        } else if (ledId == 4) {
            dev_no = 1025;
        }
@@ -239,36 +239,30 @@
        if (Cools.isEmpty(basDevp)) {
            return R.ok();
        }
        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wms_wrk_no", basDevp.getWrkNo()));
        if (Cools.isEmpty(wrkMast)) {
        if (Cools.isEmpty(basDevp.getWrkNo1())) {
            return R.ok();
        }
        List<LedCommand> commands = new ArrayList<>();

        if (wrkMast.getIoType() != 110 && wrkMast.getIoType() != 10) {
            Map<String, Object> param = new HashMap<>();
            param.put("taskNo", wrkMast.getWmsWrkNo());
            param.put("sta", wrkMast.getStaNo());
            String response = null;
            try {
                response = new HttpHandler.Builder()
                        .setUri(wmsUrl)
                        .setPath("/rpc/led/getTask2")
                        .setJson(JSON.toJSONString(param))
                        .build()
                        .doPost();
            } catch (IOException e) {
                e.printStackTrace();
            }
            JSONObject jsonObject = JSON.parseObject(response);
            Integer code = jsonObject.getInteger("code");
            if (code.equals(200)) {
                String data = jsonObject.getString("data");
                List<LedCommand> wrkDetls = JSONArray.parseArray(data, LedCommand.class);
                commands.addAll(wrkDetls);
            }
        Map<String, Object> param = new HashMap<>();
        param.put("taskNo", basDevp.getWrkNo1());
        String response = null;
        try {
            response = new HttpHandler.Builder()
                    .setUri(wmsUrl)
                    .setPath("/rpc/led/getTask2")
                    .setJson(JSON.toJSONString(param))
                    .build()
                    .doPost();
        } catch (IOException e) {
            e.printStackTrace();
        }

        JSONObject jsonObject = JSON.parseObject(response);
        Integer code = jsonObject.getInteger("code");
        if (code.equals(200)) {
            String data = jsonObject.getString("data");
            List<LedCommand> wrkDetls = JSONArray.parseArray(data, LedCommand.class);
            commands.addAll(wrkDetls);
        }
        return R.ok().add(commands);
    }