From 5337130771009bf4ea8bd262ee59b109686f26bf Mon Sep 17 00:00:00 2001 From: wangsixiang <2970484253@qq.com> Date: Mon, 30 Dec 2024 09:54:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=93=8D=E5=BA=94=E9=80=9F?= =?UTF-8?q?=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DcPerceivedEventsWarningServiceImpl.java | 13 +++++++++---- .../business/DcPerceivedEventsWarningMapper.xml | 3 ++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcPerceivedEventsWarningServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcPerceivedEventsWarningServiceImpl.java index 9eec57a3..1267d6b6 100644 --- a/zc-business/src/main/java/com/zc/business/service/impl/DcPerceivedEventsWarningServiceImpl.java +++ b/zc-business/src/main/java/com/zc/business/service/impl/DcPerceivedEventsWarningServiceImpl.java @@ -1,5 +1,6 @@ package com.zc.business.service.impl; +import cn.hutool.core.date.DateUtil; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.StakeMarkUtils; import com.ruoyi.common.utils.StringUtils; @@ -11,7 +12,11 @@ import com.zc.business.service.IDCPerceivedEventsWarningService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * @author 王思祥 @@ -90,9 +95,9 @@ public class DcPerceivedEventsWarningServiceImpl implements IDCPerceivedEventsWa public List> selectSectionPerceivedEventsList( ) { DcWarning dcWarning = new DcWarning(); Date nowDate = DateUtils.getNowDate(); - dcWarning.setWarningTime(nowDate); - List> dcWarnings = perceivedEventsWarningMapper.selectSectionPerceivedEventsList(dcWarning); - return dcWarnings; + dcWarning.setStartTime(DateUtil.beginOfDay(nowDate)); + dcWarning.setEndTime(DateUtil.endOfDay(nowDate)); + return perceivedEventsWarningMapper.selectSectionPerceivedEventsList(dcWarning); } //查询感知数量按照路段进行区分 @Override diff --git a/zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml b/zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml index f700924d..62a17d67 100644 --- a/zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml +++ b/zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml @@ -132,7 +132,8 @@ FROM dc_road_section AS s LEFT JOIN ( SELECT mark.section_id, COUNT(1) AS number FROM dc_warning AS w JOIN dc_stake_mark AS mark ON mark.stake_mark = w.stake_mark AND mark.direction = w.direction - WHERE mark.stake_mark IS NOT NULL AND DATE_FORMAT(w.warning_time, '%Y-%m-%d') = DATE_FORMAT(#{warningTime}, '%Y-%m-%d') + WHERE mark.stake_mark IS NOT NULL AND w.warning_time >= #{startTime} + AND w.warning_time <=#{endTime} and w.warning_source!=6 GROUP BY mark.section_id ) AS w_count ON s.id = w_count.section_id ORDER BY number DESC;