From c930d53c5421b3538ea7fbffe57a54de6db6d657 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 23 May 2023 11:10:26 +0800
Subject: [PATCH] 水库详细特征水位参数、汛限水位中汛期修改
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResFlseLimServiceImpl.java | 40 ++++++++++++-
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttResFlseLimService.java | 3
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/vo/EditResInfoVO.java | 69 +++++++++++++++++++++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResFlseLimController.java | 11 ++-
4 files changed, 114 insertions(+), 9 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResFlseLimController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResFlseLimController.java
index 141edc7..c7c158b 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResFlseLimController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResFlseLimController.java
@@ -3,6 +3,7 @@
import cn.gistack.sm.sjztmd.entity.AttResFlseLim;
import cn.gistack.sm.sjztmd.entity.AttResStagChar;
import cn.gistack.sm.sjztmd.service.IAttResFlseLimService;
+import cn.gistack.sm.sjztmd.vo.EditResInfoVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
@@ -33,15 +34,15 @@
/**
* 编辑
*
- * @param attResFlseLim
+ * @param editResInfoVO 修改实体类对象
* @return
*/
- @ApiOperation(value = "水库特征水位-编辑", notes = "水库特征水位-编辑")
+ @ApiOperation(value = "水库特征水位、汛期限制水位-编辑", notes = "水库特征水位、汛期限制水位-编辑")
@PostMapping(value = "/edit")
- public R edit(@RequestBody AttResFlseLim attResFlseLim) {
- if (StringUtil.isBlank(attResFlseLim.getResGuid())) {
+ public R edit(@RequestBody EditResInfoVO editResInfoVO) {
+ if (StringUtil.isBlank(editResInfoVO.getResGuid())) {
return R.fail("参数不正确");
}
- return R.data(attResFlseLimService.updateAttResFlseLimByGuid(attResFlseLim));
+ return R.data(attResFlseLimService.updateAttResFlseLimByGuid(editResInfoVO));
}
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttResFlseLimService.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttResFlseLimService.java
index 7038fee..af22f3a 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttResFlseLimService.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttResFlseLimService.java
@@ -1,6 +1,7 @@
package cn.gistack.sm.sjztmd.service;
import cn.gistack.sm.sjztmd.entity.AttResFlseLim;
+import cn.gistack.sm.sjztmd.vo.EditResInfoVO;
import com.baomidou.mybatisplus.extension.service.IService;
/**
@@ -11,5 +12,5 @@
*/
public interface IAttResFlseLimService extends IService<AttResFlseLim> {
- Boolean updateAttResFlseLimByGuid(AttResFlseLim attResFlseLim);
+ Boolean updateAttResFlseLimByGuid(EditResInfoVO editResInfoVO);
}
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 8dcc475..a1267d1 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
@@ -2,13 +2,19 @@
import cn.gistack.sm.sjztmd.entity.AttResFlseLim;
+import cn.gistack.sm.sjztmd.entity.AttResStagChar;
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.vo.EditResInfoVO;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.tool.utils.StringUtil;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
/**
* @PROJECT_NAME: skjcmanager
@@ -19,9 +25,37 @@
@Service
@DS("zt")
public class AttResFlseLimServiceImpl extends ServiceImpl<AttResFlseLimMapper, AttResFlseLim> implements IAttResFlseLimService {
+
+ @Autowired
+ private IAttResStagCharService attResStagCharService;
+
@Override
- public Boolean updateAttResFlseLimByGuid(AttResFlseLim attResFlseLim) {
- attResFlseLim.setUpdateTime(DateUtil.now());
- return SqlHelper.retBool(baseMapper.updateAttResFlseLimByGuid(attResFlseLim));
+ @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);
+ }
+
+ // 修改水位特征参数
+ AttResStagChar attResStagChar = new AttResStagChar();
+ attResStagChar.setResGuid(editResInfoVO.getResGuid());
+ if (StringUtil.isNotBlank(editResInfoVO.getChecFlStag()))
+ attResStagChar.setTbChecFlStag(editResInfoVO.getChecFlStag());
+ if (StringUtil.isNotBlank(editResInfoVO.getDeadStag()))
+ attResStagChar.setTbDeadStag(editResInfoVO.getDeadStag());
+ if (StringUtil.isNotBlank(editResInfoVO.getFlprHighStag()))
+ attResStagChar.setTbFlprHighStag(editResInfoVO.getFlprHighStag());
+ if (StringUtil.isNotBlank(editResInfoVO.getNormPoolStag()))
+ attResStagChar.setTbNormPoolStag(editResInfoVO.getNormPoolStag());
+ if (StringUtil.isNotBlank(editResInfoVO.getDesFlStag()))
+ attResStagChar.setTbDesFlStag(editResInfoVO.getDesFlStag());
+
+ return attResStagCharService.customizeUpdateByGuid(attResStagChar);
}
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/vo/EditResInfoVO.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/vo/EditResInfoVO.java
new file mode 100644
index 0000000..7f1e2f1
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/vo/EditResInfoVO.java
@@ -0,0 +1,69 @@
+package cn.gistack.sm.sjztmd.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @PROJECT_NAME: skjcmanager
+ * @DESCRIPTION:
+ * @USER: aix
+ * @DATE: 2023/5/23 10:06
+ */
+@Data
+public class EditResInfoVO {
+ /**
+ * 水库GUID
+ */
+ @ApiModelProperty(value = "水库GUID")
+ private String resGuid;
+
+ /**
+ * 填报水库汛期限制水位(米) - 水库汛期限制信息
+ */
+ @ApiModelProperty(value = "填报水库汛期限制水位(米)")
+ private BigDecimal tbFlseLimStag;
+
+ /**
+ * 校核洪水位(米) - 水库特征水位对象
+ */
+ @ApiModelProperty(value = "校核洪水位(米)")
+ private String checFlStag;
+
+ /**
+ * 死水位(米) - 水库特征水位对象
+ */
+ @ApiModelProperty(value = "死水位(米)")
+ private String deadStag;
+
+ /**
+ * 设计洪水位(米) - 水库特征水位对象
+ */
+ @ApiModelProperty(value = "设计洪水位(米)")
+ private String desFlStag;
+
+ /**
+ * 防洪高水位(米) - 水库特征水位对象
+ */
+ @ApiModelProperty(value = "防洪高水位(米)")
+ private String flprHighStag;
+
+ /**
+ * 正常蓄水位(米) - 水库特征水位对象
+ */
+ @ApiModelProperty(value = "正常蓄水位(米)")
+ private String normPoolStag;
+
+ /**
+ * 更新时间
+ */
+ @ApiModelProperty(value = "更新时间 ")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+}
--
Gitblit v1.9.3