From ce3f9b8350e1ec8ef678c401619fbc87958ebfb0 Mon Sep 17 00:00:00 2001 From: wuweida <2918581207@qq.com> Date: Thu, 9 Jun 2022 09:15:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=9C=B0=E6=8E=A5=E5=8F=A3=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../monitormanage/controller/BuildingController.java | 12 ++++++------ .../monitormanage/mapper/BuildingRecordsMapper.java | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/hisense/monitormanage/controller/BuildingController.java b/src/main/java/com/hisense/monitormanage/controller/BuildingController.java index 9a9eedb..3e3d963 100644 --- a/src/main/java/com/hisense/monitormanage/controller/BuildingController.java +++ b/src/main/java/com/hisense/monitormanage/controller/BuildingController.java @@ -100,11 +100,11 @@ public class BuildingController { } /** - * 查询近一月工地扬尘并排序 + * 查询近30天工地扬尘并排序 * @return */ @GetMapping("selectMonthPm10") - @ApiOperation("查询近一月工地扬尘并排序") + @ApiOperation("查询近30天工地扬尘并排序") public Result selectMonthPm10(){ List recordsDtos = buildingRecordsMapper.selectMonthPm10(); Result success = Result.success(recordsDtos); @@ -136,11 +136,11 @@ public class BuildingController { } /** - * 查询近一月工地噪声并排序 + * 查询近30天工地噪声并排序 * @return */ @GetMapping("selectMonthNoice") - @ApiOperation("查询近一月工地噪声并排序") + @ApiOperation("查询近30天工地噪声并排序") public Result selectMonthNoice(){ List recordsDtos = buildingRecordsMapper.selectMonthNoice(); Result success = Result.success(recordsDtos); @@ -172,11 +172,11 @@ public class BuildingController { } /** - * 根据工地名称查询近一月工地噪声和扬尘的信息 + * 根据工地名称查询近30天工地噪声和扬尘的信息 * @return */ @GetMapping("selectMonthAll") - @ApiOperation("根据工地名称查询近一月工地噪声和扬尘的信息") + @ApiOperation("根据工地名称查询近30天工地噪声和扬尘的信息") public Result selectMonthAll(String projectName){ List recordsDtos = buildingRecordsMapper.selectMonthAll(projectName); Result success = Result.success(recordsDtos); diff --git a/src/main/java/com/hisense/monitormanage/mapper/BuildingRecordsMapper.java b/src/main/java/com/hisense/monitormanage/mapper/BuildingRecordsMapper.java index 6225efc..0406164 100644 --- a/src/main/java/com/hisense/monitormanage/mapper/BuildingRecordsMapper.java +++ b/src/main/java/com/hisense/monitormanage/mapper/BuildingRecordsMapper.java @@ -31,11 +31,11 @@ public interface BuildingRecordsMapper extends BaseMapper { List selectDayPm10(); @Select("select * from t_building_records br JOIN t_building_new_site bs on br.project_name = bs.gdmc" + - " where DATE_SUB(CURDATE(), INTERVAL 7 DAY) <= date(br.push_time) order by br.pm10 desc") + " where DATE_SUB(CURDATE(), INTERVAL 7 DAY) < date(br.push_time) order by br.pm10 desc") List selectWeekPm10(); @Select("select * from t_building_records br JOIN t_building_new_site bs on br.project_name = bs.gdmc" + - " where DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= date(br.push_time) order by br.pm10 desc") + " where DATE_SUB(CURDATE(), INTERVAL 30 DAY) < date(br.push_time) order by br.pm10 desc") List selectMonthPm10(); @Select("select * from t_building_records br JOIN t_building_new_site bs on br.project_name = bs.gdmc " + @@ -43,11 +43,11 @@ public interface BuildingRecordsMapper extends BaseMapper { List selectDayNoice(); @Select("select * from t_building_records br JOIN t_building_new_site bs on br.project_name = bs.gdmc" + - " where DATE_SUB(CURDATE(), INTERVAL 7 DAY) <= date(br.push_time) order by br.noice desc") + " where DATE_SUB(CURDATE(), INTERVAL 7 DAY) < date(br.push_time) order by br.noice desc") List selectWeekNoice(); @Select("select * from t_building_records br JOIN t_building_new_site bs on br.project_name = bs.gdmc" + - " where DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= date(br.push_time) order by br.noice desc") + " where DATE_SUB(CURDATE(), INTERVAL 30 DAY) < date(br.push_time) order by br.noice desc") List selectMonthNoice(); @Select("select * from t_building_records br JOIN t_building_new_site bs on br.project_name = bs.gdmc" + @@ -55,11 +55,11 @@ public interface BuildingRecordsMapper extends BaseMapper { List selectDayAll(String projectName); @Select("select * from t_building_records br JOIN t_building_new_site bs on br.project_name = bs.gdmc" + - " where DATE_SUB(CURDATE(), INTERVAL 7 DAY) <= date(br.push_time) and br.project_name like concat('%',#{projectName},'%')") + " where DATE_SUB(CURDATE(), INTERVAL 7 DAY) < date(br.push_time) and br.project_name like concat('%',#{projectName},'%')") List selectWeekAll(String projectName); @Select("select * from t_building_records br JOIN t_building_new_site bs on br.project_name = bs.gdmc" + - " where DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= date(br.push_time) and br.project_name like concat('%',#{projectName},'%')") + " where DATE_SUB(CURDATE(), INTERVAL 30 DAY) < date(br.push_time) and br.project_name like concat('%',#{projectName},'%')") List selectMonthAll(String projectName); @Select("select br.*,bs.sgwz,bs.jd,bs.wd,bs.ssdq,bs.yjsg from t_building_records br JOIN t_building_new_site bs on br.project_name = bs.gdmc" +