From 1b2ce0a15e0d441042817feceaa16184a885165f Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 10 八月 2023 11:00:25 +0800
Subject: [PATCH] 1
---
src/main/java/com/yssh/service/XlsReportService.java | 29 +++++++++++++++++++++++++++++
src/main/java/com/yssh/utils/DateUtils.java | 17 ++++++++++-------
src/main/resources/application-file.yml | 2 ++
3 files changed, 41 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/yssh/service/XlsReportService.java b/src/main/java/com/yssh/service/XlsReportService.java
index 1aa4694..50e9dcf 100644
--- a/src/main/java/com/yssh/service/XlsReportService.java
+++ b/src/main/java/com/yssh/service/XlsReportService.java
@@ -3,6 +3,7 @@
import com.yssh.entity.xls.DayExcel;
import com.yssh.entity.xls.MonthExcel;
import com.yssh.entity.xls.WeekExcel;
+import com.yssh.mapper.XlsReportMapper;
import com.yssh.utils.DateUtils;
import com.yssh.utils.ExcelUtils;
import org.slf4j.Logger;
@@ -11,6 +12,7 @@
import org.springframework.core.io.ClassPathResource;
import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
import java.io.File;
import java.io.IOException;
import java.util.*;
@@ -24,10 +26,37 @@
public class XlsReportService {
protected final Logger logger = LoggerFactory.getLogger(this.getClass());
+ @Resource
+ XlsReportMapper mapper;
+
+ /**
+ * 鎶ュ憡璺緞
+ */
@Value("${report.path}")
private String reportPath;
/**
+ * 棰勮鍊�
+ */
+ @Value("${report.yjz}")
+ private double yjz;
+
+ /**
+ * 鎶ヨ鍊�
+ */
+ @Value("${report.bjz}")
+ private double bjz;
+
+ /**
+ * Excel鏄惁宸插瓨鍦�
+ */
+ private boolean xlsExists(String type, String name) {
+ int rows = mapper.xlsExists(type, name);
+
+ return rows > 0;
+ }
+
+ /**
* 鑾峰彇瀵煎嚭璺緞
*/
private String getExpPath(String type) {
diff --git a/src/main/java/com/yssh/utils/DateUtils.java b/src/main/java/com/yssh/utils/DateUtils.java
index bd91779..192ce60 100644
--- a/src/main/java/com/yssh/utils/DateUtils.java
+++ b/src/main/java/com/yssh/utils/DateUtils.java
@@ -212,9 +212,6 @@
return times;
}
- /**
- *
- */
public static Map<Date, Date> segmentationDateByTimeQuantum(Date startDate, Date endDate, int timeQuantum, int dateType) {
LinkedHashMap<Date, Date> result = new LinkedHashMap<Date, Date>();
long startTimeMillisecond = startDate.getTime();
@@ -245,9 +242,17 @@
}
/**
+ * 鍓櫎鏃ユ湡鐨勬椂闂撮儴鍒�
+ */
+ public static Date trimTime(Date date) {
+ Calendar cal = Calendar.getInstance();
+ cal.setTime(date);
+
+ return dateTime(YYYY_MM_DD_HH_MM_SS, parseDateToStr(YYYY_MM_DD, cal.getTime()) + " 00:00:00");
+ }
+
+ /**
* 鑾峰彇鏈湀绗竴澶�
- *
- * @return String
**/
public static Date getMonthStart(Date date) {
Calendar cal = Calendar.getInstance();
@@ -259,8 +264,6 @@
/**
* 鑾峰彇鏈湀鏈�鍚庝竴澶�
- *
- * @return String
**/
public static Date getMonthEnd(Date date) {
Calendar cal = Calendar.getInstance();
diff --git a/src/main/resources/application-file.yml b/src/main/resources/application-file.yml
index 45294a1..fc2bc1b 100644
--- a/src/main/resources/application-file.yml
+++ b/src/main/resources/application-file.yml
@@ -9,3 +9,5 @@
#鏃�/鍛�/鏈堟姤璺緞
report:
path: D:\2022\XlsReport
+ yjz: 1
+ bjz: 2
--
Gitblit v1.9.3