From 1fb6d19218d87e3bf72df846395e1902c1a510c3 Mon Sep 17 00:00:00 2001 From: wuweida <2918581207@qq.com> Date: Wed, 8 Jun 2022 10:13:28 +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 --- .../hisense/monitormanage/mapper/BuildingRecordsMapper.java | 4 ++-- .../hisense/monitormanage/service/PassengerFlowService.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/hisense/monitormanage/mapper/BuildingRecordsMapper.java b/src/main/java/com/hisense/monitormanage/mapper/BuildingRecordsMapper.java index d34ae54..6225efc 100644 --- a/src/main/java/com/hisense/monitormanage/mapper/BuildingRecordsMapper.java +++ b/src/main/java/com/hisense/monitormanage/mapper/BuildingRecordsMapper.java @@ -62,11 +62,11 @@ public interface BuildingRecordsMapper extends BaseMapper { " 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 from t_building_records br JOIN t_building_new_site bs on br.project_name = bs.gdmc" + + @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" + " where br.project_name like concat('%',#{projectName},'%')") List selectByProjectName(String projectName); - @Select("select br.*,bs.sgwz,bs.jd,bs.wd,bs.ssdq from t_building_records br JOIN t_building_new_site bs on br.project_name = bs.gdmc" + + @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" + " where (bs.jd between #{jd} and #{jd1}) and (bs.wd between #{wd} and #{wd1} )") List selectByJdWd(@Param("jd") Double jd, @Param("jd1") Double jd1, diff --git a/src/main/java/com/hisense/monitormanage/service/PassengerFlowService.java b/src/main/java/com/hisense/monitormanage/service/PassengerFlowService.java index e8422cc..459d98b 100644 --- a/src/main/java/com/hisense/monitormanage/service/PassengerFlowService.java +++ b/src/main/java/com/hisense/monitormanage/service/PassengerFlowService.java @@ -303,9 +303,9 @@ public class PassengerFlowService { double minX = vertX.stream().min(Comparator.comparingDouble(Double::doubleValue)).get(); double minY = vertY.stream().min(Comparator.comparingDouble(Double::doubleValue)).get(); - if (longitude < minX || longitude > maxX || latitude < minY || latitude > maxY) { + /*if (longitude < minX || longitude > maxX || latitude < minY || latitude > maxY) { continue; - } + }*/ int i, j; boolean result = false; int n = vertX.size();