From 90baa6a076b7c7ea036d2adac3a032a1a473b309 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 21 十二月 2024 09:28:51 +0800
Subject: [PATCH] 在“远程测控”增加查询一个取水口报警状态的功能，实现后端逻辑
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/DateTime.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/DateTime.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/DateTime.java
index c5c1bc4..9b32044 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/DateTime.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/DateTime.java
@@ -423,7 +423,7 @@
case "鍛ㄥ洓" -> 4;
case "鍛ㄤ簲" -> 5;
case "鍛ㄥ叚" -> 6;
- case "鍛ㄤ竷" -> 7;
+ case "鍛ㄤ竷" -> 0;//鏍规嵁鍗忚瑕佹眰鏄熸湡澶╀负0
default -> 0;
};
}else{
@@ -434,7 +434,7 @@
case "Thu" -> 4;
case "Fri" -> 5;
case "Sat" -> 6;
- case "Sun" -> 7;
+ case "Sun" -> 0;//鏍规嵁鍗忚瑕佹眰鏄熸湡澶╀负0
default -> 0;
};
}
@@ -484,6 +484,12 @@
/**
* 涓や釜鏃ユ湡鐩稿樊澶╂暟
*/
+ public static long daysBetweenyyyy_MM_dd(Date yyyy_MM_dd_1 , Date yyyy_MM_dd_2)throws Exception{
+ return ((((yyyy_MM_dd_1.getTime() - yyyy_MM_dd_2.getTime())/1000)/60)/60)/24 ;
+ }
+ /**
+ * 涓や釜鏃ユ湡鐩稿樊澶╂暟
+ */
public static long daysBetweenyyyyMMdd(String yyyyMMdd_1 , String yyyyMMdd_2)throws Exception{
return ((((dateFrom_yyyy_MM_dd(yyyyMMdd_1).getTime()-dateFrom_yyyy_MM_dd(yyyyMMdd_2).getTime())/1000)/60)/60)/24 ;
}
@@ -501,6 +507,17 @@
//////////////////////////////////////////////////////////////////////////
/**
+ * 瀛楃涓插瀷鏃ユ湡(2024-12)杞垚骞存湀鏃ユ暟缁�
+ * @param yyyy_MM 骞存湀鏃�
+ * @return 骞存湀鏃ユ暟缁�
+ */
+ public static int[] yyyy_MM_ymdGroup(String yyyy_MM){
+ int y = Integer.parseInt(yyyy_MM.substring(0 , 4)) ;
+ int m = Integer.parseInt(yyyy_MM.substring(5 , 7)) ;
+ return new int[]{y,m} ;
+ }
+
+ /**
* 瀛楃涓插瀷鏃ユ湡(2009-09-10)杞垚骞存湀鏃ユ暟缁�
* @param yyyy_MM_DD 骞存湀鏃�
* @return 骞存湀鏃ユ暟缁�
--
Gitblit v1.8.0