From 9b90f24a206926ab55e6c075ec895561caf26321 Mon Sep 17 00:00:00 2001 From: junjun Date: Fri, 8 Mar 2024 15:56:32 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/engine/utils/Utils.java | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/core/core-backend/src/main/java/io/dataease/engine/utils/Utils.java b/core/core-backend/src/main/java/io/dataease/engine/utils/Utils.java index 5bad3f1e9d..02afda803a 100644 --- a/core/core-backend/src/main/java/io/dataease/engine/utils/Utils.java +++ b/core/core-backend/src/main/java/io/dataease/engine/utils/Utils.java @@ -287,30 +287,50 @@ public class Utils { SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy" + split + "MM" + split + "dd HH:mm:ss"); startTime = simpleDateFormat.parse(value).getTime(); endTime = startTime + 999; + + map.put("startTime", startTime); + map.put("endTime", endTime); + return map; } catch (Exception e) { } try { SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy" + split + "MM" + split + "dd HH:mm"); startTime = simpleDateFormat.parse(value).getTime(); endTime = startTime + (60 * 1000 - 1); + + map.put("startTime", startTime); + map.put("endTime", endTime); + return map; } catch (Exception e) { } try { SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy" + split + "MM" + split + "dd HH"); startTime = simpleDateFormat.parse(value).getTime(); endTime = startTime + (60 * 60 * 1000 - 1); + + map.put("startTime", startTime); + map.put("endTime", endTime); + return map; } catch (Exception e) { } try { SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HH:mm:ss"); startTime = simpleDateFormat.parse(value).getTime(); endTime = startTime + 999; + + map.put("startTime", startTime); + map.put("endTime", endTime); + return map; } catch (Exception e) { } try { SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy" + split + "MM" + split + "dd"); startTime = simpleDateFormat.parse(value).getTime(); endTime = startTime + (24 * 60 * 60 * 1000 - 1); + + map.put("startTime", startTime); + map.put("endTime", endTime); + return map; } catch (Exception e) { } try { @@ -321,6 +341,10 @@ public class Utils { calendar.setTime(parse); calendar.add(Calendar.MONTH, 1); endTime = calendar.getTime().getTime() - 1; + + map.put("startTime", startTime); + map.put("endTime", endTime); + return map; } catch (Exception e) { } try { @@ -331,6 +355,10 @@ public class Utils { calendar.setTime(parse); calendar.add(Calendar.YEAR, 1); endTime = calendar.getTime().getTime() - 1; + + map.put("startTime", startTime); + map.put("endTime", endTime); + return map; } catch (Exception e) { }