Merge remote-tracking branch 'origin/qlasrs-sxk' into qlasrs-sxk

Junjie

2025-10-16 062323dcda647af8adf1bfce3c80e7a2483af204

 src/main/java/com/zy/asrs/webSocketConfig/LedWebsocket.java

@@ -179,6 +179,10 @@
        Map<String,Object> map=new HashMap<>();
        map.put("to",ledId);
        BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", ledId));
        if (basDevp.getDevMk().equals("O")){
            basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", 1001));
        }

        if (basDevp == null ){
            return;
        }
@@ -188,25 +192,12 @@
            return;
        }
        List<LedCommand> commandList = new ArrayList<>();
        if (basDevp.getDevMk().equals("I")){

            if (basDevp.getWrkNo() != 0){
        if (basDevp.getWrkNo() != 0 && basDevp.getLoading().equals("Y")){
                WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
                if (null != wrkMast){
                    commandList = getCommandList(basDevp.getWrkNo().toString());
                }
            }
            map.put("message",Cools.add("type", "task").add("taskList",commandList));
            webSocketServer.onMessage(JSONObject.toJSONString(map),null,ledId);
        }else if (basDevp.getDevMk().equals("O")){
            BasDevp basDevpOut = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", 1001));
            if (basDevp.getWrkNo() != 0){
                WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevpOut.getWrkNo()));
                if (null != wrkMast){
                    commandList = getCommandList(basDevp.getWrkNo().toString());
                }
            }

        }
        map.put("message",Cools.add("type", "task").add("taskList",commandList));
        webSocketServer.onMessage(JSONObject.toJSONString(map),null,ledId);