From 56da4f7282e8f62cf9f769276366a7a0b70dada1 Mon Sep 17 00:00:00 2001
From: yangzhe123 <2824096059@qq.com>
Date: Tue, 4 Nov 2025 13:33:57 +0800
Subject: [PATCH] =?UTF-8?q?1=EF=BC=9Apdf=E5=AF=BC=E5=87=BA=E4=B8=AD?=
 =?UTF-8?q?=E6=96=87=E6=96=87=E5=AD=97ttf=E6=96=87=E4=BB=B6=EF=BC=88?=
 =?UTF-8?q?=E8=AF=B7=E5=8B=BF=E7=A7=BB=E5=8A=A8=EF=BC=89=202=EF=BC=9A?=
 =?UTF-8?q?=E5=90=8C=E6=A0=B75=E5=88=86=E9=92=9F=E7=9A=84=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E5=B7=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hsz/service/ForecastProjectService.java      |   5 -----
 .../hsz/service/ForecastResultsService.java      |  15 +++++++++++++--
 .../main/resources/fonts}/ChineseFonts.ttf       | Bin
 3 files changed, 13 insertions(+), 7 deletions(-)
 rename {docs => src/main/resources/fonts}/ChineseFonts.ttf (100%)

diff --git a/src/main/java/com/gunshi/project/hsz/service/ForecastProjectService.java b/src/main/java/com/gunshi/project/hsz/service/ForecastProjectService.java
index b53abe7..7b9ad65 100644
--- a/src/main/java/com/gunshi/project/hsz/service/ForecastProjectService.java
+++ b/src/main/java/com/gunshi/project/hsz/service/ForecastProjectService.java
@@ -7,7 +7,6 @@ import com.gunshi.project.hsz.mapper.ForecastProjectMapper;
 import com.gunshi.project.hsz.model.ForecastProject;
 import com.gunshi.project.hsz.model.ForecastResults;
 import com.itextpdf.io.font.PdfEncodings;
-import com.itextpdf.kernel.colors.Color;
 import com.itextpdf.kernel.colors.DeviceRgb;
 import com.itextpdf.kernel.events.Event;
 import com.itextpdf.kernel.events.IEventHandler;
@@ -20,13 +19,10 @@ import com.itextpdf.kernel.pdf.PdfDocument;
 import com.itextpdf.kernel.pdf.PdfPage;
 import com.itextpdf.kernel.pdf.PdfWriter;
 import com.itextpdf.kernel.pdf.canvas.PdfCanvas;
-import com.itextpdf.kernel.pdf.colorspace.PdfColorSpace;
-import com.itextpdf.layout.Canvas;
 import com.itextpdf.layout.Document;
 import com.itextpdf.layout.element.Cell;
 import com.itextpdf.layout.element.Paragraph;
 import com.itextpdf.layout.element.Table;
-import com.itextpdf.layout.properties.TextAlignment;
 import com.itextpdf.layout.properties.UnitValue;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -34,7 +30,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.awt.*;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.math.BigDecimal;
diff --git a/src/main/java/com/gunshi/project/hsz/service/ForecastResultsService.java b/src/main/java/com/gunshi/project/hsz/service/ForecastResultsService.java
index e27d630..6319896 100644
--- a/src/main/java/com/gunshi/project/hsz/service/ForecastResultsService.java
+++ b/src/main/java/com/gunshi/project/hsz/service/ForecastResultsService.java
@@ -126,6 +126,16 @@ public class ForecastResultsService extends ServiceImpl<ForecastResultsMapper, F
         return voList;
     }
 
+    private Date addMinites(Date date,Integer minite) {
+        Instant instant = date.toInstant().plus(minite, ChronoUnit.MINUTES);
+        return Date.from(instant);
+    }
+
+    private Date deleteMinites(Date date,Integer minite) {
+        Instant instant = date.toInstant().minus(minite, ChronoUnit.MINUTES);
+        return Date.from(instant);
+    }
+
     /**
      * @description: 组装洪水预报ForecastResultVo
      * @param forecastTask
@@ -152,6 +162,8 @@ public class ForecastResultsService extends ServiceImpl<ForecastResultsMapper, F
         Date nowHourTime = forecastTask.getNowTime();
         Date startTime = forecastTask.getStartTime();
         Date endTime = forecastTask.getEndTime();
+        //TODO 由于endTime为整点数据，而监测时间为整点数据过五分
+        endTime = addMinites(endTime,5);
         // 获取整个时间线的降雨数据
         List<StPptnR> pptnRAllList = new ArrayList<>();
         List<StPptnR> pptnRFutureList = new ArrayList<>();
@@ -263,8 +275,7 @@ public class ForecastResultsService extends ServiceImpl<ForecastResultsMapper, F
         //TODO 将过五分数据转为整点数据
         rsvrRRealList.stream().forEach(o->{
             // 转换为 Instant 操作后再转回 Date
-            Instant instant = o.getTm().toInstant().minus(5, ChronoUnit.MINUTES);
-            o.setTm(Date.from(instant));
+            o.setTm(deleteMinites(o.getTm(),5));
         });
         List<StRsvrR> resultList = reorganizeRsvrRData(rsvrRRealList, dt);
         List<Date[]> periods = splitByDay8To8(startTime, endTime);
diff --git a/docs/ChineseFonts.ttf b/src/main/resources/fonts/ChineseFonts.ttf
similarity index 100%
rename from docs/ChineseFonts.ttf
rename to src/main/resources/fonts/ChineseFonts.ttf