yangzhe
/
gunshi-project-ss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化方案结果查询接口

master
chenxiwang 2024-08-07 14:11:09 +08:00
parent a8a5e35740
commit 7e5c99ca27
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/gunshi/project/xyt/entity/vo/ForecastResultVo.java
View File

@ -5,7 +5,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date;
/** /**
*@description 预测结果VO *@description 预测结果VO

4
src/main/java/com/gunshi/project/xyt/model/ForecastResults.java
View File

@ -1,6 +1,7 @@
package com.gunshi.project.xyt.model; package com.gunshi.project.xyt.model;
import com.alibaba.fastjson.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; 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.core.dateformat.DateFormatString;
import com.gunshi.project.xyt.entity.page.GenericPageParams; import com.gunshi.project.xyt.entity.page.GenericPageParams;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Size;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
@ -44,6 +43,7 @@ public class ForecastResults extends GenericPageParams implements Serializable {
@TableField(value="tm") @TableField(value="tm")
@Schema(description="时间") @Schema(description="时间")
@JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8")
@JSONField(format = DateFormatString.YYYY_MM_DD_HH_MM_SS)
private Date tm; private Date tm;
/** /**

7
src/main/java/com/gunshi/project/xyt/schedule/TaskGroupJob.java
View File

@ -92,7 +92,7 @@ public class TaskGroupJob implements Job {
Map<String, Object> map = forecastUseparamService.getMap(new QueryWrapper<ForecastUseparam>().eq("param_code", "ydgdyjz"));// 获取安全值 Map<String, Object> map = forecastUseparamService.getMap(new QueryWrapper<ForecastUseparam>().eq("param_code", "ydgdyjz"));// 获取安全值
AttResBase attResBase = attResBaseService.getOne(new QueryWrapper<>());// 获取堰顶高程 AttResBase attResBase = attResBaseService.getOne(new QueryWrapper<>());// 获取堰顶高程
if (MapUtil.isNotEmpty(map) && ObjectUtils.isNotEmpty(attResBase) && ObjectUtils.isNotEmpty(attResBase.getWcrstel())) { 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(); BigDecimal wcrstel = attResBase.getWcrstel();
Boolean isSave = false; Boolean isSave = false;
for (ForecastResultVo vo : voList) { for (ForecastResultVo vo : voList) {
@ -117,7 +117,10 @@ public class TaskGroupJob implements Job {
forecastProject.setTimeInterval(forecastTask.getTimeInterval()); forecastProject.setTimeInterval(forecastTask.getTimeInterval());
forecastProject.setTaskId(forecastTask.getId()); forecastProject.setTaskId(forecastTask.getId());
forecastProject.setVoList(voList); forecastProject.setVoList(voList);
forecastProjectService.saveForecastResults(forecastProject); boolean save = forecastProjectService.save(forecastProject);
if (save) {
forecastProjectService.saveForecastResults(forecastProject);
}
} }
} }
} }