From 6422dedef7b23f86bb99a701fe6e43b98405734b Mon Sep 17 00:00:00 2001
From: wyw <373811525@qq.com>
Date: Tue, 13 Aug 2024 21:20:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=BC=B9=E7=AA=97=E5=B7=A1?=
 =?UTF-8?q?=E6=A3=80=E8=AE=B0=E5=BD=95=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DeviceDetailServiceImpl.java         | 23 +++++++++++++++++--
 .../xunjian/XjInspectionRecordsMapper.xml     |  6 +++++
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/service/devicedetail/impl/DeviceDetailServiceImpl.java b/fastbee-open-api/src/main/java/com/fastbee/data/service/devicedetail/impl/DeviceDetailServiceImpl.java
index 03ac8bd..c324ed2 100644
--- a/fastbee-open-api/src/main/java/com/fastbee/data/service/devicedetail/impl/DeviceDetailServiceImpl.java
+++ b/fastbee-open-api/src/main/java/com/fastbee/data/service/devicedetail/impl/DeviceDetailServiceImpl.java
@@ -12,6 +12,9 @@ import com.fastbee.waterele.domain.MaWatereleRecord;
 import com.fastbee.waterele.domain.dto.MaGuangaiRecordDto;
 import com.fastbee.waterele.domain.dto.MaWatereleRecordDto;
 import com.fastbee.xunjian.domain.XjInspectionRecords;
+import com.fastbee.xunjian.domain.XjInspectionRoutes;
+import com.fastbee.xunjian.mapper.XjInspectionRecordsMapper;
+import com.fastbee.xunjian.mapper.XjInspectionRoutesMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -26,6 +29,10 @@ public class DeviceDetailServiceImpl implements IDeviceDetailService {
     public IDeviceService iDeviceService;
     @Autowired
     private IThingsModelService thingsModelService;
+    @Autowired
+    private XjInspectionRoutesMapper xjInspectionRoutesMapper;
+    @Autowired
+    private XjInspectionRecordsMapper xjInspectionRecordsMapper;
     public DeviceDetailServiceImpl(DeviceMapper deviceMapper) {
         this.deviceMapper = deviceMapper;
     }
@@ -87,8 +94,20 @@ public class DeviceDetailServiceImpl implements IDeviceDetailService {
         if (device == null) {
             throw new RuntimeException("未查到该设备");
         }
-        List<XjInspectionRecords> xjInspectionRecords = new ArrayList<>();
-        return Collections.emptyList();
+        XjInspectionRoutes xjInspectionRoutes = new XjInspectionRoutes();
+        xjInspectionRoutes.setEngineeringObjectId(deviceId);
+        xjInspectionRoutes.setEngineeringObjectType("1");
+        List<XjInspectionRoutes> xjInspectionRoutes1 = xjInspectionRoutesMapper.selectXjInspectionRoutesList(xjInspectionRoutes);
+        if(xjInspectionRoutes1.size() > 0){
+            List<XjInspectionRecords> xjInspectionRecordsList = new ArrayList<>();
+            XjInspectionRecords xjInspectionRecords = new XjInspectionRecords();
+            xjInspectionRecords.setInspectionRouteId(xjInspectionRoutes1.get(0).getId());
+            xjInspectionRecords.setChaxunBeginTime(queryLogVo.getStartTime());
+            xjInspectionRecords.setChaxunEndTime(queryLogVo.getEndTime());
+            xjInspectionRecordsList = xjInspectionRecordsMapper.selectXjInspectionRecordsList(xjInspectionRecords);
+            return xjInspectionRecordsList;
+        }
+        return new ArrayList<>();
     }
 
 
diff --git a/fastbee-service/fastbee-xunjian-service/src/main/resources/mapper/xunjian/XjInspectionRecordsMapper.xml b/fastbee-service/fastbee-xunjian-service/src/main/resources/mapper/xunjian/XjInspectionRecordsMapper.xml
index e06c7cd..54cab28 100644
--- a/fastbee-service/fastbee-xunjian-service/src/main/resources/mapper/xunjian/XjInspectionRecordsMapper.xml
+++ b/fastbee-service/fastbee-xunjian-service/src/main/resources/mapper/xunjian/XjInspectionRecordsMapper.xml
@@ -63,6 +63,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
                 AND date_format(end_time ,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
             </if>
+            <if test="chaxunBeginTime != null and chaxunBeginTime != ''"><!-- 开始时间检索 -->
+                AND date_format(end_time ,'%y%m%d%H%i%s') &gt;= date_format(#{chaxunBeginTime},'%y%m%d%H%i%s')
+            </if>
+            <if test="chaxunEndTime != null and chaxunEndTime != ''"><!-- 结束时间检索 -->
+                AND date_format(end_time ,'%y%m%d%H%i%s') &lt;= date_format(#{chaxunEndTime},'%y%m%d%H%i%s')
+            </if>
         </where>
         order by id desc
     </select>