#

zy

2025-08-13 d9ea1a9c6c1096aa040cbdaa6d601b67ae9cde30

#

 src/main/java/com/zy/core/properties/DeviceConfig.java

@@ -21,4 +21,6 @@

    private String fakeInitStatus;

    private Object otherData;

}

 src/main/java/com/zy/core/thread/fake/FakeNyLiftThread.java

@@ -53,9 +53,37 @@
                    if(fakeDeviceUtils == null){
                        continue;
                    }

                    FakeThread fakeThread1 = (FakeThread) SlaveConnection.get(SlaveType.FakeThread, 1);

                    List<DeviceConfig> deviceConfigs = fakeDeviceUtils.getFakeDeviceConfig();
                    for (DeviceConfig device : deviceConfigs) {
                        excuteFakeCommand(String.valueOf(SlaveType.Lift) + device.getDeviceNo());
                        if (!device.getDeviceType().equals(String.valueOf(SlaveType.Lift))) {
                            continue;
                        }

                        String key = String.valueOf(SlaveType.Lift) + device.getDeviceNo();

                        if(fakeThread1 != null){
                            int hasCar = 0;
                            ConcurrentHashMap<String, JSONObject> shuttleFakeStatusMap1 = fakeThread1.getFakeStatusMap();
                            for (Map.Entry<String, JSONObject> entry : shuttleFakeStatusMap1.entrySet()) {
                                JSONObject statusData = entry.getValue();
                                String currentCode = statusData.getString("currentCode");
                                JSONObject point = JSON.parseObject(currentCode);
                                String currentPoint = point.getInteger("x") + "-" + point.getInteger("y");
                                if (device.getOtherData().toString().equals(currentPoint)) {
                                    hasCar = 1;
                                    break;
                                }
                            }

                            JSONObject fakeStatus = fakeStatusMap.get(key);
                            fakeStatus.put("hasCar", hasCar);
                            fakeStatusMap.put(key, fakeStatus);
                        }

                        excuteFakeCommand(key);
                    }
                }catch (Exception e){
                    e.printStackTrace();

 src/main/java/com/zy/core/thread/fake/FakeNyShuttleThread.java

@@ -172,6 +172,10 @@
                    }
                    List<DeviceConfig> deviceConfigs = fakeDeviceUtils.getFakeDeviceConfig();
                    for (DeviceConfig device : deviceConfigs) {
                        if (!device.getDeviceType().equals(String.valueOf(SlaveType.Shuttle))) {
                            continue;
                        }

                        excuteFakeCommand(String.valueOf(SlaveType.Shuttle) + device.getDeviceNo(), device);
                    }
                }catch (Exception e){
@@ -366,6 +370,7 @@
                    redisUtil.set(finalKey, true, 60 * 2);

                    JSONObject body = command.getJSONObject("commandBody");
                    String requestType = body.getString("requestType");
                    String pathList = body.getString("path");
                    List<JSONObject> executePathList = JSON.parseArray(pathList, JSONObject.class);