From 663fd6e29a2c702605cbe45e399523e6eff451d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=B9=E4=BA=AE?= Date: Mon, 20 Oct 2025 10:07:22 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../screen/service/impl/SjProjectSafetyServiceImpl.java | 6 ++++-- .../main/resources/mapper/SjProjectEnvironmentMapper.xml | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/SjProjectSafetyServiceImpl.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/SjProjectSafetyServiceImpl.java index 12014f5..7a2291e 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/SjProjectSafetyServiceImpl.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/SjProjectSafetyServiceImpl.java @@ -37,9 +37,11 @@ public class SjProjectSafetyServiceImpl implements SjProjectSafetyService { List sjProjectSafeties = mapper.selectProSafetyVideo(o); sjProjectSafeties.forEach(data -> { Result result= remoteFileService.getFileBast64(data.getImagePath(), SecurityConstants.INNER); - data.setImagePath(result.getData().getUrl()); + if(result != null && Result.isSuccess(result)){ + data.setImagePath(result.getData().getUrl()); + } }); - return mapper.selectProSafetyVideo(o); + return sjProjectSafeties; } @Override diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/SjProjectEnvironmentMapper.xml b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/SjProjectEnvironmentMapper.xml index f062b94..93d3cbc 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/SjProjectEnvironmentMapper.xml +++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/SjProjectEnvironmentMapper.xml @@ -41,7 +41,7 @@ tpd.bid_code = #{bidCode} AND tbd.device_code = #{deviceCode} AND thdv.create_time IS NOT NULL - AND DATE(thdv.create_time) BETWEEN #{startDate} AND #{startDate} + AND DATE(thdv.create_time) BETWEEN #{startDate} AND #{endDate} ORDER BY currentDay,`hour`