From b9b2a2d3ecb19d42ef69ef14cc25b44f6dd5e359 Mon Sep 17 00:00:00 2001 From: zhao-meiyu <2970484253@qq.com> Date: Wed, 24 Jan 2024 16:18:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=84=9F=E7=9F=A5=E4=BA=8B=E4=BB=B6=E8=B6=8B?= =?UTF-8?q?=E5=8A=BF=E5=8A=A0=E6=96=B9=E5=90=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DCPerceivedEventsWarningController.java | 4 ++++ .../mapper/DcPerceivedEventsWarningMapper.java | 2 +- .../impl/DcPerceivedEventsWarningServiceImpl.java | 3 ++- .../business/DcPerceivedEventsWarningMapper.xml | 12 +++++++++--- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/zc-business/src/main/java/com/zc/business/controller/DCPerceivedEventsWarningController.java b/zc-business/src/main/java/com/zc/business/controller/DCPerceivedEventsWarningController.java index 13e0fe29..8ef25c96 100644 --- a/zc-business/src/main/java/com/zc/business/controller/DCPerceivedEventsWarningController.java +++ b/zc-business/src/main/java/com/zc/business/controller/DCPerceivedEventsWarningController.java @@ -110,6 +110,10 @@ public class DCPerceivedEventsWarningController extends BaseController { if (StringUtils.isBlank(sectionId)){ return AjaxResult.error("参数异常"); } + String direction = dcWarning.getDirection(); + if (StringUtils.isBlank(direction)){ + return AjaxResult.error("参数异常"); + } return AjaxResult.success(perceivedEventsWarningService.selectSectionMark(dcWarning)); } diff --git a/zc-business/src/main/java/com/zc/business/mapper/DcPerceivedEventsWarningMapper.java b/zc-business/src/main/java/com/zc/business/mapper/DcPerceivedEventsWarningMapper.java index cc8ccb99..4393be4a 100644 --- a/zc-business/src/main/java/com/zc/business/mapper/DcPerceivedEventsWarningMapper.java +++ b/zc-business/src/main/java/com/zc/business/mapper/DcPerceivedEventsWarningMapper.java @@ -56,7 +56,7 @@ public interface DcPerceivedEventsWarningMapper { //查询某个路段下的全部桩号 List> selectSectionMark(DcWarning dcWarning); //根据桩号查询条数 - String selectSectionNumber(@Param("stakeMarkId") String markId); + String selectSectionNumber(@Param("stakeMarkId") String markId,@Param("direction") String direction); //预警事件,事件列表 查询状态为上报的感知事件 List> selectWarningEscalation(DcWarning dcWarning); //修改感知事件信息 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 0cd497d5..e1263b7e 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 @@ -142,11 +142,12 @@ public class DcPerceivedEventsWarningServiceImpl implements IDCPerceivedEventsWa @Override public List> selectSectionMark(DcWarning dcWarning) { ArrayList numList = new ArrayList<>(); + String direction = dcWarning.getDirection(); List> mapList = perceivedEventsWarningMapper.selectSectionMark(dcWarning); for (HashMap list:mapList){ HashMap mapNum = new HashMap<>(); String id = (String) list.get("id"); - String sectionNumber = perceivedEventsWarningMapper.selectSectionNumber(id); + String sectionNumber = perceivedEventsWarningMapper.selectSectionNumber(id,direction); mapNum.put("markId",id); mapNum.put("sectionNumber",sectionNumber); numList.add(mapNum); diff --git a/zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml b/zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml index 4fe14cff..83aebdd1 100644 --- a/zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml +++ b/zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml @@ -78,6 +78,7 @@ FROM dc_warning AS warning LEFT JOIN dc_stake_mark AS mark ON warning.stake_mark_id=mark.id WHERE DATE_FORMAT(warning.create_time,'%Y-%m-%d')=DATE_FORMAT(#{createTime},'%Y-%m-%d') + AND warning.direction=#{direction} AND mark.`section_id`=#{sectionId} GROUP BY time @@ -86,6 +87,7 @@ FROM dc_warning as warning LEFT JOIN dc_stake_mark AS mark ON warning.stake_mark_id=mark.id WHERE DATE_FORMAT(warning.create_time,'%Y-%m') =DATE_FORMAT(#{createTime},'%Y-%m') + AND warning.direction=#{direction} and mark.`section_id`=#{sectionId} GROUP BY DAY ORDER BY DAY @@ -103,6 +105,7 @@ FROM dc_warning as warning LEFT JOIN dc_stake_mark AS mark ON warning.stake_mark_id=mark.id WHERE YEAR(warning.create_time) =DATE_FORMAT(#{createTime},'%Y') + AND warning.direction=#{direction} and mark.`section_id`=#{sectionId} GROUP BY QUARTER, MONTH ORDER BY QUARTER, MONTH; @@ -112,7 +115,7 @@ SELECT YEAR(warning.create_time) AS YEAR, COUNT(*) AS number FROM dc_warning as warning LEFT JOIN dc_stake_mark AS mark ON warning.stake_mark_id=mark.id - where mark.`section_id`=#{sectionId} + where mark.`section_id`=#{sectionId} AND warning.direction=#{direction} GROUP BY YEAR @@ -163,7 +169,7 @@ SELECT id FROM dc_stake_mark AS mark WHERE mark.section_id=#{sectionId}