From 1222d39d428c0a0e6b4c39197d55cba0ba2fa381 Mon Sep 17 00:00:00 2001
From: huangfeng <huangfeng@xinyingpower.com>
Date: Mon, 4 Mar 2024 10:27:32 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4sensor=E8=A1=A8?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8typeid=E6=9B=BF=E6=8D=A2tablename?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/xydl/cac/entity/NSensor.java     | 14 ++++++++++---
 .../com/xydl/cac/excel/CacExcelListener.java  |  2 ++
 .../cac/service/impl/NSensorServiceImpl.java  | 20 ++++++++++++-------
 3 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/xydl/cac/entity/NSensor.java b/src/main/java/com/xydl/cac/entity/NSensor.java
index 3b5073c..de1afe9 100644
--- a/src/main/java/com/xydl/cac/entity/NSensor.java
+++ b/src/main/java/com/xydl/cac/entity/NSensor.java
@@ -37,9 +37,9 @@ public class NSensor {
     @Column(name = "phase")
     private String phase;
 
-    @ApiModelProperty("设备对应的表名")
-    @Column(name = "table_name")
-    private String tableName;
+    @Column(name = "type_id")
+    @ApiModelProperty("类型Id")
+    private Integer typeId;
 
     @ApiModelProperty("传感器的唯一标识")
     @Column(name = "sensor_code")
@@ -69,6 +69,14 @@ public class NSensor {
     @Transient
     private String zsbName;
 
+    @ApiModelProperty("类型名称")
+    @Transient
+    private String typeName;
+
+    @ApiModelProperty("设备对应的表名")
+    @Transient
+    private String tableName;
+
     @Transient
     private List<NPoint> points;
 
diff --git a/src/main/java/com/xydl/cac/excel/CacExcelListener.java b/src/main/java/com/xydl/cac/excel/CacExcelListener.java
index 008a3df..f462ac7 100644
--- a/src/main/java/com/xydl/cac/excel/CacExcelListener.java
+++ b/src/main/java/com/xydl/cac/excel/CacExcelListener.java
@@ -64,6 +64,8 @@ public class CacExcelListener extends AnalysisEventListener<CacLine> {
                     ModevType modevType = typeMap.get(line.getTableName());
                     if (modevType == null) {
                         errorList.add("第" + row + "行的表名" + line.getTableName() + "未找到对应的监测设备类型");
+                    } else {
+                        sensor.setTypeId(modevType.getId());
                     }
                 }
                 sensor.setTableName(line.getTableName());
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 566fe3c..893ebaa 100644
--- a/src/main/java/com/xydl/cac/service/impl/NSensorServiceImpl.java
+++ b/src/main/java/com/xydl/cac/service/impl/NSensorServiceImpl.java
@@ -8,10 +8,7 @@ import com.xydl.cac.model.SensorDetail;
 import com.xydl.cac.model.SensorUpdateModel;
 import com.xydl.cac.repository.NPointRepository;
 import com.xydl.cac.repository.NSensorRepository;
-import com.xydl.cac.service.DataService;
-import com.xydl.cac.service.NSensorService;
-import com.xydl.cac.service.UnitService;
-import com.xydl.cac.service.ZsbService;
+import com.xydl.cac.service.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.data.domain.Page;
@@ -39,6 +36,8 @@ public class NSensorServiceImpl implements NSensorService {
     DataService dataService;
     @Resource
     ZsbService zsbService;
+    @Resource
+    ModevTypeService modevTypeService;
 
     @Override
     public List<NSensor> listAll(Integer zsbid) throws Exception {
@@ -48,12 +47,13 @@ public class NSensorServiceImpl implements NSensorService {
         } else {
             list = repository.findByZsbId(zsbid);
         }
-        this.fillZsbName(list);
+        this.fillOtherNames(list);
         return list;
     }
 
-    private void fillZsbName(List<NSensor> list) throws Exception {
+    private void fillOtherNames(List<NSensor> list) throws Exception {
         List<Zsb> zsbList = zsbService.listAll(null);
+        List<ModevType> modevTypeList = modevTypeService.listAll();
         if (!CollectionUtils.isEmpty(list) && !CollectionUtils.isEmpty(zsbList)) {
             for (NSensor sensor : list) {
                 for (Zsb zsb : zsbList) {
@@ -62,6 +62,12 @@ public class NSensorServiceImpl implements NSensorService {
                         break;
                     }
                 }
+                for (ModevType type : modevTypeList) {
+                    if (type.getId().equals(sensor.getTypeId())) {
+                        sensor.setTypeName(type.getMc());
+                        sensor.setTableName(type.getTablename());
+                    }
+                }
             }
         }
     }
@@ -70,7 +76,7 @@ public class NSensorServiceImpl implements NSensorService {
     public Page<NSensor> list(int pageNum, int pageSize) throws Exception {
         PageRequest request = PageRequest.of(pageNum, pageSize);
         Page<NSensor> result = repository.findAll(request);
-        this.fillZsbName(result.getContent());
+        this.fillOtherNames(result.getContent());
         return result;
     }