From e7eef4e308e755dc624e9639d5559eded5908a5c Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Wed, 30 Jul 2025 15:17:28 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8E=AF=E5=A2=83=E8=AE=BE=E5=A4=8710=E5=88=86?= =?UTF-8?q?=E9=92=9F=E6=B2=A1=E6=9C=89=E6=8E=A5=E6=94=B6=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=B0=B1=E7=A6=BB=E7=BA=BF=EF=BC=8C=E6=B7=B7=E5=87=9D=E5=9C=9F?= =?UTF-8?q?=E6=8B=8C=E5=90=88=E7=AB=99bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xml/BridgeErectMachineDataMapper.xml | 6 +++--- .../ConcreteMixStationDataController.java | 1 + .../xml/ConcreteMixStationDataMapper.xml | 13 +++++++++++-- .../ConcreteMixStationMaterialDataMapper.xml | 18 ++++++++++-------- .../mapper/xml/EnvironmentDevMapper.xml | 2 +- .../xml/PitchMixStationMaterialDataMapper.xml | 4 ++-- ...bleWaterMixStationRawMaterialDataMapper.xml | 4 ++-- .../java/com/zhgd/xmgl/task/VideoTask.java | 8 +++++--- 8 files changed, 35 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/mapper/xml/BridgeErectMachineDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/mapper/xml/BridgeErectMachineDataMapper.xml index 322a0e0a6..4ab070c25 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/mapper/xml/BridgeErectMachineDataMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/mapper/xml/BridgeErectMachineDataMapper.xml @@ -51,10 +51,10 @@ and dev_sn = #{devSn} - and create_date > date_sub(create_date, interval 6 day) + and create_date > date_sub(current_date, interval 6 day) - and create_date > date_sub(create_date, interval 29 day) + and create_date > date_sub(current_date, interval 29 day) group by x @@ -67,7 +67,7 @@ and dev_sn = #{devSn} - and create_date > date_sub(create_date, interval 6 day) + and create_date > date_sub(current_date, interval 6 day) group by x diff --git a/src/main/java/com/zhgd/xmgl/modules/concretemixstation/controller/ConcreteMixStationDataController.java b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/controller/ConcreteMixStationDataController.java index 19a9ca914..82cb82699 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concretemixstation/controller/ConcreteMixStationDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/controller/ConcreteMixStationDataController.java @@ -158,6 +158,7 @@ public class ConcreteMixStationDataController { @ApiImplicitParams({ @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), @ApiImplicitParam(name = "devSn", value = "设备sn", paramType = "body", required = false, dataType = "String"), + @ApiImplicitParam(name = "type", value = "1今日2、7日3、30日", paramType = "body", required = true, dataType = "Integer"), }) @PostMapping(value = "/countUseStatus") public Result countUseStatus(@ApiIgnore @RequestBody HashMap paramMap) { diff --git a/src/main/java/com/zhgd/xmgl/modules/concretemixstation/mapper/xml/ConcreteMixStationDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/mapper/xml/ConcreteMixStationDataMapper.xml index 40dcd3b79..e607dd462 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concretemixstation/mapper/xml/ConcreteMixStationDataMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/mapper/xml/ConcreteMixStationDataMapper.xml @@ -56,6 +56,15 @@ and dev_sn = #{devSn} + + and discharge_time > current_date + + + and discharge_time > date_sub(current_date,interval 6 day) + + + and discharge_time > date_sub(current_date,interval 29 day) + group by use_status @@ -73,10 +82,10 @@ and discharge_time > current_date - and discharge_time > date_sub(discharge_time,interval 6 day) + and discharge_time > date_sub(current_date,interval 6 day) - and discharge_time > date_sub(discharge_time,interval 29 day) + and discharge_time > date_sub(current_date,interval 29 day) group by power_level diff --git a/src/main/java/com/zhgd/xmgl/modules/concretemixstation/mapper/xml/ConcreteMixStationMaterialDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/mapper/xml/ConcreteMixStationMaterialDataMapper.xml index bf3878cbb..e54654ad2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concretemixstation/mapper/xml/ConcreteMixStationMaterialDataMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/mapper/xml/ConcreteMixStationMaterialDataMapper.xml @@ -2,25 +2,27 @@ diff --git a/src/main/java/com/zhgd/xmgl/modules/environment/mapper/xml/EnvironmentDevMapper.xml b/src/main/java/com/zhgd/xmgl/modules/environment/mapper/xml/EnvironmentDevMapper.xml index f28fa9a39..1d58b64d4 100644 --- a/src/main/java/com/zhgd/xmgl/modules/environment/mapper/xml/EnvironmentDevMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/environment/mapper/xml/EnvironmentDevMapper.xml @@ -5,7 +5,7 @@ (case when round((UNIX_TIMESTAMP(now()) - UNIX_TIMESTAMP( ${real_time} - )) / 86400) <= 7 then 1 + )) / 60) <= 10 then 1 else 0 end) diff --git a/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/mapper/xml/PitchMixStationMaterialDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/mapper/xml/PitchMixStationMaterialDataMapper.xml index 8ceeea014..9a0c2aa73 100644 --- a/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/mapper/xml/PitchMixStationMaterialDataMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/mapper/xml/PitchMixStationMaterialDataMapper.xml @@ -15,10 +15,10 @@ and create_date > current_date - and create_date > date_sub(create_date,interval 6 day) + and create_date > date_sub(current_date,interval 6 day) - and create_date > date_sub(create_date,interval 29 day) + and create_date > date_sub(current_date,interval 29 day) group by material_name order by count desc diff --git a/src/main/java/com/zhgd/xmgl/modules/stablewater/mapper/xml/StableWaterMixStationRawMaterialDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/stablewater/mapper/xml/StableWaterMixStationRawMaterialDataMapper.xml index 0ce734f7d..75f29112b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/stablewater/mapper/xml/StableWaterMixStationRawMaterialDataMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/stablewater/mapper/xml/StableWaterMixStationRawMaterialDataMapper.xml @@ -15,10 +15,10 @@ and create_date > current_date - and create_date > date_sub(create_date,interval 6 day) + and create_date > date_sub(current_date,interval 6 day) - and create_date > date_sub(create_date,interval 29 day) + and create_date > date_sub(current_date,interval 29 day) group by clmc order by count desc diff --git a/src/main/java/com/zhgd/xmgl/task/VideoTask.java b/src/main/java/com/zhgd/xmgl/task/VideoTask.java index 312c78be6..53260f66f 100644 --- a/src/main/java/com/zhgd/xmgl/task/VideoTask.java +++ b/src/main/java/com/zhgd/xmgl/task/VideoTask.java @@ -18,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; +import org.springframework.web.bind.annotation.RequestMapping; import java.util.*; @@ -29,6 +30,7 @@ import java.util.*; **/ @Slf4j @Component +@RequestMapping("/xmgl/task/") public class VideoTask { @Autowired private ProjectVideoConfigMapper projectVideoConfigMapper; @@ -43,6 +45,7 @@ public class VideoTask { @SchedulerLock(name = "updateVideoState", lockAtMostFor = 1000 * 60 * 60, lockAtLeastFor = 1000 * 60 * 5) @Scheduled(cron = "0 0 */1 * * ?") + @RequestMapping("updateVideoState") public void updateVideoState() { try { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -54,8 +57,7 @@ public class VideoTask { } } } catch (Exception e) { - //log.error("error：",e); - log.info(e.getMessage()); + log.error("error：",e); } } @@ -65,7 +67,7 @@ public class VideoTask { queryWrapper.lambda().eq(VideoItem::getVideoId, videoConfig.getId()); List list = videoItemMapper.selectList(queryWrapper); if (list != null && list.size() > 0) { - if (videoConfig.getVideoType() == ProjectVideoConfigVideoTypeEnum.YSY.getValue()) { + if (Objects.equals(videoConfig.getVideoType(), ProjectVideoConfigVideoTypeEnum.YSY.getValue())) { String accessToken = YsVideoUtil.getToken(videoConfig.getAppId(), videoConfig.getAppSecret()); for (VideoItem videoItem : list) { Integer state = YsVideoUtil.getVideoStatus(videoConfig.getAppId(), videoConfig.getAppSecret(), videoItem.getSerialNumber(), accessToken);