From 30923b57df60538534baa12e15f2da6f32f280b3 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 27 十二月 2024 15:51:38 +0800
Subject: [PATCH] 1、优化代码； 2、增加两个指导SaaS配置的文档。
---
pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/changeSome/ChSomeIntakeAmountSv.java | 19 ++-----------------
pipIrr-platform/文档/SaaS/端口、IP、标签配置.docx | 0
pipIrr-platform/文档/SaaS/民勤设备地址.xlsx | 0
3 files changed, 2 insertions(+), 17 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/changeSome/ChSomeIntakeAmountSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/changeSome/ChSomeIntakeAmountSv.java
index a23eb3d..d1e6f82 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/changeSome/ChSomeIntakeAmountSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/changeSome/ChSomeIntakeAmountSv.java
@@ -145,21 +145,6 @@
private static final int DealStartYear = 2024 ;
private static final int DealStartMonth = 8 ;
- private static final String endDayOfMonth(int year, int month){
- if(month == 1 || month == 3 || month == 5 || month == 7 || month == 8 || month == 10 || month == 12){
- return "31" ;
- }else{
- if(month == 2){
- if(DateTime.isLeapYear(year)){
- return "29" ;
- }else{
- return "28" ;
- }
- }else{
- return "30" ;
- }
- }
- }
/**
* 鍒犻櫎鎵�鏈夊彇姘村彛鏈堝彇姘撮噺缁熻
* @throws Exception
@@ -184,14 +169,14 @@
if(year < nowYear){
for(int month = 1 ; month <= 12 ; month ++){
startDt = DateTime.dateFrom_yyyy_MM_dd(year + "-" + month + "-01") ;
- endDt = DateTime.dateFrom_yyyy_MM_dd(year + "-" + month + "-" + endDayOfMonth(year, month)) ;
+ endDt = DateTime.dateFrom_yyyy_MM_dd(year + "-" + month + "-" + DateTime.endDayOfMonth(year, month)) ;
list = dao.statisticAllIntakeAmountMonthFromAmountDay(startDt, endDt) ;
this.doStatisticsIntakeAmountMonth(year, month, list) ;
}
}else{
for(int month = 1 ; month <= nowMonth ; month ++){
startDt = DateTime.dateFrom_yyyy_MM_dd(year + "-" + month + "-01") ;
- endDt = DateTime.dateFrom_yyyy_MM_dd(year + "-" + month + "-" + endDayOfMonth(year, month)) ;
+ endDt = DateTime.dateFrom_yyyy_MM_dd(year + "-" + month + "-" + DateTime.endDayOfMonth(year, month)) ;
list = dao.statisticAllIntakeAmountMonthFromAmountDay(startDt, endDt) ;
this.doStatisticsIntakeAmountMonth(year, month, list) ;
}
diff --git "a/pipIrr-platform/\346\226\207\346\241\243/SaaS/\346\260\221\345\213\244\350\256\276\345\244\207\345\234\260\345\235\200.xlsx" "b/pipIrr-platform/\346\226\207\346\241\243/SaaS/\346\260\221\345\213\244\350\256\276\345\244\207\345\234\260\345\235\200.xlsx"
new file mode 100644
index 0000000..9eba88d
--- /dev/null
+++ "b/pipIrr-platform/\346\226\207\346\241\243/SaaS/\346\260\221\345\213\244\350\256\276\345\244\207\345\234\260\345\235\200.xlsx"
Binary files differ
diff --git "a/pipIrr-platform/\346\226\207\346\241\243/SaaS/\347\253\257\345\217\243\343\200\201IP\343\200\201\346\240\207\347\255\276\351\205\215\347\275\256.docx" "b/pipIrr-platform/\346\226\207\346\241\243/SaaS/\347\253\257\345\217\243\343\200\201IP\343\200\201\346\240\207\347\255\276\351\205\215\347\275\256.docx"
new file mode 100644
index 0000000..c75b269
--- /dev/null
+++ "b/pipIrr-platform/\346\226\207\346\241\243/SaaS/\347\253\257\345\217\243\343\200\201IP\343\200\201\346\240\207\347\255\276\351\205\215\347\275\256.docx"
Binary files differ
--
Gitblit v1.8.0