From de8d1f0b24a3a4d86ccb199c25ebe4fd7af562b3 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 02 九月 2024 20:08:02 +0800
Subject: [PATCH] 通信中间件RTU日志文件大小修改成1000KB
---
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/client/ClientSv.java | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/client/ClientSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/client/ClientSv.java
index 458abc2..e023155 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/client/ClientSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/client/ClientSv.java
@@ -13,6 +13,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Calendar;
@@ -45,17 +47,19 @@
*/
public QueryResultVo<List<VoClient>> getLargeOpenCountClients(OpenCountQO qo) {
/**
- * 琛ラ綈璧锋鏃堕棿锛屽鏋滃紑濮嬫椂闂翠负绌猴紝鍒欓粯璁や负褰撳墠鏃ユ湡
+ * 琛ラ綈璧锋鏃堕棿
*/
String timeStart = qo.getTimeStart();
String timeStop = qo.getTimeStop();
- if(timeStart != null) {
+ if(timeStart != null && timeStart != "") {
timeStart = timeStart + " 00:00:00";
- }else {
+ } else {
timeStart = LocalDate.now() + " 00:00:00";
}
- if(timeStop != null) {
+ if(timeStop != null && timeStop != "") {
timeStop = timeStop + " 23:59:59";
+ }else {
+ timeStop = LocalDate.now() + " 23:59:59";
}
qo.setTimeStart(timeStart);
qo.setTimeStop(timeStop);
@@ -87,13 +91,15 @@
*/
String timeStart = qo.getTimeStart();
String timeStop = qo.getTimeStop();
- if(timeStart != null) {
+ if(timeStart != null && timeStart != "") {
timeStart = timeStart + " 00:00:00";
- }else {
+ } else {
timeStart = LocalDate.now() + " 00:00:00";
}
- if(timeStop != null) {
+ if(timeStop != null && timeStop != "") {
timeStop = timeStop + " 23:59:59";
+ }else {
+ timeStop = LocalDate.now() + " 23:59:59";
}
qo.setTimeStart(timeStart);
qo.setTimeStop(timeStop);
@@ -342,9 +348,13 @@
* @param qo
* @return
*/
- public QueryResultVo<List<VoDayClient>> getDayAmountAndMoney(ClientAmountQO qo) {
- Integer year = qo.getYearMonth().getYear();
- Integer month = qo.getYearMonth().getMonthValue();
+ public QueryResultVo<List<VoDayClient>> getDayAmountAndMoney(ClientAmountQO qo) throws ParseException {
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+ String yearMonth = qo.getYearMonth();
+ yearMonth = yearMonth + "-01";
+ yearMonth = dateFormat.format(dateFormat.parse(yearMonth));
+ Integer year = Integer.parseInt(yearMonth.substring(0,4));
+ Integer month = Integer.parseInt(yearMonth.substring(5,7));
qo.setYear(year);
qo.setMonth(month);
--
Gitblit v1.8.0