diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/EnvironmentMapper.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/EnvironmentMapper.java index 2943185..3acd04d 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/EnvironmentMapper.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/EnvironmentMapper.java @@ -17,5 +17,5 @@ public interface EnvironmentMapper { EnvironmentDto getEnvironmentList(EnvironmentDto dto); - List getEnvironmentListByDate(@Param("startDate") String s,@Param("endDate") String today); + List getEnvironmentListByDate(@Param("currentDay") String currentDay); } diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/EnvironmentServiceImpl.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/EnvironmentServiceImpl.java index b880d13..7a0e042 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/EnvironmentServiceImpl.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/EnvironmentServiceImpl.java @@ -40,11 +40,7 @@ public class EnvironmentServiceImpl implements EnvironmentService { try { //先查固定时间-- currentDay:2021-05-01 hours:9 vo = mapper.getEnvironmentList(dto); - //在查最近七天,每天的平均值 - String today = DateUtil.today(); - // 获取七天前的日期,subtract方法可以用来减去指定的时间间隔 - Date sevenDaysAgo = DateUtil.offsetDay(DateUtil.date(), -7); - List list = mapper.getEnvironmentListByDate(DateUtil.format(sevenDaysAgo, "yyyy-MM-dd"),today); + List list = mapper.getEnvironmentListByDate(dto.getCurrentDay()); vo.setList(list); } catch (Exception e) { log.error("环境监测分析-查询失败", e); diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/EnvironmentMapper.xml b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/EnvironmentMapper.xml index d08d035..939111f 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/EnvironmentMapper.xml +++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/EnvironmentMapper.xml @@ -30,20 +30,17 @@ \ No newline at end of file