From a4e42a8ba7f1e129aacff98d1e1de2f7a4e41804 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 19 Jun 2023 14:06:46 +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 | 23 ++++++++++++++++++-----
1 files changed, 18 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 72083ac..ce1b729 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
@@ -1,10 +1,12 @@
package cn.gistack.sm.sjztmd.service.impl;
+import cn.gistack.sm.sjztmd.entity.AttResDangerManageSpecial;
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.IAttResDangerManageSpecialService;
import cn.gistack.sm.sjztmd.service.IAttResFlseLimService;
import cn.gistack.sm.sjztmd.service.IAttResStagCharService;
import cn.gistack.sm.sjztmd.service.IAttResWaterBlockService;
@@ -40,6 +42,9 @@
private IAttResWaterBlockService attResWaterBlockService;
@Autowired
+ private IAttResDangerManageSpecialService attResDangerManageSpecialService;
+
+ @Autowired
private IUserClient userClient;
@Override
@@ -48,7 +53,7 @@
editResInfoVO.setUpdateTime(DateUtil.now());
// 修改汛期水位
- if (null != editResInfoVO.getXqswObjQ()) {
+ if (null != editResInfoVO.getXqswObjQ() && StringUtil.isNotBlank(String.valueOf(editResInfoVO.getXqswObjQ().getTbFlseLimStag()))) {
AttResFlseLim attResFlseLimQ = editResInfoVO.getXqswObjQ();
attResFlseLimQ.setResGuid(editResInfoVO.getResGuid());
attResFlseLimQ.setUpdateTime(DateUtil.now());
@@ -69,7 +74,7 @@
baseMapper.updateAttResFlseLimByGuid(attResFlseLimQ,"前汛期");
}
- if (null != editResInfoVO.getXqswObjZ()) {
+ if (null != editResInfoVO.getXqswObjZ() && StringUtil.isNotBlank(String.valueOf(editResInfoVO.getXqswObjZ().getTbFlseLimStag()))) {
AttResFlseLim attResFlseLimZ = editResInfoVO.getXqswObjZ();
attResFlseLimZ.setResGuid(editResInfoVO.getResGuid());
attResFlseLimZ.setUpdateTime(DateUtil.now());
@@ -90,7 +95,7 @@
baseMapper.updateAttResFlseLimByGuid(attResFlseLimZ,"中汛期");
}
- if (null != editResInfoVO.getXqswObjH()) {
+ if (null != editResInfoVO.getXqswObjH() && StringUtil.isNotBlank(String.valueOf(editResInfoVO.getXqswObjH().getTbFlseLimStag()))) {
AttResFlseLim attResFlseLimH = editResInfoVO.getXqswObjH();
attResFlseLimH.setResGuid(editResInfoVO.getResGuid());
attResFlseLimH.setUpdateTime(DateUtil.now());
@@ -133,13 +138,21 @@
attResStagChar.setWatShedArea(editResInfoVO.getWatShedArea());
// 修改坝顶高程
- if (StringUtil.isNotBlank(editResInfoVO.getTopDamTopElevation())) {
+ if (StringUtil.isNotBlank(editResInfoVO.getTbDamTopElevation())) {
AttResWaterBlock resWaterBlock = new AttResWaterBlock();
resWaterBlock.setResGuid(editResInfoVO.getResGuid());
- resWaterBlock.setTopDamTopElevation(editResInfoVO.getTopDamTopElevation());
+ resWaterBlock.setTbDamTopElevation(editResInfoVO.getTbDamTopElevation());
attResWaterBlockService.updateAttResWaterBlockByResId(resWaterBlock);
}
+ // 修改控制运行水位
+ if (StringUtil.isNotBlank(editResInfoVO.getTbControlZ())) {
+ AttResDangerManageSpecial attResDangerManageSpecial = new AttResDangerManageSpecial();
+ attResDangerManageSpecial.setResGuid(editResInfoVO.getResGuid());
+ attResDangerManageSpecial.setTbControlZ(editResInfoVO.getTbControlZ());
+ attResDangerManageSpecialService.updateAttResDangerManageSpecialByResId(attResDangerManageSpecial);
+ }
+
return attResStagCharService.customizeUpdateByGuid(attResStagChar);
}
}
--
Gitblit v1.9.3