水库信息填报信息修改

xieb

2023-05-26 5849a6061aab400793bcca31c94b1b47a27d2a27

水库信息填报信息修改

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResFlseLim.java

@@ -43,6 +43,14 @@
    @TableField("\"tb_flse_lim_stag\"")
    private BigDecimal tbFlseLimStag;

    @ApiModelProperty(value = "填报汛期开始时间")
    @TableField("\"tb_flood_season_start\"")
    private BigDecimal tbFloodSeasonStart;

    @ApiModelProperty(value = "填报汛期结束时间")
    @TableField("\"tb_flood_season_end\"")
    private BigDecimal tbFloodSeasonEnd;

    /**
     * 更新时间
     */

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResStagChar.java

@@ -337,6 +337,13 @@
    private String tbChecFlStag;

    /**
     * 填报死库容(万立方米)
     */
    @ApiModelProperty(value = "填报死库容(万立方米)")
    @TableField("\"tb_dead_cap\"")
    private String tbDeadCap;

    /**
     * 填报死水位(米)
     */
    @ApiModelProperty(value = "填报死水位(米)")
@@ -364,4 +371,18 @@
    @TableField("\"tb_norm_pool_stag\"")
    private String tbNormPoolStag;

    /**
     * 填报总库容（万立方立）
     */
    @ApiModelProperty(value = "填报总库容（万立方立）")
    @TableField("\"tb_tot_cap\"")
    private String tbTotCap;

    /**
     * 集雨面积
     */
    @ApiModelProperty(value = "集雨面积")
    @TableField("\"wat_shed_area\"")
    private String watShedArea;

}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResFlseLimMapper.java

@@ -13,5 +13,5 @@
 */
public interface AttResFlseLimMapper extends BaseMapper<AttResFlseLim> {

