Merge branch '20230801' into 'master_dev'

fix: modbus写多线圈问题修复

See merge request yunteng/thingskit!219

@@ -334,27 +334,33 @@ public class TkDeviceScriptServiceImpl
   }
   private String multData(String functionCode,List<Integer>datas){
     StringBuilder dataStr = new StringBuilder();
+    int dataLength = datas.size();
     if(TkModBusFunctionCode.WRITE_MANY_REGISTER.getCode().equals(functionCode)){
-      dataStr.append(dataLength(datas.size()*2));
+      dataStr.append(dataLength(dataLength*2));
       for(Integer item: datas){
         dataStr.append(modelHex(item));
       }
     }else{
-      int filter = datas.size()%8;
-      int num = datas.size()/8;
-      dataStr.append(dataLength(filter == 0 ?num:num+1));
-      byte one = 0x00;
-      int index =1;
-      for(Integer item: datas){
-        byte byteVal=item.byteValue();
-        one =(byte)(one<< 1);
-        one ^= byteVal;
-        if(index%8==0 || datas.size() == index){
-          dataStr.append(ByteUtils.byteToHex(one));
-          one=0x00;
-        }
-        index++;
 
+      int residue = dataLength%8;
+      int num = dataLength/8;
+      dataStr.append(dataLength(residue == 0 ?num:num+1));
+
+      Integer wordVal=0;
+      for(int dataIndex=0,wordIndex=0;dataIndex<dataLength;dataIndex++){
+        Integer itemVal = datas.get(dataIndex);
+        if(itemVal == 1){
+          byte one = 1;
+          one<<=wordIndex;
+          wordVal+=one;
+        }
+        if(dataIndex%8==7 || dataLength == dataIndex+1){
+          dataStr.append(ByteUtils.byteToHex(wordVal.byteValue()));
+          wordVal=0;
+          wordIndex=0;
+        }else{
+          wordIndex++;
+        }
       }
     }
     return dataStr.toString();