From ba0944e4d2877bf9488734945004a3776cfc3e76 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 10 八月 2023 14:47:35 +0800
Subject: [PATCH] 1

---
 src/main/java/com/yssh/mapper/XlsReportMapper.java   |    6 +++---
 src/main/resources/mapper/XlsReportMapper.xml        |    2 +-
 src/main/java/com/yssh/config/InitConfig.java        |   27 +++++++++++++--------------
 src/main/java/com/yssh/service/XlsReportService.java |   12 ++++++------
 4 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/src/main/java/com/yssh/config/InitConfig.java b/src/main/java/com/yssh/config/InitConfig.java
index 1bcadfc..7ad74a0 100644
--- a/src/main/java/com/yssh/config/InitConfig.java
+++ b/src/main/java/com/yssh/config/InitConfig.java
@@ -47,25 +47,24 @@
         // 璇诲彇dat鏁版嵁
         commonService.readDatData();
 
-        // xlsReportService.createDayReport();
-        // xlsReportService.createWeekReport();
-        // xlsReportService.createMonthReport();
-
-        //test();
         logger.info("***************** 绯荤粺鍚姩瀹屾瘯 *****************" + "\n");
+        test();
     }
 
     private void test() {
         //task.corpReserveDataSync();
-
-        Calendar calendar = Calendar.getInstance();
-        calendar.set(Calendar.MONTH, 5);
-        calendar.set(Calendar.DAY_OF_MONTH, 8);
-        calendar.set(Calendar.HOUR_OF_DAY, 16);
-        calendar.set(Calendar.MINUTE, 0);
-        calendar.set(Calendar.SECOND, 0);
-        calendar.set(Calendar.MILLISECOND, 0);
-
         //warningAnalyseService.warningOperationStorage(calendar.getTime());
+
+        Calendar cal = Calendar.getInstance();
+        cal.set(Calendar.MONTH, 6);
+        cal.set(Calendar.DAY_OF_MONTH, 25);
+        cal.set(Calendar.HOUR_OF_DAY, 14);
+        cal.set(Calendar.MINUTE, 0);
+        cal.set(Calendar.SECOND, 0);
+        cal.set(Calendar.MILLISECOND, 0);
+
+        xlsReportService.createDayReport(cal.getTime());
+        // xlsReportService.createWeekReport();
+        // xlsReportService.createMonthReport();
     }
 }
diff --git a/src/main/java/com/yssh/mapper/XlsReportMapper.java b/src/main/java/com/yssh/mapper/XlsReportMapper.java
index b94c2aa..87db22b 100644
--- a/src/main/java/com/yssh/mapper/XlsReportMapper.java
+++ b/src/main/java/com/yssh/mapper/XlsReportMapper.java
@@ -32,17 +32,17 @@
     /**
      * 鏌ヨ鏃ュ潎鍊�
      */
-    double selectDayAvg(@Param("time") String time, @Param("name") String name);
+    Double selectDayAvg(@Param("time") String time, @Param("name") String name);
 
     /**
      * 鏌ヨ绱鍊�
      */
-    double selectAccumulate(@Param("start") Integer start, @Param("end") Integer end, @Param("name") String name);
+    Double selectAccumulate(@Param("start") Integer start, @Param("end") Integer end, @Param("name") String name);
 
     /**
      * 鏌ヨ骞寸疮璁″��
      */
-    double selectYearAccumulate(@Param("time") String time, @Param("name") String name);
+    Double selectYearAccumulate(@Param("time") String time, @Param("name") String name);
 
     /**
      * 鏍规嵁鏃堕棿鏌ヨ婧簮
diff --git a/src/main/java/com/yssh/service/XlsReportService.java b/src/main/java/com/yssh/service/XlsReportService.java
index 401d923..e010172 100644
--- a/src/main/java/com/yssh/service/XlsReportService.java
+++ b/src/main/java/com/yssh/service/XlsReportService.java
@@ -136,12 +136,12 @@
     public void createDayReport(Date date) {
         try {
             Date yesterday = DateUtils.getAPeriodOfTime(date, -1, Calendar.DATE);
-            String yyyy = DateUtils.parseDateToStr(DateUtils.YYYY, yesterday);
-            String yyyymmdd = DateUtils.parseDateToStr(DateUtils.YYYYMMDD, yesterday);
-            String yyyy_mm_dd = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, yesterday);
-            Integer start = Integer.parseInt(yyyy + "0101");
-            Integer end = Integer.parseInt(yyyymmdd);
-            String lastYear = DateUtils.parseDateToStr(DateUtils.YYYY, DateUtils.lastYear(yesterday));
+            String yyyy = DateUtils.parseDateToStr(DateUtils.YYYY, yesterday); // 2023
+            String yyyymmdd = DateUtils.parseDateToStr(DateUtils.YYYYMMDD, yesterday); // 20230724
+            String yyyy_mm_dd = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, yesterday); // 2023-07-24
+            Integer start = Integer.parseInt(yyyy + "010100"); // 2023010100
+            Integer end = Integer.parseInt(yyyymmdd + "23"); // 2023072423
+            String lastYear = DateUtils.parseDateToStr(DateUtils.YYYY, DateUtils.lastYear(yesterday)); // 2022
 
             List<DayExcel> list = new ArrayList<>();
             for (int i = 1; i < 47; i++) {
diff --git a/src/main/resources/mapper/XlsReportMapper.xml b/src/main/resources/mapper/XlsReportMapper.xml
index d09f01b..f01b6c0 100644
--- a/src/main/resources/mapper/XlsReportMapper.xml
+++ b/src/main/resources/mapper/XlsReportMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yssh.mapper.QxshMapper">
+<mapper namespace="com.yssh.mapper.XlsReportMapper">
     <!-- 鍒嗛〉鏌ヨ鎶ュ憡 -->
     <select id="selectReportByPage" resultType="com.yssh.entity.xls.XlsReport">
         select *

--
Gitblit v1.9.3