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

修改大坝基本数据

master
yangzhe123 2025-09-26 17:11:26 +08:00
parent 2e878773ae
commit 78027b2226
9 changed files with 99 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/gunshi/project/hsz/controller/AlarmSetController.java
View File

@ -37,9 +37,7 @@ public class AlarmSetController {
@Operation(summary = "新增")
@PostMapping("/insert")
public R<AlarmSet> insert(@Validated(Insert.class) @RequestBody AlarmSet dto) {
dto.setId(IdWorker.getId());
dto.setCreateDate(new Date());
boolean result = service.save(dto);
boolean result = service.saveData(dto);
return R.ok(result ? dto : null);
}

3
src/main/java/com/gunshi/project/hsz/controller/StZqrlBController.java
View File

@ -53,12 +53,13 @@ public class StZqrlBController {
private StZvarlBService stZvarlBService;
@Post(path = "/flowList", summary = "集合")
@Post(path = "/flowList", summary = "曲线数据")
public R<List<StZqrlBVo>> flowList(@RequestBody StZqrlBDto obj) {
return R.ok(stStbprpBService.flowList(obj));
}
@GetMapping(path = "/count/{stcd}")
@Schema(description = "实时数据")
public R<StZqrlBCountVo> count(@Schema(name = "stcd") @PathVariable("stcd") Serializable stcd) {
return R.ok(stStbprpBService.count(stcd));
}

12
src/main/java/com/gunshi/project/hsz/model/AttDamBase.java
View File

@ -15,6 +15,7 @@ import jakarta.validation.constraints.Size;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@ -30,7 +31,6 @@ public class AttDamBase implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
@ -149,6 +149,16 @@ public class AttDamBase implements Serializable {
@JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8")
private Date createTime;
@TableField(value="main_basic_intensity_of_an_earth_quake")
@Schema(description = "地震基本烈度")
private String mainBasicIntensityOfAnEarthQuake;
@TableField(value="main_earthquake_acceleration")
@Schema(description = "地震峰值加速度")
private BigDecimal mainEarthquakeAcceleration;// 主坝-地震峰值加速度
@TableField(exist = false)
@Schema(description = "文件集合")
private List<FileAssociations> files;

20
src/main/java/com/gunshi/project/hsz/model/AttResBuilding.java
View File

@ -31,10 +31,14 @@ public class AttResBuilding implements Serializable {
// 主坝字段 (prefix: main_)
private String mainType; // 主坝-坝型
private String mainFoundation; //主坝-地基特性
private String mainBasicIntensityOfAnEarthQuake; //主坝-地震基本烈度
private BigDecimal mainCrestElevation; // 主坝-坝顶高程(m)
private BigDecimal mainCrestLength; // 主坝-坝顶长度(m)
private BigDecimal mainCrestWidth; // 主坝-坝顶宽度(m)
private BigDecimal mainMaxHeight; // 主坝-最大坝高(m)
private BigDecimal mainEarthquakeAcceleration;// 主坝-地震峰值加速度
private BigDecimal mainTopOfWaveBarrierElevation;// 主坝-防浪墙顶高程
// 副坝字段 (prefix: aux_)
private String auxType; // 副坝-坝型
@ -53,6 +57,8 @@ public class AttResBuilding implements Serializable {
private BigDecimal spillwayCheckFloodDischarge; // 溢洪道-校核洪水下泄流量(m³/s)
private BigDecimal spillwayDesignFloodDischarge; // 溢洪道-设计洪水下泄流量(m³/s)
private BigDecimal spillwayScouringDischarge; // 溢洪道-消能防冲下泄流量(m³/s)
private BigDecimal spillwayMaxSingleWidthFlow;//溢洪道-最大单宽流量
// 灌溉发电洞字段 (prefix: irrigation_)
private String irrigationType; // 灌溉发电洞-型式
@ -86,4 +92,18 @@ public class AttResBuilding implements Serializable {
// 防汛道路字段 (prefix: road_)
private BigDecimal roadLength; // 防汛道路-防汛路长度(m)
private BigDecimal roadWidth; // 防汛道路-路面宽度(m)
//输水建筑物 (prefix: water_conveyance )
private BigDecimal waterConveyanceFlow;//输水建筑物-设计流量
private String waterConveyanceType;//输水建筑物-进水口形式
private String waterConveyanceWaterIntakeType;//输水建筑物-取水方式
private String waterConveyanceFoundation;//输水建筑物-地基特性
private BigDecimal waterConveyanceInletBottomHigh;//输水建筑物-进口底槛高程
private BigDecimal waterConveyanceOrificeSize;//输水建筑物-孔口尺寸
private String waterConveyanceGateType;//输水建筑物-闸门型式
private Integer waterConveyanceHoistNum;//输水建筑物-启闭机型式容量及数量
private String waterConveyanceTunnelType;//输水建筑物-引水隧洞型式
private BigDecimal waterConveyanceLength;//输水建筑物-长度
private String waterConveyanceLiningType;//输水建筑物-衬砌型式
}

15
src/main/java/com/gunshi/project/hsz/service/AlarmSetService.java
View File

@ -1,6 +1,7 @@
package com.gunshi.project.hsz.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gunshi.project.hsz.entity.so.AlarmSetPageSo;
@ -10,6 +11,8 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
@Service
@Slf4j
@Transactional(rollbackFor = Exception.class)
@ -23,4 +26,16 @@ public class AlarmSetService extends ServiceImpl<AlarmSetMapper, AlarmSet> {
Page<AlarmSet> alarmSetPage = this.baseMapper.selectPage(page.getPageSo().toPage(), queryWrapper);
return alarmSetPage;
}
public boolean saveData(AlarmSet dto) {
dto.setId(IdWorker.getId());
dto.setCreateDate(new Date());
LambdaQueryWrapper<AlarmSet> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(AlarmSet::getStcd, dto.getStcd());
AlarmSet alarmSet = this.baseMapper.selectOne(queryWrapper);
if(alarmSet != null){
throw new IllegalArgumentException("对不起，该站点的告警设置已存在，请勿重复添加");
}
return save(dto);
}
}

14
src/main/java/com/gunshi/project/hsz/service/StStbprpBService.java
View File

@ -10,10 +10,7 @@ import com.gunshi.project.hsz.entity.vo.*;
import com.gunshi.project.hsz.mapper.OsmoticPressRMapper;
import com.gunshi.project.hsz.mapper.OsmoticShiftRMapper;
import com.gunshi.project.hsz.mapper.StStbprpBMapper;
import com.gunshi.project.hsz.model.StRsvrR;
import com.gunshi.project.hsz.model.StStbprpB;
import com.gunshi.project.hsz.model.StZqrlB;
import com.gunshi.project.hsz.model.StZvarlB;
import com.gunshi.project.hsz.model.*;
import com.gunshi.project.hsz.util.DateUtil;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
@ -55,6 +52,9 @@ public class StStbprpBService extends ServiceImpl<StStbprpBMapper, StStbprpB> {
@Autowired
private StRsvrRService rsvrRService;
@Autowired
private StRiverRService riverRService;
public List<HomeStStbprpBVo> rainfallStationDetailsList(HomeStStbprpBSo dto) {
return baseMapper.rainfallStationDetailsList(dto);
}
@ -147,6 +147,12 @@ public class StStbprpBService extends ServiceImpl<StStbprpBMapper, StStbprpB> {
.between(StRsvrR::getTm, obj.getDateSo().getStart(), obj.getDateSo().getEnd())
.orderBy(true, true, StRsvrR::getTm)
.list();
//TODO or 获取从河道水位表获取
// List<StRiverR> riverList = riverRService.lambdaQuery()
// .eq(StRiverR::getStcd, obj.getStcd())
// .between(StRiverR::getTm, obj.getDateSo().getStart(), obj.getDateSo().getEnd())
// .orderBy(true, true, StRiverR::getTm)
// .list();
//查询水位-流量关系
List<StZqrlB> zqrlList = stZqrlBService.list();
zqrlList.sort(Comparator.comparing(StZqrlB::getZ));

2
src/main/java/com/gunshi/project/hsz/service/StZvarlBService.java
View File

@ -10,6 +10,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@ -81,6 +82,7 @@ public class StZvarlBService extends ServiceImpl<StZvarlBMapper, StZvarlB> {
* @return
*/
public BigDecimal getWByZvarl(List<StZvarlB> zvarlBS, BigDecimal rz) {
//对数据进行排序
// 1. 参数校验
if (zvarlBS == null || zvarlBS.isEmpty()) {
throw new IllegalArgumentException("水位-库容关系列表不能为空");

10
src/main/java/com/gunshi/project/hsz/service/WaterCountAnalysisService.java
View File

@ -18,6 +18,7 @@ import java.io.Serializable;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
@ -86,6 +87,7 @@ public class WaterCountAnalysisService {
public List<WaterCapacityAnalysisVo> waterCapacityAnalysis(DateRangeSo dateRangeSo){
List<WaterCapacityAnalysisVo> res = new ArrayList<>();
List<StZvarlB> stZvarlBList = stZvarlBService.list();//获取水位-蓄水量
stZvarlBList.sort(Comparator.comparing(StZvarlB::getRz));
//查询时间段的
LambdaQueryWrapper<StRsvrR> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.apply("date_part('hour',tm) = 8") // 获取每天早上八点的数据
@ -99,8 +101,7 @@ public class WaterCountAnalysisService {
String rz = stRsvrRS.get(i).getRz();//历史水位
BigDecimal currentCap = BigDecimal.ZERO;
if(rz != null){
//TODO 这里需要根据公式进行计算
currentCap = stZvarlBService.getWFromZvarl(new BigDecimal(rz).setScale(0,RoundingMode.DOWN),null,stZvarlBList);//获取库容
currentCap = stZvarlBService.getWByZvarl(stZvarlBList,new BigDecimal(rz));//根据水位计算出库容
vo.setCap(currentCap);
}
if(i > 0){
@ -112,9 +113,8 @@ public class WaterCountAnalysisService {
//计算变化率: (当天 - 上一天) / 上一天 * 100
BigDecimal diff = currentCap.subtract(prevCap);
BigDecimal rate = diff.divide(prevCap, 4, RoundingMode.HALF_UP)
.multiply(new BigDecimal(100))
.setScale(2, RoundingMode.DOWN);
vo.setRate(rate);
.multiply(new BigDecimal(100));
vo.setRate(rate.setScale(2, RoundingMode.HALF_UP));
}
}else{
vo.setRate(new BigDecimal(0).setScale(2, RoundingMode.DOWN));

1
src/main/resources/mapper/StWaterRRealMapper.xml
View File

@ -18,7 +18,6 @@
GROUP BY stcd
) latest ON t.stcd = latest.stcd AND t.tm = latest.max_tm
<where>
<!-- stb.sttp in ('QQ', 'PQ','ZI') 站点类型 站点编码是唯一的，所以不用对类型进行 -->
and stb.stcd in ('1112','1113','1114') <!-- 站点编码 -->
</where>