guoshilong
2023-05-26 ff6f8f0b00136dfab053d78826e876e15bf9e9dd
Merge remote-tracking branch 'origin/jtdev' into jtdev
3 files modified
5 files added
161 ■■■■■ changed files
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResFlseLim.java 4 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResWaterBlock.java 60 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResWaterBlockMapper.java 17 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResWaterBlockMapper.xml 14 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttResWaterBlockService.java 15 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResFlseLimServiceImpl.java 17 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResWaterBlockServiceImpl.java 28 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/vo/EditResInfoVO.java 6 ●●●●● patch | view | raw | blame | history
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;
    /**
     * 更新时间
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResWaterBlock.java
New file
@@ -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;
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResWaterBlockMapper.java
New file
@@ -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);
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResWaterBlockMapper.xml
New file
@@ -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>
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttResWaterBlockService.java
New file
@@ -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);
}
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);
    }
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResWaterBlockServiceImpl.java
New file
@@ -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));
    }
}
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;