Skip to content

A
amos-boot-zx-biz
Commit 5be11bdf authored by hezhuozhi's avatar hezhuozhi
Browse files
Options

Merge remote-tracking branch 'origin/developer' into developer

parents e6a57818 6f9f52cc
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 8 deletions
amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/TDBigScreenAnalyseController.java
View file @ 5be11bdf
...@@ -1583,10 +1583,9 @@ public class TDBigScreenAnalyseController extends BaseController { ...@@ -1583,10 +1583,9 @@ public class TDBigScreenAnalyseController extends BaseController {
@RequestParam(value = "stationId", required = false) String stationId) { @RequestParam(value = "stationId", required = false) String stationId) {
StationBasic stationBasic = stationBasicMapper.selectById(stationId); StationBasic stationBasic = stationBasicMapper.selectById(stationId);
Date currentDayStartTime = DateUtils.getCurrentDayStartTime(DateUtils.dateAddDays(new Date(), -15));
Date currentDayEndTime = DateUtils.getCurrentDayEndTime(new Date()); String startTime = DateUtils.convertDateToString(DateUtils.dateAddMinutes(new Date(), -10), DateUtils.DATE_TIME_PATTERN);
String startTime = DateUtils.convertDateToString(currentDayStartTime, DateUtils.DATE_TIME_PATTERN); String endTime = DateUtils.convertDateToString(new Date(), DateUtils.DATE_TIME_PATTERN);
String endTime = DateUtils.convertDateToString(currentDayEndTime, DateUtils.DATE_TIME_PATTERN);
LambdaQueryWrapper<FanHealthIndexDay> lambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<FanHealthIndexDay> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(FanHealthIndexDay::getIndexAddress, indexAddress); lambdaQueryWrapper.eq(FanHealthIndexDay::getIndexAddress, indexAddress);
...@@ -1624,10 +1623,8 @@ public class TDBigScreenAnalyseController extends BaseController { ...@@ -1624,10 +1623,8 @@ public class TDBigScreenAnalyseController extends BaseController {
@RequestParam(value = "stationId", required = false) String stationId) { @RequestParam(value = "stationId", required = false) String stationId) {
StationBasic stationBasic = stationBasicMapper.selectById(stationId); StationBasic stationBasic = stationBasicMapper.selectById(stationId);
Date currentDayStartTime = DateUtils.getCurrentDayStartTime(DateUtils.dateAddDays(new Date(), -15)); String startTime = DateUtils.convertDateToString(DateUtils.dateAddMinutes(new Date(), -10), DateUtils.DATE_TIME_PATTERN);
Date currentDayEndTime = DateUtils.getCurrentDayEndTime(new Date()); String endTime = DateUtils.convertDateToString(new Date(), DateUtils.DATE_TIME_PATTERN);
String startTime = DateUtils.convertDateToString(currentDayStartTime, DateUtils.DATE_TIME_PATTERN);
String endTime = DateUtils.convertDateToString(currentDayEndTime, DateUtils.DATE_TIME_PATTERN);
LambdaQueryWrapper<PvHealthIndexDay> lambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<PvHealthIndexDay> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(PvHealthIndexDay::getIndexAddress, indexAddress); lambdaQueryWrapper.eq(PvHealthIndexDay::getIndexAddress, indexAddress);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment