Microservice/iot
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增数据集接线方式

Browse Source
This commit is contained in:
xy
2024-11-28 16:39:49 +08:00
parent b5267c24f4
commit 3861726801
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
iot-access/access-api/src/main/java/com/njcn/access/pojo/dto/devModel/DataSetDto.java
View File

@@ -46,6 +46,10 @@ public class DataSetDto implements Serializable {
@ApiModelProperty("Primary-一次值;Secondary-二次值") @ApiModelProperty("Primary-一次值;Secondary-二次值")
private String dataLevel; private String dataLevel;
@SerializedName("ConType")
@ApiModelProperty("接线方式 （0-星型,1-角型,2-V型）")
private Integer conType;
@SerializedName("DataArray") @SerializedName("DataArray")
@NotEmpty(message = "数据集合描述,不可为空") @NotEmpty(message = "数据集合描述,不可为空")
private List<DataArrayDto> dataArrayDtoList; private List<DataArrayDto> dataArrayDtoList;

1
iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDevModelServiceImpl.java
View File

@@ -859,6 +859,7 @@ public class CsDevModelServiceImpl implements ICsDevModelService {
csDataSet.setType(0); csDataSet.setType(0);
csDataSet.setClDev(0); csDataSet.setClDev(0);
csDataSet.setDataLevel(item1.getDataLevel()); csDataSet.setDataLevel(item1.getDataLevel());
csDataSet.setConType(item1.getConType());
setList.add(csDataSet); setList.add(csDataSet);
List<DataArrayDto> list = item1.getDataArrayDtoList(); List<DataArrayDto> list = item1.getDataArrayDtoList();
if(CollectionUtil.isNotEmpty(list)) { if(CollectionUtil.isNotEmpty(list)) {