From ff6f8f0b00136dfab053d78826e876e15bf9e9dd Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 26 May 2023 20:46:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResFlseLimServiceImpl.java | 38 +++++++++++++++++++++++++++++++++-----
1 files changed, 33 insertions(+), 5 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResFlseLimServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResFlseLimServiceImpl.java
index a1267d1..8e0045d 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResFlseLimServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResFlseLimServiceImpl.java
@@ -3,9 +3,11 @@
import cn.gistack.sm.sjztmd.entity.AttResFlseLim;
import cn.gistack.sm.sjztmd.entity.AttResStagChar;
+import cn.gistack.sm.sjztmd.entity.AttResWaterBlock;
import cn.gistack.sm.sjztmd.mapper.AttResFlseLimMapper;
import cn.gistack.sm.sjztmd.service.IAttResFlseLimService;
import cn.gistack.sm.sjztmd.service.IAttResStagCharService;
+import cn.gistack.sm.sjztmd.service.IAttResWaterBlockService;
import cn.gistack.sm.sjztmd.vo.EditResInfoVO;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -29,17 +31,29 @@
@Autowired
private IAttResStagCharService attResStagCharService;
+ @Autowired
+ private IAttResWaterBlockService attResWaterBlockService;
+
@Override
@Transactional
public Boolean updateAttResFlseLimByGuid(EditResInfoVO editResInfoVO) {
editResInfoVO.setUpdateTime(DateUtil.now());
// 修改汛期水位
- if (StringUtil.isNotBlank(String.valueOf(editResInfoVO.getTbFlseLimStag()))) {
- AttResFlseLim attResFlseLim = new AttResFlseLim();
- attResFlseLim.setResGuid(editResInfoVO.getResGuid());
- attResFlseLim.setTbFlseLimStag(editResInfoVO.getTbFlseLimStag());
- baseMapper.updateAttResFlseLimByGuid(attResFlseLim);
+ if (null != editResInfoVO.getXqswObjQ()) {
+ AttResFlseLim attResFlseLimQ = editResInfoVO.getXqswObjQ();
+ attResFlseLimQ.setResGuid(editResInfoVO.getResGuid());
+ baseMapper.updateAttResFlseLimByGuid(attResFlseLimQ,"前汛期");
+ }
+ if (null != editResInfoVO.getXqswObjZ()) {
+ AttResFlseLim attResFlseLimZ = editResInfoVO.getXqswObjZ();
+ attResFlseLimZ.setResGuid(editResInfoVO.getResGuid());
+ baseMapper.updateAttResFlseLimByGuid(attResFlseLimZ,"中汛期");
+ }
+ if (null != editResInfoVO.getXqswObjH()) {
+ AttResFlseLim attResFlseLimH = editResInfoVO.getXqswObjH();
+ attResFlseLimH.setResGuid(editResInfoVO.getResGuid());
+ baseMapper.updateAttResFlseLimByGuid(attResFlseLimH,"后汛期");
}
// 修改水位特征参数
@@ -47,6 +61,8 @@
attResStagChar.setResGuid(editResInfoVO.getResGuid());
if (StringUtil.isNotBlank(editResInfoVO.getChecFlStag()))
attResStagChar.setTbChecFlStag(editResInfoVO.getChecFlStag());
+ if (StringUtil.isNotBlank(editResInfoVO.getDeadCap()))
+ attResStagChar.setTbDeadCap(editResInfoVO.getDeadCap());
if (StringUtil.isNotBlank(editResInfoVO.getDeadStag()))
attResStagChar.setTbDeadStag(editResInfoVO.getDeadStag());
if (StringUtil.isNotBlank(editResInfoVO.getFlprHighStag()))
@@ -55,6 +71,18 @@
attResStagChar.setTbNormPoolStag(editResInfoVO.getNormPoolStag());
if (StringUtil.isNotBlank(editResInfoVO.getDesFlStag()))
attResStagChar.setTbDesFlStag(editResInfoVO.getDesFlStag());
+ if (StringUtil.isNotBlank(editResInfoVO.getTotCap()))
+ attResStagChar.setTbTotCap(editResInfoVO.getTotCap());
+ if (StringUtil.isNotBlank(editResInfoVO.getWatShedArea()))
+ attResStagChar.setWatShedArea(editResInfoVO.getWatShedArea());
+
+ // 修改坝顶高程
+ if (StringUtil.isNotBlank(editResInfoVO.getTopDamTopElevation())) {
+ AttResWaterBlock resWaterBlock = new AttResWaterBlock();
+ resWaterBlock.setResGuid(editResInfoVO.getResGuid());
+ resWaterBlock.setTopDamTopElevation(editResInfoVO.getTopDamTopElevation());
+ attResWaterBlockService.updateAttResWaterBlockByResId(resWaterBlock);
+ }
return attResStagCharService.customizeUpdateByGuid(attResStagChar);
}
--
Gitblit v1.9.3