From 7e5c99ca2716043775cd019d6731c746cf40a05a Mon Sep 17 00:00:00 2001 From: chenxiwang <1520264117@qq.com> Date: Wed, 7 Aug 2024 14:11:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=96=B9=E6=A1=88=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gunshi/project/xyt/entity/vo/ForecastResultVo.java | 1 - .../java/com/gunshi/project/xyt/model/ForecastResults.java | 4 ++-- .../java/com/gunshi/project/xyt/schedule/TaskGroupJob.java | 7 +++++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/gunshi/project/xyt/entity/vo/ForecastResultVo.java b/src/main/java/com/gunshi/project/xyt/entity/vo/ForecastResultVo.java index 005ff6f..2624c4a 100644 --- a/src/main/java/com/gunshi/project/xyt/entity/vo/ForecastResultVo.java +++ b/src/main/java/com/gunshi/project/xyt/entity/vo/ForecastResultVo.java @@ -5,7 +5,6 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.math.BigDecimal; -import java.util.Date; /** *@description 预测结果VO diff --git a/src/main/java/com/gunshi/project/xyt/model/ForecastResults.java b/src/main/java/com/gunshi/project/xyt/model/ForecastResults.java index 723f4e8..69b14ed 100644 --- a/src/main/java/com/gunshi/project/xyt/model/ForecastResults.java +++ b/src/main/java/com/gunshi/project/xyt/model/ForecastResults.java @@ -1,6 +1,7 @@ package com.gunshi.project.xyt.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -9,8 +10,6 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.gunshi.core.dateformat.DateFormatString; import com.gunshi.project.xyt.entity.page.GenericPageParams; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.Size; import lombok.Data; import java.io.Serializable; @@ -44,6 +43,7 @@ public class ForecastResults extends GenericPageParams implements Serializable { @TableField(value="tm") @Schema(description="时间") @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") + @JSONField(format = DateFormatString.YYYY_MM_DD_HH_MM_SS) private Date tm; /** diff --git a/src/main/java/com/gunshi/project/xyt/schedule/TaskGroupJob.java b/src/main/java/com/gunshi/project/xyt/schedule/TaskGroupJob.java index 81776c2..9132604 100644 --- a/src/main/java/com/gunshi/project/xyt/schedule/TaskGroupJob.java +++ b/src/main/java/com/gunshi/project/xyt/schedule/TaskGroupJob.java @@ -92,7 +92,7 @@ public class TaskGroupJob implements Job { Map map = forecastUseparamService.getMap(new QueryWrapper().eq("param_code", "ydgdyjz"));// 获取安全值 AttResBase attResBase = attResBaseService.getOne(new QueryWrapper<>());// 获取堰顶高程 if (MapUtil.isNotEmpty(map) && ObjectUtils.isNotEmpty(attResBase) && ObjectUtils.isNotEmpty(attResBase.getWcrstel())) { - BigDecimal ydgdyjz = new BigDecimal(map.get("ydgdyjz").toString()); + BigDecimal ydgdyjz = new BigDecimal(map.get("param_value").toString()); BigDecimal wcrstel = attResBase.getWcrstel(); Boolean isSave = false; for (ForecastResultVo vo : voList) { @@ -117,7 +117,10 @@ public class TaskGroupJob implements Job { forecastProject.setTimeInterval(forecastTask.getTimeInterval()); forecastProject.setTaskId(forecastTask.getId()); forecastProject.setVoList(voList); - forecastProjectService.saveForecastResults(forecastProject); + boolean save = forecastProjectService.save(forecastProject); + if (save) { + forecastProjectService.saveForecastResults(forecastProject); + } } } }