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/entity/AttResFlseLim.java | 4
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResWaterBlockMapper.xml | 14 ++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResFlseLimServiceImpl.java | 17 +++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttResWaterBlockService.java | 15 +++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResWaterBlockServiceImpl.java | 28 +++++++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResWaterBlockMapper.java | 17 +++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/vo/EditResInfoVO.java | 6 ++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResWaterBlock.java | 60 ++++++++++++++++++++
8 files changed, 157 insertions(+), 4 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResFlseLim.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResFlseLim.java
index 33cf4cb..c2c1e2b 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResFlseLim.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResFlseLim.java
@@ -45,11 +45,11 @@
@ApiModelProperty(value = "填报汛期开始时间")
@TableField("\"tb_flood_season_start\"")
- private BigDecimal tbFloodSeasonStart;
+ private String tbFloodSeasonStart;
@ApiModelProperty(value = "填报汛期结束时间")
@TableField("\"tb_flood_season_end\"")
- private BigDecimal tbFloodSeasonEnd;
+ private String tbFloodSeasonEnd;
/**
* 更新时间
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResWaterBlock.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResWaterBlock.java
new file mode 100644
index 0000000..5e4e878
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResWaterBlock.java
@@ -0,0 +1,60 @@
+package cn.gistack.sm.sjztmd.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @PROJECT_NAME: skjcmanager
+ * @DESCRIPTION: 水库挡水建筑物
+ * @USER: aix
+ * @DATE: 2023/5/26 14:23
+ */
+@Data
+@TableName("\"att_res_water_block\"")
+@ApiModel(value = "水库挡水建筑物", description = "水库挡水建筑物")
+public class AttResWaterBlock implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @JsonSerialize(using = ToStringSerializer.class)
+ @ApiModelProperty(value = "主键")
+ @TableField("\"guid\"")
+ private String guid;
+
+ /**
+ * 水库GUID
+ */
+ @ApiModelProperty(value = "水库GUID")
+ @TableField("\"res_guid\"")
+ private String resGuid;
+
+ /**
+ * 填报坝顶高程(米)
+ */
+ @ApiModelProperty(value = "填报坝顶高程(米)")
+ @TableField("\"top_dam_top_elevation\"")
+ private String topDamTopElevation;
+
+ /**
+ * 更新时间
+ */
+ @ApiModelProperty(value = "更新时间 ")
+ @TableField("\"update_time\"")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResWaterBlockMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResWaterBlockMapper.java
new file mode 100644
index 0000000..51ba8d5
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResWaterBlockMapper.java
@@ -0,0 +1,17 @@
+package cn.gistack.sm.sjztmd.mapper;
+
+import cn.gistack.sm.sjztmd.entity.AttResWaterBlock;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * @PROJECT_NAME: skjcmanager
+ * @DESCRIPTION:
+ * @USER: aix
+ * @DATE: 2023/5/26 14:35
+ */
+public interface AttResWaterBlockMapper extends BaseMapper<AttResWaterBlock> {
+
+ Integer updateAttResWaterBlockByResId(@Param("attResWaterBlock")AttResWaterBlock attResWaterBlock);
+
+}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResWaterBlockMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResWaterBlockMapper.xml
new file mode 100644
index 0000000..1ccde4e
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResWaterBlockMapper.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.gistack.sm.sjztmd.mapper.AttResWaterBlockMapper">
+
+ <update id="updateAttResWaterBlockByResId">
+ UPDATE "att_res_water_block" SET
+ <if test="attResWaterBlock.topDamTopElevation !=null and attResWaterBlock.topDamTopElevation != ''">
+ "top_dam_top_elevation" = #{attResWaterBlock.topDamTopElevation},
+ </if>
+ "update_time" = #{attResWaterBlock.updateTime}
+ WHERE "res_guid" = #{attResWaterBlock.resGuid}
+ </update>
+
+</mapper>
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttResWaterBlockService.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttResWaterBlockService.java
new file mode 100644
index 0000000..5c4a891
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttResWaterBlockService.java
@@ -0,0 +1,15 @@
+package cn.gistack.sm.sjztmd.service;
+
+import cn.gistack.sm.sjztmd.entity.AttResWaterBlock;
+
+/**
+ * @PROJECT_NAME: skjcmanager
+ * @DESCRIPTION:
+ * @USER: aix
+ * @DATE: 2023/5/26 14:42
+ */
+public interface IAttResWaterBlockService {
+
+ Boolean updateAttResWaterBlockByResId(AttResWaterBlock attResWaterBlock);
+
+}
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 f2118f5..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,6 +31,9 @@
@Autowired
private IAttResStagCharService attResStagCharService;
+ @Autowired
+ private IAttResWaterBlockService attResWaterBlockService;
+
@Override
@Transactional
public Boolean updateAttResFlseLimByGuid(EditResInfoVO editResInfoVO) {
@@ -41,12 +46,12 @@
baseMapper.updateAttResFlseLimByGuid(attResFlseLimQ,"前汛期");
}
if (null != editResInfoVO.getXqswObjZ()) {
- AttResFlseLim attResFlseLimZ = editResInfoVO.getXqswObjQ();
+ AttResFlseLim attResFlseLimZ = editResInfoVO.getXqswObjZ();
attResFlseLimZ.setResGuid(editResInfoVO.getResGuid());
baseMapper.updateAttResFlseLimByGuid(attResFlseLimZ,"中汛期");
}
if (null != editResInfoVO.getXqswObjH()) {
- AttResFlseLim attResFlseLimH = editResInfoVO.getXqswObjQ();
+ AttResFlseLim attResFlseLimH = editResInfoVO.getXqswObjH();
attResFlseLimH.setResGuid(editResInfoVO.getResGuid());
baseMapper.updateAttResFlseLimByGuid(attResFlseLimH,"后汛期");
}
@@ -71,6 +76,14 @@
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);
}
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResWaterBlockServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResWaterBlockServiceImpl.java
new file mode 100644
index 0000000..ae14704
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResWaterBlockServiceImpl.java
@@ -0,0 +1,28 @@
+package cn.gistack.sm.sjztmd.service.impl;
+
+import cn.gistack.sm.sjztmd.entity.AttResWaterBlock;
+import cn.gistack.sm.sjztmd.mapper.AttResWaterBlockMapper;
+import cn.gistack.sm.sjztmd.service.IAttResWaterBlockService;
+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.springframework.stereotype.Service;
+
+/**
+ * @PROJECT_NAME: skjcmanager
+ * @DESCRIPTION:
+ * @USER: aix
+ * @DATE: 2023/5/26 14:42
+ */
+@Service
+@DS("zt")
+public class AttResWaterBlockServiceImpl extends ServiceImpl<AttResWaterBlockMapper, AttResWaterBlock> implements IAttResWaterBlockService {
+
+ @Override
+ public Boolean updateAttResWaterBlockByResId(AttResWaterBlock attResWaterBlock) {
+ attResWaterBlock.setUpdateTime(DateUtil.now());
+ return SqlHelper.retBool(baseMapper.updateAttResWaterBlockByResId(attResWaterBlock));
+ }
+
+}
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
index cd57af4..219eb20 100644
--- 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
@@ -73,6 +73,12 @@
private String watShedArea;
/**
+ * 填报坝顶高程(米)
+ */
+ @ApiModelProperty(value = "填报坝顶高程(米)")
+ private String topDamTopElevation;
+
+ /**
* 填报前汛期
*/
private AttResFlseLim xqswObjQ;
--
Gitblit v1.9.3