register_config

src/main/java/org/mobidgim/mobidigimproject/model/register/RegisterDTO.java

@@ -11,6 +11,8 @@ import org.mobidgim.mobidigimproject.model.register.sebDTO.CanField;
 import org.mobidgim.mobidigimproject.model.register.sebDTO.ModbusField;
 import org.mobidgim.mobidigimproject.model.register.sebDTO.OpcUaField;
 
+import java.util.List;
+
 @Getter
 @Setter
 @JsonInclude(JsonInclude.Include.NON_NULL)
@@ -60,11 +62,11 @@ public class RegisterDTO {
 
     private String meid;
 
-    private ModbusField modbusField;
+    private List<ModbusField> modbusField;
 
-    private OpcUaField opcUaField;
+    private List<OpcUaField> opcUaField;
 
-    private CanField canField;
+    private List<CanField> canField;
 
 //    private String field;
 //

src/main/java/org/mobidgim/mobidigimproject/service/SettingService.java

@@ -16,6 +16,7 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 
 @Service
@@ -54,23 +55,23 @@ public class SettingService {
             Protocol protocol = request.getProtocol();
 
             if (protocol == Protocol.OPC_UA){
-                OpcUaField opcUaField = request.getOpcUaField();
+                List<OpcUaField> opcUaField = request.getOpcUaField();
-                if(opcUaField != null){
+                if(opcUaField != null && !opcUaField.isEmpty()){
-                    finalJsonMap.put("OPC_UA", Arrays.asList(opcUaField));
+                    finalJsonMap.put("OPC_UA", opcUaField);
                 }
             }
             else if(protocol == Protocol.MODBUS){
-                ModbusField modbusField = request.getModbusField();
+                List<ModbusField> modbusField = request.getModbusField();
-                if(modbusField != null){
+                if(modbusField != null && !modbusField.isEmpty()){
-                    finalJsonMap.put("MODBUS", Arrays.asList(modbusField));
+                    finalJsonMap.put("MODBUS", modbusField);
                 }
             }
         }
 
         if(request.getCanInput() == CanInput.On){
-            CanField canField = request.getCanField();
+            List<CanField> canField = request.getCanField();
-            if(canField != null){
+            if(canField != null && !canField.isEmpty()){
-                finalJsonMap.put("CAN", Arrays.asList(canField));
+                finalJsonMap.put("CAN", canField);
             }
         }