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 = new ArrayList<>(); - return Collections.emptyList(); + XjInspectionRoutes xjInspectionRoutes = new XjInspectionRoutes(); + xjInspectionRoutes.setEngineeringObjectId(deviceId); + xjInspectionRoutes.setEngineeringObjectType("1"); + List xjInspectionRoutes1 = xjInspectionRoutesMapper.selectXjInspectionRoutesList(xjInspectionRoutes); + if(xjInspectionRoutes1.size() > 0){ + List 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" AND date_format(end_time ,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d') + + AND date_format(end_time ,'%y%m%d%H%i%s') >= date_format(#{chaxunBeginTime},'%y%m%d%H%i%s') + + + AND date_format(end_time ,'%y%m%d%H%i%s') <= date_format(#{chaxunEndTime},'%y%m%d%H%i%s') + order by id desc