From 6b0546f5f4f44d06496c6df37fe31adac9fbd0d2 Mon Sep 17 00:00:00 2001
From: huangfeng <huangfeng@xinyingpower.com>
Date: Tue, 5 Mar 2024 14:33:59 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8E=BB=E9=99=A4=E4=B8=8D=E7=94=A8?=
 =?UTF-8?q?=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/xydl/cac/entity/Modev.java          |  3 ---
 .../java/com/xydl/cac/repository/ModevRepository.java |  3 ---
 src/main/java/com/xydl/cac/service/ModevService.java  |  1 -
 .../com/xydl/cac/service/impl/ModevServiceImpl.java   | 11 -----------
 .../com/xydl/cac/service/impl/NSensorServiceImpl.java |  2 +-
 5 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/src/main/java/com/xydl/cac/entity/Modev.java b/src/main/java/com/xydl/cac/entity/Modev.java
index f85f533..187c6cc 100644
--- a/src/main/java/com/xydl/cac/entity/Modev.java
+++ b/src/main/java/com/xydl/cac/entity/Modev.java
@@ -109,9 +109,6 @@ public class Modev {
     @Column(name = "secondEid")
     private Integer secondEid;
 
-    @Column(name = "icdid")
-    private Integer icdid;
-
     @ApiModelProperty("主设备名称")
     @Transient
     private String zsbname;
diff --git a/src/main/java/com/xydl/cac/repository/ModevRepository.java b/src/main/java/com/xydl/cac/repository/ModevRepository.java
index 94cd182..babbc12 100644
--- a/src/main/java/com/xydl/cac/repository/ModevRepository.java
+++ b/src/main/java/com/xydl/cac/repository/ModevRepository.java
@@ -15,7 +15,4 @@ public interface ModevRepository extends JpaRepository<Modev, Integer>, JpaSpeci
 
     List<Modev> findByZsbidAndName(Integer zsbid, String name);
 
-    List<Modev> findByIcdidAndIdIsNot(Integer icdid, Integer id);
-
-    List<Modev> findByIcdidIsNotNull();
 }
\ No newline at end of file
diff --git a/src/main/java/com/xydl/cac/service/ModevService.java b/src/main/java/com/xydl/cac/service/ModevService.java
index f37e58c..90fd24b 100644
--- a/src/main/java/com/xydl/cac/service/ModevService.java
+++ b/src/main/java/com/xydl/cac/service/ModevService.java
@@ -16,5 +16,4 @@ public interface ModevService {
 
     Modev detail(Integer id) throws Exception;
 
-    void bindicd(Integer id, Integer icdid) throws Exception;
 }
diff --git a/src/main/java/com/xydl/cac/service/impl/ModevServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/ModevServiceImpl.java
index 3877dfd..3c8069f 100644
--- a/src/main/java/com/xydl/cac/service/impl/ModevServiceImpl.java
+++ b/src/main/java/com/xydl/cac/service/impl/ModevServiceImpl.java
@@ -85,15 +85,4 @@ public class ModevServiceImpl implements ModevService {
         return optional.get();
     }
 
-
-    @Override
-    public void bindicd(Integer id, Integer icdid) throws Exception {
-        Modev entity = repository.findById(id).orElse(null);
-        if (entity != null) {
-            entity.setIcdid(icdid);
-            repository.save(entity);
-        } else {
-            throw new BusinessException("未找到对应的检测装置");
-        }
-    }
 }
diff --git a/src/main/java/com/xydl/cac/service/impl/NSensorServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/NSensorServiceImpl.java
index 8e37d88..a8e49a5 100644
--- a/src/main/java/com/xydl/cac/service/impl/NSensorServiceImpl.java
+++ b/src/main/java/com/xydl/cac/service/impl/NSensorServiceImpl.java
@@ -198,7 +198,7 @@ public class NSensorServiceImpl implements NSensorService {
         for (Modev item : list) {
             NSensor sensor = item.transform();
             List<NSensor> slist = repository.findByDevId(sensor.getDevId());
-            if (CollectionUtils.isEmpty(list)) {
+            if (CollectionUtils.isEmpty(slist)) {
                 this.add(sensor);
                 success++;
             } else {