diff --git a/device/src/main/java/com/njcn/gather/device/device/pojo/param/PqDevParam.java b/device/src/main/java/com/njcn/gather/device/device/pojo/param/PqDevParam.java index e01c7631..35ea37ca 100644 --- a/device/src/main/java/com/njcn/gather/device/device/pojo/param/PqDevParam.java +++ b/device/src/main/java/com/njcn/gather/device/device/pojo/param/PqDevParam.java @@ -134,11 +134,11 @@ public class PqDevParam { @Valid private List monitorList; - @ApiModelProperty("icd") - private String icd; - - @ApiModelProperty("power") - private String power; + @ApiModelProperty("icdId") + private String icdId; +// +// @ApiModelProperty("power") +// private String power; /** * 更新操作实体 diff --git a/device/src/main/java/com/njcn/gather/device/device/pojo/po/PqDev.java b/device/src/main/java/com/njcn/gather/device/device/pojo/po/PqDev.java index 148b96ed..71b586b0 100644 --- a/device/src/main/java/com/njcn/gather/device/device/pojo/po/PqDev.java +++ b/device/src/main/java/com/njcn/gather/device/device/pojo/po/PqDev.java @@ -204,8 +204,8 @@ public class PqDev extends BaseEntity implements Serializable { */ private Integer factorCheckResult; - private String icd; + private String icdId; - private String power; +// private String power; } diff --git a/device/src/main/java/com/njcn/gather/device/device/service/impl/PqDevServiceImpl.java b/device/src/main/java/com/njcn/gather/device/device/service/impl/PqDevServiceImpl.java index 3612bf24..46bfd9c5 100644 --- a/device/src/main/java/com/njcn/gather/device/device/service/impl/PqDevServiceImpl.java +++ b/device/src/main/java/com/njcn/gather/device/device/service/impl/PqDevServiceImpl.java @@ -71,7 +71,7 @@ public class PqDevServiceImpl extends ServiceImpl implements @Override @Transactional(rollbackFor = {Exception.class}) public boolean addPqDev(PqDevParam pqDevParam) { - this.checkRepeat(pqDevParam, false); +// this.checkRepeat(pqDevParam, false); PqDev pqDev = new PqDev(); BeanUtil.copyProperties(pqDevParam, pqDev); @@ -105,7 +105,7 @@ public class PqDevServiceImpl extends ServiceImpl implements @Override @Transactional(rollbackFor = {Exception.class}) public boolean updatePqDev(PqDevParam.UpdateParam updateParam) { - this.checkRepeat(updateParam, true); +// this.checkRepeat(updateParam, true); PqDev pqDev = new PqDev(); BeanUtil.copyProperties(updateParam, pqDev);