From d88afc2fbc2aa75b880eba49205c00de3b6da700 Mon Sep 17 00:00:00 2001
From: huangfeng <huangfeng@xinyingpower.com>
Date: Tue, 11 Jun 2024 09:21:31 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2i2?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xydl/cac/controller/I2syncController.java  |  8 ++++++++
 .../java/com/xydl/cac/entity/I2syncRecord.java |  3 +++
 .../com/xydl/cac/service/I2syncService.java    |  3 +++
 .../cac/service/impl/I2syncServiceImpl.java    | 18 ++++++++++++++++++
 4 files changed, 32 insertions(+)

diff --git a/src/main/java/com/xydl/cac/controller/I2syncController.java b/src/main/java/com/xydl/cac/controller/I2syncController.java
index ffae2c1..4424878 100644
--- a/src/main/java/com/xydl/cac/controller/I2syncController.java
+++ b/src/main/java/com/xydl/cac/controller/I2syncController.java
@@ -1,6 +1,7 @@
 package com.xydl.cac.controller;
 
 import com.xydl.cac.entity.I2syncConfig;
+import com.xydl.cac.entity.I2syncRecord;
 import com.xydl.cac.entity.ModevType;
 import com.xydl.cac.exception.BusinessException;
 import com.xydl.cac.model.Response;
@@ -72,4 +73,11 @@ public class I2syncController extends BasicController {
         return Response.success("OK");
     }
 
+    @GetMapping("listRecord")
+    @ApiOperation("查询导出记录")
+    public Response<List<I2syncRecord>> listRecord(Integer modevtypeId) {
+        List<I2syncRecord> result = service.listRecord(modevtypeId);
+        return Response.success(result);
+    }
+
 }
diff --git a/src/main/java/com/xydl/cac/entity/I2syncRecord.java b/src/main/java/com/xydl/cac/entity/I2syncRecord.java
index a5f993b..c9e3780 100644
--- a/src/main/java/com/xydl/cac/entity/I2syncRecord.java
+++ b/src/main/java/com/xydl/cac/entity/I2syncRecord.java
@@ -34,4 +34,7 @@ public class I2syncRecord {
     @Column(name = "last_d_time")
     private Date lastDTime;
 
+    @Transient
+    private NSensor sensor;
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/xydl/cac/service/I2syncService.java b/src/main/java/com/xydl/cac/service/I2syncService.java
index 96d0467..980f248 100644
--- a/src/main/java/com/xydl/cac/service/I2syncService.java
+++ b/src/main/java/com/xydl/cac/service/I2syncService.java
@@ -2,6 +2,7 @@ package com.xydl.cac.service;
 
 
 import com.xydl.cac.entity.I2syncConfig;
+import com.xydl.cac.entity.I2syncRecord;
 import com.xydl.cac.entity.ModevType;
 
 import java.util.List;
@@ -19,4 +20,6 @@ public interface I2syncService {
     void addConfig(I2syncConfig item);
 
     void delConfig(Integer id);
+
+    List<I2syncRecord> listRecord(Integer modevtypeId);
 }
diff --git a/src/main/java/com/xydl/cac/service/impl/I2syncServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/I2syncServiceImpl.java
index a9a5ddc..ca45c27 100644
--- a/src/main/java/com/xydl/cac/service/impl/I2syncServiceImpl.java
+++ b/src/main/java/com/xydl/cac/service/impl/I2syncServiceImpl.java
@@ -2,6 +2,7 @@ package com.xydl.cac.service.impl;
 
 import com.alibaba.excel.util.StringUtils;
 import com.xydl.cac.entity.*;
+import com.xydl.cac.exception.BusinessException;
 import com.xydl.cac.repository.*;
 import com.xydl.cac.service.I2syncService;
 import com.xydl.cac.service.ModevTypeService;
@@ -14,6 +15,7 @@ import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Optional;
 
 @Service
 @Slf4j
@@ -28,6 +30,10 @@ public class I2syncServiceImpl implements I2syncService {
     I2syncFieldRepository syncFieldRepository;
     @Resource
     I2syncConfigRepository configRepository;
+    @Resource
+    I2syncRecordRepository recordRepository;
+    @Resource
+    NSensorRepository sensorRepository;
 
     @Override
     public List<ModevType> listFieldConfig() {
@@ -93,4 +99,16 @@ public class I2syncServiceImpl implements I2syncService {
         configRepository.deleteById(id);
     }
 
+    @Override
+    public List<I2syncRecord> listRecord(Integer modevtypeId) {
+        List<I2syncRecord> list = recordRepository.findByModevtypeId(modevtypeId);
+        for (I2syncRecord record : list) {
+            List<NSensor> sensorList = sensorRepository.findByDevId(record.getEqmid());
+            if (!CollectionUtils.isEmpty(sensorList)) {
+                record.setSensor(sensorList.get(0));
+            }
+        }
+        return list;
+    }
+
 }