diff --git a/iot-access/access-api/src/main/java/com/njcn/access/pojo/dto/devModel/DataSetDto.java b/iot-access/access-api/src/main/java/com/njcn/access/pojo/dto/devModel/DataSetDto.java index 853a514..9017536 100644 --- a/iot-access/access-api/src/main/java/com/njcn/access/pojo/dto/devModel/DataSetDto.java +++ b/iot-access/access-api/src/main/java/com/njcn/access/pojo/dto/devModel/DataSetDto.java @@ -46,6 +46,10 @@ public class DataSetDto implements Serializable { @ApiModelProperty("Primary-一次值;Secondary-二次值") private String dataLevel; + @SerializedName("ConType") + @ApiModelProperty("接线方式 (0-星型,1-角型,2-V型)") + private Integer conType; + @SerializedName("DataArray") @NotEmpty(message = "数据集合描述,不可为空") private List dataArrayDtoList; diff --git a/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDevModelServiceImpl.java b/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDevModelServiceImpl.java index 25d02fc..18e5ddd 100644 --- a/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDevModelServiceImpl.java +++ b/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDevModelServiceImpl.java @@ -859,6 +859,7 @@ public class CsDevModelServiceImpl implements ICsDevModelService { csDataSet.setType(0); csDataSet.setClDev(0); csDataSet.setDataLevel(item1.getDataLevel()); + csDataSet.setConType(item1.getConType()); setList.add(csDataSet); List list = item1.getDataArrayDtoList(); if(CollectionUtil.isNotEmpty(list)) {