From 91dc3007c884445a31bd5c744f112a616c96246a Mon Sep 17 00:00:00 2001 From: chenxiwang <1520264117@qq.com> Date: Fri, 26 Jul 2024 13:19:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AF=BC=E5=87=BA=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=EF=BC=9B=E5=A2=9E=E5=8A=A0=E6=B4=AA=E6=B0=B4=E9=A2=84?= =?UTF-8?q?=E6=8A=A5=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 20 +++++++++++++- .../StWaterRReorganizeController.java | 26 ++++++++++++------- .../xyt/entity/vo/StWaterRReorganizeVo.java | 8 +++--- .../entity/vo/StWaterRReorganizeYearVo.java | 16 ++++++++---- .../service/StWaterRReorganizeService.java | 4 +-- src/main/resources/config-dev.yml | 8 ++++++ src/main/resources/config-prod.yml | 8 ++++++ 7 files changed, 69 insertions(+), 21 deletions(-) diff --git a/pom.xml b/pom.xml index 2554b40..819599a 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,25 @@ fastjson 1.2.79 - + + org.gunshi + flood_algorithm + 1.0-SNAPSHOT + + + org.apache.poi + poi-ooxml + + + org.apache.poi + poi + + + org.springframework.boot + spring-boot-starter + + + diff --git a/src/main/java/com/gunshi/project/xyt/controller/StWaterRReorganizeController.java b/src/main/java/com/gunshi/project/xyt/controller/StWaterRReorganizeController.java index b1ab88b..0f906d8 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/StWaterRReorganizeController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/StWaterRReorganizeController.java @@ -2,17 +2,10 @@ package com.gunshi.project.xyt.controller; import java.io.Serializable; import java.util.ArrayList; -import java.util.LinkedHashMap; import java.util.List; -import java.util.Map; -import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; -import com.gunshi.project.xyt.entity.vo.StWaterRReorganizeVo; -import com.gunshi.project.xyt.entity.vo.StWaterRReorganizeYearVo; -import com.gunshi.project.xyt.util.ConvertUtil; -import com.gunshi.project.xyt.util.DateUtil; -import com.gunshi.project.xyt.util.ExcelUtil; -import jakarta.servlet.http.HttpServletResponse; +import com.gunshi.algorithm.RrainfallForecast; +import com.gunshi.model.vo.FloodAlgorithemVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.CrossOrigin; @@ -29,14 +22,20 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gunshi.core.result.R; +import com.gunshi.project.xyt.entity.vo.StWaterRReorganizeVo; +import com.gunshi.project.xyt.entity.vo.StWaterRReorganizeYearVo; import com.gunshi.project.xyt.model.StWaterRReorganize; import com.gunshi.project.xyt.service.StWaterRReorganizeService; +import com.gunshi.project.xyt.util.ConvertUtil; +import com.gunshi.project.xyt.util.DateUtil; +import com.gunshi.project.xyt.util.ExcelUtil; import com.gunshi.project.xyt.validate.markers.Insert; import com.gunshi.project.xyt.validate.markers.Update; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletResponse; /** * 描述: 供水量整编表 * author: cxw @@ -163,4 +162,13 @@ public class StWaterRReorganizeController { service.getYearStatisticAnalysis(year, resList); ExcelUtil.exportExcel(resList, filename, StWaterRReorganizeYearVo.class, response, "统计分析"); } + + + @Operation(summary = "洪水预报测试") + @PostMapping("/forecastTest") + public R> forecastTest() throws Exception { + double[] PList = new double[] {6.5, 6.75, 7, 5.25, 3.5, 4, 4.5, 4, 3.5, 4.25, 5, 4, 3, 3, 3, 2.75, 2.5, 1.25, 0, 0.25, 0.5}; + double[] u = new double[]{1.27, 0.75, 0.45, 0.27, 0.16, 0.09, 0.07, 0.03, 0.02, 0.01, 0.01}; + return R.ok(RrainfallForecast.getData("2024-06-28 08:00:00", 0.93, 1.0, 120, 0.0, 675.94, 0.5, 100, PList, u)); + } } diff --git a/src/main/java/com/gunshi/project/xyt/entity/vo/StWaterRReorganizeVo.java b/src/main/java/com/gunshi/project/xyt/entity/vo/StWaterRReorganizeVo.java index 6f9a2fb..de24ea9 100644 --- a/src/main/java/com/gunshi/project/xyt/entity/vo/StWaterRReorganizeVo.java +++ b/src/main/java/com/gunshi/project/xyt/entity/vo/StWaterRReorganizeVo.java @@ -25,25 +25,25 @@ public class StWaterRReorganizeVo { /** * 流量（生态供水） */ - @ExcelProperty({"${title}", "流量（生态供水）(m³/s)"}) + @ExcelProperty({"${title}", "生态供水", "流量(m³/s)"}) private BigDecimal ecologyQ; /** * 水量（生态供水） */ - @ExcelProperty({"${title}", "水量（生态供水）(万m³)"}) + @ExcelProperty({"${title}", "生态供水", "水量(万m³)"}) private BigDecimal ecologyV; /** * 流量（生活供水） */ - @ExcelProperty({"${title}", "流量（生活供水）(m³/s)"}) + @ExcelProperty({"${title}", "生活供水", "流量(m³/s)"}) private BigDecimal lifeQ; /** * 水量（生活供水） */ - @ExcelProperty({"${title}", "水量（生活供水）(万m³)"}) + @ExcelProperty({"${title}", "生活供水", "水量(万m³)"}) private BigDecimal lifeV; /** diff --git a/src/main/java/com/gunshi/project/xyt/entity/vo/StWaterRReorganizeYearVo.java b/src/main/java/com/gunshi/project/xyt/entity/vo/StWaterRReorganizeYearVo.java index 3c7c260..99ad674 100644 --- a/src/main/java/com/gunshi/project/xyt/entity/vo/StWaterRReorganizeYearVo.java +++ b/src/main/java/com/gunshi/project/xyt/entity/vo/StWaterRReorganizeYearVo.java @@ -1,10 +1,7 @@ package com.gunshi.project.xyt.entity.vo; -import java.math.BigDecimal; - import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -20,53 +17,62 @@ import lombok.Data; public class StWaterRReorganizeYearVo { @Schema(description="时间") + @ExcelProperty({"${title}", "时间"}) private String tm; /** * 年度占比（生态供水） */ @Schema(description="年度占比（生态供水）") + @ExcelProperty({"${title}", "生态供水", "年度占比"}) private String ecologyYearRateV; /** * 水量（生态供水） */ @Schema(description="水量（生态供水）") + @ExcelProperty({"${title}", "生态供水", "水量"}) private String ecologyV; /** * 同比（生态供水） */ - @Schema(description="水量（生态供水）") + @Schema(description="同比（生态供水）") + @ExcelProperty({"${title}", "生态供水", "同比"}) private String ecologyYoyV; /** * 环比（生态供水） */ - @Schema(description="水量（生态供水）") + @Schema(description="环比（生态供水）") + @ExcelProperty({"${title}", "生态供水", "环比"}) private String ecologyQoqV; /** * 年度占比（生活供水） */ @Schema(description="年度占比（生活供水）") + @ExcelProperty({"${title}", "生活供水", "年度占比"}) private String lifeYearRateV; /** * 水量（生活供水） */ @Schema(description="水量（生活供水）") + @ExcelProperty({"${title}", "生活供水", "水量"}) private String lifeV; /** * 同比（生活供水） */ @Schema(description="同比（生活供水）") + @ExcelProperty({"${title}", "生活供水", "同比"}) private String lifeYoyV; /** * 环比（生活供水） */ @Schema(description="环比（生活供水）") + @ExcelProperty({"${title}", "生活供水", "环比"}) private String lifeQoqV; } diff --git a/src/main/java/com/gunshi/project/xyt/service/StWaterRReorganizeService.java b/src/main/java/com/gunshi/project/xyt/service/StWaterRReorganizeService.java index c62d6c8..cf9bdc4 100644 --- a/src/main/java/com/gunshi/project/xyt/service/StWaterRReorganizeService.java +++ b/src/main/java/com/gunshi/project/xyt/service/StWaterRReorganizeService.java @@ -49,9 +49,9 @@ public class StWaterRReorganizeService extends ServiceImpl