    Integer updateAttResFlseLimByGuid(@Param("attResFlseLim") AttResFlseLim attResFlseLim);
    Integer updateAttResFlseLimByGuid(@Param("attResFlseLim") AttResFlseLim attResFlseLim,@Param("type")String type);
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResFlseLimMapper.xml

@@ -7,8 +7,14 @@
        <if test="attResFlseLim.tbFlseLimStag !=null and attResFlseLim.tbFlseLimStag != ''">
            "tb_flse_lim_stag" = #{attResFlseLim.tbFlseLimStag},
        </if>
        <if test="attResFlseLim.tbFloodSeasonStart !=null and attResFlseLim.tbFloodSeasonStart != ''">
            "tb_flood_season_start" = #{attResFlseLim.tbFloodSeasonStart},
        </if>
        <if test="attResFlseLim.tbFloodSeasonEnd !=null and attResFlseLim.tbFloodSeasonEnd != ''">
            "tb_flood_season_end" = #{attResFlseLim.tbFloodSeasonEnd},
        </if>
        "update_time" = #{attResFlseLim.updateTime}
        WHERE "res_guid" = #{attResFlseLim.resGuid} and "flood_season_name" = '中汛期'
        WHERE "res_guid" = #{attResFlseLim.resGuid} and "flood_season_name" = #{type}
    </update>

</mapper>

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResStagCharMapper.xml

@@ -3,110 +3,11 @@
<mapper namespace="cn.gistack.sm.sjztmd.mapper.AttResStagCharMapper">
    <update id="customizeUpdateByGuid">
        UPDATE "att_res_stag_char" SET
        <if test="attResStagChar.deadStag !=null and attResStagChar.deadStag != ''">
            "dead_stag" = #{attResStagChar.deadStag},
        </if>
        <if test="attResStagChar.benResStag !=null and attResStagChar.benResStag != ''">
            "ben_res_stag" = #{attResStagChar.benResStag},
        </if>
        <if test="attResStagChar.checFlStag !=null and attResStagChar.checFlStag != '' ">
            "chec_fl_stag" = #{attResStagChar.checFlStag},
        </if>
        <if test="attResStagChar.checFlFlow !=null and attResStagChar.checFlFlow != '' ">
            "chec_fl_flow" = #{attResStagChar.checFlFlow},
        </if>
        <if test="attResStagChar.checFlFlowMax !=null and attResStagChar.checFlFlowMax !='' ">
            "chec_fl_flow_max" = #{attResStagChar.checFlFlowMax},
        </if>
        <if test="attResStagChar.checFlStand !=null and attResStagChar.checFlStand !='' ">
            "chec_fl_stand" = #{attResStagChar.checFlStand},
        </if>
        <if test="attResStagChar.desFlStag !=null and attResStagChar.desFlStag != '' ">
            "des_fl_stag" = #{attResStagChar.desFlStag},
        </if>
        <if test="attResStagChar.desFlFlow !=null  and attResStagChar.desFlFlow != ''">
            "des_fl_flow" = #{attResStagChar.desFlFlow},
        </if>
        <if test="attResStagChar.desFlFlowMax !=null  and attResStagChar.desFlFlowMax != '' ">
            "des_fl_flow_max" = #{attResStagChar.desFlFlowMax},
        </if>
        <if test="attResStagChar.desFlStand !=null  and attResStagChar.desFlStand != '' ">
            "des_fl_stand" = #{attResStagChar.desFlStand},
        </if>
        <if test="attResStagChar.flprHighStag !=null  and attResStagChar.flprHighStag != '' ">
            "flpr_high_stag" = #{attResStagChar.flprHighStag},
        </if>
        <if test="attResStagChar.lowStagAleVal !=null  and attResStagChar.lowStagAleVal != '' ">
            "low_stag_ale_val" = #{attResStagChar.lowStagAleVal},
        </if>
        <if test="attResStagChar.flprHighStagStand !=null  and attResStagChar.flprHighStagStand != '' ">
            "flpr_high_stag_stand" = #{attResStagChar.flprHighStagStand},
        </if>
        <if test="attResStagChar.normPoolArea !=null  and attResStagChar.normPoolArea != '' ">
            "norm_pool_area" = #{attResStagChar.normPoolArea},
        </if>
        <if test="attResStagChar.normPoolStag !=null  and attResStagChar.normPoolStag != '' ">
            "norm_pool_stag" = #{attResStagChar.normPoolStag},
        </if>
        <if test="attResStagChar.benResCap !=null  and attResStagChar.benResCap != '' ">
            "ben_res_cap" = #{attResStagChar.benResCap},
        </if>
        <if test="attResStagChar.capCoef !=null  and attResStagChar.capCoef != ''">
            "cap_coef" = #{attResStagChar.capCoef},
        </if>
        <if test="attResStagChar.deadCap !=null  and attResStagChar.deadCap != '' ">
            "dead_cap" = #{attResStagChar.deadCap},
        </if>
        <if test="attResStagChar.flcoCap !=null  and attResStagChar.flcoCap != '' ">
            "flco_cap" = #{attResStagChar.flcoCap},
        </if>
        <if test="attResStagChar.normPoolCap !=null  and attResStagChar.normPoolCap != '' ">
            "norm_pool_cap" = #{attResStagChar.normPoolCap},
        </if>
        <if test="attResStagChar.flseLimCap !=null  and attResStagChar.flseLimCap != '' ">
            "flse_lim_cap" = #{attResStagChar.flseLimCap},
        </if>
        <if test="attResStagChar.siltStorageCapacity !=null  and attResStagChar.siltStorageCapacity != '' ">
            "silt_storage_capacity" = #{attResStagChar.siltStorageCapacity},
        </if>
        <if test="attResStagChar.storFlCap !=null  and attResStagChar.storFlCap != '' ">
            "stor_fl_cap" = #{attResStagChar.storFlCap},
        </if>
        <if test="attResStagChar.totCap !=null  and attResStagChar.totCap != '' ">
            "tot_cap" = #{attResStagChar.totCap},
        </if>
        <if test="attResStagChar.conArea !=null  and attResStagChar.conArea != '' ">
            "con_area" = #{attResStagChar.conArea},
        </if>
        <if test="attResStagChar.moyearFlAge !=null  and attResStagChar.moyearFlAge != '' ">
            "moyear_fl_age" = #{attResStagChar.moyearFlAge},
        </if>
        <if test="attResStagChar.floodSeasonBStart !=null  and attResStagChar.floodSeasonBStart != '' ">
            "flood_season_b_start" = #{attResStagChar.floodSeasonBStart},
        </if>
        <if test="attResStagChar.floodSeasonBEnd !=null  and attResStagChar.floodSeasonBEnd != '' ">
            "flood_season_b_end" = #{attResStagChar.floodSeasonBEnd},
        </if>
        <if test="attResStagChar.floodSeasonBz !=null  and attResStagChar.floodSeasonBz != '' ">
            "flood_season_bz" = #{attResStagChar.floodSeasonBz},
        </if>
        <if test="attResStagChar.floodSeasonMStart !=null  and attResStagChar.floodSeasonMStart != '' ">
            "flood_season_m_start" = #{attResStagChar.floodSeasonMStart},
        </if>
        <if test="attResStagChar.floodSeasonMEnd !=null  and attResStagChar.floodSeasonMEnd != '' ">
            "flood_season_m_end" = #{attResStagChar.floodSeasonMEnd},
        </if>
        <if test="attResStagChar.floodSeasonAStart !=null  and attResStagChar.floodSeasonAStart != '' ">
            "flood_season_a_start" = #{attResStagChar.floodSeasonAStart},
        </if>
        <if test="attResStagChar.floodSeasonAEnd !=null  and attResStagChar.floodSeasonAEnd != '' ">
            "flood_season_a_end" = #{attResStagChar.floodSeasonAEnd},
        </if>
        <if test="attResStagChar.floodSeasonAz !=null  and attResStagChar.floodSeasonAz != '' ">
            "flood_season_az" = #{attResStagChar.floodSeasonAz},
        </if>
        <if test="attResStagChar.tbChecFlStag !=null  and attResStagChar.tbChecFlStag != '' ">
            "tb_chec_fl_stag" = #{attResStagChar.tbChecFlStag},
        </if>
        <if test="attResStagChar.tbDeadCap !=null  and attResStagChar.tbDeadCap != '' ">
            "tb_dead_cap" = #{attResStagChar.tbDeadCap},
        </if>
        <if test="attResStagChar.tbDeadStag !=null  and attResStagChar.tbDeadStag != '' ">
            "tb_dead_stag" = #{attResStagChar.tbDeadStag},
@@ -120,6 +21,12 @@
        <if test="attResStagChar.tbNormPoolStag !=null  and attResStagChar.tbNormPoolStag != '' ">
            "tb_norm_pool_stag" = #{attResStagChar.tbNormPoolStag},
        </if>
        <if test="attResStagChar.tbTotCap !=null  and attResStagChar.tbTotCap != '' ">
            "tb_tot_cap" = #{attResStagChar.tbTotCap},
        </if>
        <if test="attResStagChar.watShedArea !=null  and attResStagChar.watShedArea != '' ">
            "wat_shed_area" = #{attResStagChar.watShedArea},
        </if>
            "update_time" = #{attResStagChar.updateTime}
            WHERE "res_guid" = #{attResStagChar.resGuid}
    </update>

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResFlseLimServiceImpl.java

@@ -35,11 +35,20 @@
        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.getXqswObjQ();
            attResFlseLimZ.setResGuid(editResInfoVO.getResGuid());
            baseMapper.updateAttResFlseLimByGuid(attResFlseLimZ,"中汛期");
        }
        if (null != editResInfoVO.getXqswObjH()) {
            AttResFlseLim attResFlseLimH = editResInfoVO.getXqswObjQ();
            attResFlseLimH.setResGuid(editResInfoVO.getResGuid());
            baseMapper.updateAttResFlseLimByGuid(attResFlseLimH,"后汛期");
        }

        // 修改水位特征参数
