#

Junjie

2025-05-23 a37eb3393b65933105a6f23a1713a2b14b835d16

 src/main/java/com/zy/core/thread/impl/LfdZyForkLiftMasterThread.java

@@ -36,16 +36,18 @@
        ArrayList<HashMap<String, Object>> addressList = new ArrayList<>();

        HashMap<String, Object> lift1 = new HashMap<>();
        lift1.put("status", new DbData("DB101.0", (short) 16));//提升机数据
        lift1.put("staStatus", new DbData("DB102.0", (short) 14));//站点数据
        lift1.put("status", new DbData("DB101.0", (short) 18));//提升机数据
        lift1.put("staStatusTray", new DbData("DB102.0", (short) 14));//站点数据
        lift1.put("staStatusCar", new DbData("DB102.50", (short) 14));//站点数据
        lift1.put("write", new DbData("DB103.0", null));//写入数据
        lift1.put("writeConfirm", new DbData("DB103.8", null));//写入确认数据
        lift1.put("confirm", new DbData("DB103.10", null));//确认命令
        lift1.put("switchIOMode", new DbData("DB103.12", null));//出入库模式

        HashMap<String, Object> lift2 = new HashMap<>();
        lift2.put("status", new DbData("DB104.0", (short) 16));//提升机数据
        lift2.put("staStatus", new DbData("DB105.0", (short) 14));//站点数据
        lift2.put("status", new DbData("DB104.0", (short) 18));//提升机数据
        lift2.put("staStatusTray", new DbData("DB105.0", (short) 14));//站点数据
        lift2.put("staStatusCar", new DbData("DB105.50", (short) 14));//站点数据
        lift2.put("write", new DbData("DB106.0", null));//写入数据
        lift2.put("writeConfirm", new DbData("DB106.8", null));//写入确认数据
        lift2.put("confirm", new DbData("DB106.10", null));//确认命令
@@ -102,18 +104,12 @@
        return siemensS7Net;
    }

    public synchronized HashMap<String, Object> read(Integer slaveId, String dbTag) {
    public synchronized OperateResultExOne<byte[]> read(Integer slaveId, String dbTag) {
        try {
            HashMap<String, Object> data = new HashMap<>();

            HashMap<String, Object> map = this.slaveAddressList.get(slaveId - 1);
            DbData dbData = (DbData) map.get(dbTag);
            OperateResultExOne<byte[]> result = siemensS7Net.Read(dbData.dbAddress, dbData.dbAddressLength);

            data.put("slaveId", slaveId);
            data.put("dbTag", dbTag);
            data.put("data", result);
            return data;
            return result;
        } catch (Exception e) {
            OutputQueue.FORKLIFT.offer(MessageFormat.format("【{0}】读取提升机状态信息失败 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
        }