From 38617268015ab0deb6fe91ce7102dfce3c354aee Mon Sep 17 00:00:00 2001 From: xy <748613696@qq.com> Date: Thu, 28 Nov 2024 16:39:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=95=B0=E6=8D=AE=E9=9B=86?= =?UTF-8?q?=E6=8E=A5=E7=BA=BF=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/njcn/access/pojo/dto/devModel/DataSetDto.java | 4 ++++ .../com/njcn/access/service/impl/CsDevModelServiceImpl.java | 1 + 2 files changed, 5 insertions(+) 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)) {