@@ -47,6 +56,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 +66,10 @@
            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());

        return attResStagCharService.customizeUpdateByGuid(attResStagChar);
    }

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/vo/EditResInfoVO.java

@@ -1,5 +1,6 @@
package cn.gistack.sm.sjztmd.vo;

import cn.gistack.sm.sjztmd.entity.AttResFlseLim;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
@@ -24,16 +25,16 @@
    private String resGuid;

    /**
     * 填报水库汛期限制水位(米) - 水库汛期限制信息
     */
    @ApiModelProperty(value = "填报水库汛期限制水位(米)")
    private BigDecimal tbFlseLimStag;

    /**
     * 校核洪水位(米) - 水库特征水位对象
     */
    @ApiModelProperty(value = "校核洪水位(米)")
    private String checFlStag;

    /**
     * 死库容(万立方米) - 水库特征水位对象
     */
    @ApiModelProperty(value = "死库容(万立方米)")
    private String deadCap;

    /**
     * 死水位(米) - 水库特征水位对象
@@ -60,6 +61,31 @@
    private String normPoolStag;

    /**
     * 总库容（万立方立） - 水库特征水位对象
     */
    @ApiModelProperty(value = "总库容（万立方立）")
    private String totCap;

    /**
     * 集雨面积 - 水库特征水位对象
     */
    @ApiModelProperty(value = "集雨面积")
    private String watShedArea;

    /**
     * 填报前汛期
     */
    private AttResFlseLim xqswObjQ;
    /**
     * 填报中汛期
     */
    private AttResFlseLim xqswObjZ;
    /**
     * 填报后汛期
     */
    private AttResFlseLim xqswObjH;

    /**
     * 更新时间
     */
    @ApiModelProperty(value = "更新时间 ")