github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-25 03:52:59 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #8418 from dataease/pr@dev-v2@refactor_filter

Browse Source 
refactor: 优化过滤逻辑
This commit is contained in:
Junjun 2024-03-08 15:58:32 +08:00 committed by GitHub
commit 90b3e7b1d1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
core/core-backend/src/main/java/io/dataease/engine/utils/Utils.java
View File

@ -287,30 +287,50 @@ public class Utils {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy" + split + "MM" + split + "dd HH:mm:ss"); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy" + split + "MM" + split + "dd HH:mm:ss");
startTime = simpleDateFormat.parse(value).getTime(); startTime = simpleDateFormat.parse(value).getTime();
endTime = startTime + 999; endTime = startTime + 999;
map.put("startTime", startTime);
map.put("endTime", endTime);
return map;
} catch (Exception e) { } catch (Exception e) {
} }
try { try {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy" + split + "MM" + split + "dd HH:mm"); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy" + split + "MM" + split + "dd HH:mm");
startTime = simpleDateFormat.parse(value).getTime(); startTime = simpleDateFormat.parse(value).getTime();
endTime = startTime + (60 * 1000 - 1); endTime = startTime + (60 * 1000 - 1);
map.put("startTime", startTime);
map.put("endTime", endTime);
return map;
} catch (Exception e) { } catch (Exception e) {
} }
try { try {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy" + split + "MM" + split + "dd HH"); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy" + split + "MM" + split + "dd HH");
startTime = simpleDateFormat.parse(value).getTime(); startTime = simpleDateFormat.parse(value).getTime();
endTime = startTime + (60 * 60 * 1000 - 1); endTime = startTime + (60 * 60 * 1000 - 1);
map.put("startTime", startTime);
map.put("endTime", endTime);
return map;
} catch (Exception e) { } catch (Exception e) {
} }
try { try {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HH:mm:ss"); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HH:mm:ss");
startTime = simpleDateFormat.parse(value).getTime(); startTime = simpleDateFormat.parse(value).getTime();
endTime = startTime + 999; endTime = startTime + 999;
map.put("startTime", startTime);
map.put("endTime", endTime);
return map;
} catch (Exception e) { } catch (Exception e) {
} }
try { try {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy" + split + "MM" + split + "dd"); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy" + split + "MM" + split + "dd");
startTime = simpleDateFormat.parse(value).getTime(); startTime = simpleDateFormat.parse(value).getTime();
endTime = startTime + (24 * 60 * 60 * 1000 - 1); endTime = startTime + (24 * 60 * 60 * 1000 - 1);
map.put("startTime", startTime);
map.put("endTime", endTime);
return map;
} catch (Exception e) { } catch (Exception e) {
} }
try { try {
@ -321,6 +341,10 @@ public class Utils {
calendar.setTime(parse); calendar.setTime(parse);
calendar.add(Calendar.MONTH, 1); calendar.add(Calendar.MONTH, 1);
endTime = calendar.getTime().getTime() - 1; endTime = calendar.getTime().getTime() - 1;
map.put("startTime", startTime);
map.put("endTime", endTime);
return map;
} catch (Exception e) { } catch (Exception e) {
} }
try { try {
@ -331,6 +355,10 @@ public class Utils {
calendar.setTime(parse); calendar.setTime(parse);
calendar.add(Calendar.YEAR, 1); calendar.add(Calendar.YEAR, 1);
endTime = calendar.getTime().getTime() - 1; endTime = calendar.getTime().getTime() - 1;
map.put("startTime", startTime);
map.put("endTime", endTime);
return map;
} catch (Exception e) { } catch (Exception e) {
} }