From 6bb50bdd01ba807981cbcfba4f06e7cade9ca452 Mon Sep 17 00:00:00 2001
From: hongawen <83944980@qq.com>
Date: Mon, 13 Jan 2025 18:39:04 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=8A=A5=E5=91=8A=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=8A=B6=E6=80=81=EF=BC=9B=202=E3=80=81?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=85=A8=E9=83=A8=E5=BD=92=E6=A1=A3=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A1=E5=88=92=E5=AE=8C=E6=88=90=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gather/device/device/pojo/param/PqDevParam.java    | 10 +++++-----
 .../com/njcn/gather/device/device/pojo/po/PqDev.java   |  4 ++--
 .../device/device/service/impl/PqDevServiceImpl.java   |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

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<PqMonitorParam> 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<PqDevMapper, PqDev> 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<PqDevMapper, PqDev> 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);