Skip to content

A
amos-boot-zx-biz
Commit 8db97749 authored by chenzhao's avatar chenzhao
Browse files
Options

风电健康指数查询优化

parent c47d6e3d
Show whitespace changes
Inline Side-by-side
Showing with 13 additions and 0 deletions
amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/TdInfoQueryController.java
View file @ 8db97749
...@@ -122,7 +122,14 @@ public class TdInfoQueryController extends BaseController { ...@@ -122,7 +122,14 @@ public class TdInfoQueryController extends BaseController {
} }
if (CharSequenceUtil.isNotEmpty(dto.getEndDate())) { if (CharSequenceUtil.isNotEmpty(dto.getEndDate())) {
String dateNowShortStr = DateUtils.getDateNowShortStr();
String endDate = dto.getEndDate(); String endDate = dto.getEndDate();
if (dateNowShortStr.equals(endDate)){
Date date = DateUtils.dateAddDays(null, -1);
SimpleDateFormat formatter = new SimpleDateFormat(DateUtils.DATE_PATTERN);
endDate= formatter.format(date);
}
if(dto.getAnalysisType() != null && dto.getAnalysisType().equals("按天") && endDate.length() == 10) { if(dto.getAnalysisType() != null && dto.getAnalysisType().equals("按天") && endDate.length() == 10) {
long endTs = pvHealthIndexMapper.getTsByRecDate("fan_health_index_day", endDate, "desc "); long endTs = pvHealthIndexMapper.getTsByRecDate("fan_health_index_day", endDate, "desc ");
dto.setEndDateTs(endTs); dto.setEndDateTs(endTs);
...@@ -229,7 +236,13 @@ public class TdInfoQueryController extends BaseController { ...@@ -229,7 +236,13 @@ public class TdInfoQueryController extends BaseController {
} }
if (CharSequenceUtil.isNotEmpty(dto.getEndDate())) { if (CharSequenceUtil.isNotEmpty(dto.getEndDate())) {
String dateNowShortStr = DateUtils.getDateNowShortStr();
String endDate = dto.getEndDate(); String endDate = dto.getEndDate();
if (dateNowShortStr.equals(endDate)){
Date date = DateUtils.dateAddDays(null, -1);
SimpleDateFormat formatter = new SimpleDateFormat(DateUtils.DATE_PATTERN);
endDate= formatter.format(date);
}
if(dto.getAnalysisType() != null && dto.getAnalysisType().equals("按天") && endDate.length() == 10) { if(dto.getAnalysisType() != null && dto.getAnalysisType().equals("按天") && endDate.length() == 10) {
long endTs = pvHealthIndexMapper.getTsByRecDate("pv_health_index_day", endDate, "desc "); long endTs = pvHealthIndexMapper.getTsByRecDate("pv_health_index_day", endDate, "desc ");
dto.setEndDateTs(endTs); dto.setEndDateTs(endTs);
......
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