From daff98377f38360f4dd00e19bf70862b4baf57c2 Mon Sep 17 00:00:00 2001
From: huangfeng <huangfeng@xinyingpower.com>
Date: Wed, 19 Jun 2024 11:24:59 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BB=8E=E6=97=A7=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E7=9A=84=E6=97=B6=E5=80=99=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E4=BB=8Ei2relation=E5=AF=BC=E5=85=A5=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/xydl/cac/entity/I2relation.java  | 44 +++++++++++++++++++
 .../cac/repository/I2relationRepository.java  | 16 +++++++
 .../cac/service/impl/NSensorServiceImpl.java  | 10 +++++
 3 files changed, 70 insertions(+)
 create mode 100644 src/main/java/com/xydl/cac/entity/I2relation.java
 create mode 100644 src/main/java/com/xydl/cac/repository/I2relationRepository.java

diff --git a/src/main/java/com/xydl/cac/entity/I2relation.java b/src/main/java/com/xydl/cac/entity/I2relation.java
new file mode 100644
index 0000000..a17b7ef
--- /dev/null
+++ b/src/main/java/com/xydl/cac/entity/I2relation.java
@@ -0,0 +1,44 @@
+package com.xydl.cac.entity;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.*;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@Entity
+@Table(name = "i2relation")
+@ApiModel("i2关联表")
+public class I2relation {
+
+    @Id
+    @Column(name = "sensorid")
+    private String sensorid;
+
+    @Column(name = "eqmid")
+    private Integer eqmid;
+
+    @Column(name = "cacid")
+    private String cacid;
+
+    @Column(name = "equipmentid")
+    private String equipmentid;
+
+    @Column(name = "monitortype")
+    private String monitortype;
+
+    @Column(name = "phase")
+    private String phase;
+
+    @Column(name = "sensorindex")
+    private Integer sensorindex;
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/xydl/cac/repository/I2relationRepository.java b/src/main/java/com/xydl/cac/repository/I2relationRepository.java
new file mode 100644
index 0000000..131f51d
--- /dev/null
+++ b/src/main/java/com/xydl/cac/repository/I2relationRepository.java
@@ -0,0 +1,16 @@
+package com.xydl.cac.repository;
+
+import com.xydl.cac.entity.I2relation;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+
+@Repository
+public interface I2relationRepository extends JpaRepository<I2relation, Integer>, JpaSpecificationExecutor<I2relation> {
+
+    List<I2relation> findByEqmid(Integer eqmid);
+
+}
\ No newline at end of file
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 1bd7f17..c28bb1b 100644
--- a/src/main/java/com/xydl/cac/service/impl/NSensorServiceImpl.java
+++ b/src/main/java/com/xydl/cac/service/impl/NSensorServiceImpl.java
@@ -7,6 +7,7 @@ import com.xydl.cac.model.ConditionModel;
 import com.xydl.cac.model.OnePage;
 import com.xydl.cac.model.SensorDetail;
 import com.xydl.cac.model.SensorUpdateModel;
+import com.xydl.cac.repository.I2relationRepository;
 import com.xydl.cac.repository.ModevRepository;
 import com.xydl.cac.repository.NSensorRepository;
 import com.xydl.cac.repository.WarnRuleRepository;
@@ -48,6 +49,8 @@ public class NSensorServiceImpl implements NSensorService {
     ModevRepository modevRepository;
     @Resource
     WarnRuleRepository ruleRepository;
+    @Resource
+    I2relationRepository i2relationRepository;
 
     @Override
     public List<NSensor> listAll(Integer zsbid) throws Exception {
@@ -286,6 +289,13 @@ public class NSensorServiceImpl implements NSensorService {
         List<Modev> list = modevRepository.findAll();
         for (Modev item : list) {
             NSensor sensor = item.transform();
+            List<I2relation> i2relations = i2relationRepository.findByEqmid(item.getId());
+            if (!CollectionUtils.isEmpty(i2relations)) {
+                I2relation i2relation = i2relations.get(0);
+                sensor.setEquipmentId(i2relation.getEquipmentid());
+                sensor.setSensorCode(i2relation.getSensorid());
+                sensor.setPhase(i2relation.getPhase());
+            }
             List<NSensor> slist = repository.findByDevId(sensor.getDevId());
             if (CollectionUtils.isEmpty(slist)) {
                 this.add(sensor);