Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

wu

2024-01-24 12ae82141c1d6ed1a55922aae128ccfefb5b35dd

 springboot-vue3/src/main/java/com/example/springboot/entity/device/PlcParameterInfo.java

@@ -101,12 +101,14 @@
        String[] stringdatas = this.startAddress.trim().split("\\.");
        if (stringdatas.length < 2 )
            return null;
        int dbwindex = 0;
        int bitindex = 0;
         if (stringdatas.length == 2) {
            dbwindex = Integer.parseInt(stringdatas[1]);
        } else
            return null; 
        return stringdatas[0]+"."+dbwindex+bitindex;
    } 
    }

        int bitindex = index;

        return stringdatas[0]+"."+bitindex;
    }

    public int getPlcAddress() {

        return addressIndex;
    }
}