diff --git a/iot-access/access-api/src/main/java/com/njcn/access/pojo/dto/data/EpdPqdDto.java b/iot-access/access-api/src/main/java/com/njcn/access/pojo/dto/data/EpdPqdDto.java index b7efad8..fe80b0e 100644 --- a/iot-access/access-api/src/main/java/com/njcn/access/pojo/dto/data/EpdPqdDto.java +++ b/iot-access/access-api/src/main/java/com/njcn/access/pojo/dto/data/EpdPqdDto.java @@ -44,11 +44,11 @@ public class EpdPqdDto implements Serializable { @SerializedName("HarmStart") @ApiModelProperty("数据开始谐波次数") - private Double harmStart; + private Integer harmStart; @SerializedName("HarmEnd") @ApiModelProperty("数据结束谐波次数") - private Double harmEnd; + private Integer harmEnd; @SerializedName("StatMethod") @ApiModelProperty("数据统计方法(max,min,avg,cp95)") 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 01c0c63..976e615 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 @@ -8,7 +8,6 @@ import com.njcn.access.enums.DataModel; import com.njcn.access.mapper.CsDevModelMapper; import com.njcn.access.pojo.dto.data.*; import com.njcn.access.pojo.dto.devModel.*; -import com.njcn.access.pojo.param.DevModelParam; import com.njcn.access.pojo.po.CsDataArrayPO; import com.njcn.access.pojo.po.CsDataSetPO; import com.njcn.access.pojo.po.CsLineModel;