Merge branch '20230722' into 'master_dev'

20230722

See merge request yunteng/thingskit!214

+package org.thingsboard.server.common.data.yunteng.enums;
+
+public enum TkModebusFunctionCode {
+    READ_COIL("01",1),
+    REAL_SPLIT_INPUT("02",1),
+    READ_PERSIST_REGISTER("03",1),
+    READ_INPUT_REGISTER("04",1),
+    WRITE_ONE_COIL("05",1),
+    WRITE_ONE_REGISTER("06",1),
+    WRITE_MANY_COIL("0F",1),
+    WRITE_MANY_REGISTER("10",2),
+    READ_FILE("14",1),
+    WRITE_FILE("15",1),
+    PREVENT_WRITE_REGISTER("16",1),
+    READ_WRITE_MANY_REGISTER("17",1),
+    READ_DEVICE_IDENTIFICATION("2B",1);
+
+
+    /**16进制功能码*/
+    private final String code;
+    /**寄存器值长度*/
+    private final Integer valueSize;
+
+    TkModebusFunctionCode(String code, Integer valueSize) {
+        this.code = code;
+        this.valueSize = valueSize;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public Integer getValueSize() {
+        return valueSize;
+    }
+}

@@ -17,6 +17,7 @@ import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidatio
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.*;
 import org.thingsboard.server.common.data.yunteng.enums.StatusEnum;
+import org.thingsboard.server.common.data.yunteng.enums.TkModebusFunctionCode;
 import org.thingsboard.server.common.data.yunteng.enums.TkScriptFunctionType;
 import org.thingsboard.server.common.data.yunteng.enums.TransportTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.ByteUtils;
@@ -315,7 +316,7 @@ public class TkDeviceScriptServiceImpl
     if(values ==null || values.isEmpty()){
       //读寄存器数据
       result.append(modelHex(registerNum));
-    }else if(values.size() == 1){
+    }else if(values.size() == 1 &&(TkModebusFunctionCode.WRITE_ONE_COIL.getCode().equals(functionCode) ||TkModebusFunctionCode.WRITE_ONE_REGISTER.getCode().equals(functionCode) )){
       //单个写入
       result.append(modelHex(values.get(0)));
     }else{
@@ -341,7 +342,7 @@ public class TkDeviceScriptServiceImpl
   }
   private String multData(String functionCode,List<Integer>datas){
     StringBuilder dataStr = new StringBuilder();
-    if("16".equals(functionCode)){
+    if(TkModebusFunctionCode.WRITE_MANY_REGISTER.equals(functionCode)){
       dataStr.append(dataLength(datas.size()*2));
       for(Integer item: datas){
         dataStr.append(modelHex(item));