Merge remote-tracking branch 'origin/jtdev' into jtdev

guoshilong

2023-05-18 987e4871e6d3906e639fb1b01302ddb2489ec88d

Merge remote-tracking branch 'origin/jtdev' into jtdev

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResStagCharController.java

@@ -15,6 +15,7 @@
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.StringUtil;
import org.springframework.web.bind.annotation.*;

/**
@@ -55,6 +56,9 @@
    @ApiOperation(value = "水库特征水位-编辑", notes = "水库特征水位-编辑")
    @PostMapping(value = "/edit")
    public R edit(@RequestBody AttResStagChar attResStagChar) {
        if (StringUtil.isBlank(attResStagChar.getResGuid())) {
            return R.fail("参数不正确");
        }
        return R.data(attResStagCharService.customizeUpdateByGuid(attResStagChar));
//        return R.data(attResStagCharService.updateById(attResStagChar));
    }

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

@@ -222,6 +222,69 @@
    private String moyearFlAge;

    /**
     * 前汛期开始时间
     */
    @ApiModelProperty(value = "前汛期开始时间 ")
    @TableField("\"flood_season_b_start\"")
    private String floodSeasonBStart;

    /**
     * 前汛期结束时间
     */
    @ApiModelProperty(value = "前汛期结束时间 ")
    @TableField("\"flood_season_b_end\"")
    private String floodSeasonBEnd;

    /**
     * 前汛期讯限水位
     */
    @ApiModelProperty(value = "前汛期讯限水位 ")
    @TableField("\"flood_season_bz\"")
    private String floodSeasonBz;

    /**
     * 主汛期开始时间
     */
    @ApiModelProperty(value = "主汛期开始时间 ")
    @TableField("\"flood_season_m_start\"")
    private String floodSeasonMStart;

    /**
     * 主汛期结束时间
     */
    @ApiModelProperty(value = "主汛期结束时间 ")
    @TableField("\"flood_season_m_end\"")
    private String floodSeasonMEnd;

    /**
     * 主汛期讯限水位
     */
    @ApiModelProperty(value = "主汛期讯限水位 ")
    @TableField("\"flood_season_mz\"")
    private String floodSeasonMz;

    /**
     * 后汛期开始时间
     */
    @ApiModelProperty(value = "后汛期开始时间 ")
    @TableField("\"flood_season_a_start\"")
    private String floodSeasonAStart;

    /**
     * 后汛期结束时间
     */
    @ApiModelProperty(value = "后汛期结束时间 ")
    @TableField("\"flood_season_a_end\"")
    private String floodSeasonAEnd;

    /**
     * 后汛期讯限水位
     */
    @ApiModelProperty(value = "后汛期讯限水位 ")
    @TableField("\"flood_season_az\"")
    private String floodSeasonAz;

    /**
     * 创建时间
     */
    @ApiModelProperty(value = "创建时间 ")
@@ -238,10 +301,31 @@
    private Date updateTime;

    /**
     * 采集时间
     * 修改人编码
     */
    @ApiModelProperty(value = "采集时间 ")
    @TableField("\"collect_time\"")
    private String collectTime;
    @ApiModelProperty(value = "修改人编码 ")
    @TableField("\"update_user_code\"")
    private String updateUserCode;

    /**
     * 修改人名称
     */
    @ApiModelProperty(value = "修改人名称 ")
    @TableField("\"update_user_name\"")
    private String updateUserName;

    /**
     * 修改人联系方式
     */
    @ApiModelProperty(value = "修改人联系方式 ")
    @TableField("\"update_user_phone\"")
    private String updateUserPhone;

//    /**
//     * 采集时间
//     */
//    @ApiModelProperty(value = "采集时间 ")
//    @TableField("\"collect_time\"")
//    private String collectTime;

}

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

@@ -2,90 +2,126 @@
<!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.AttResStagCharMapper">
    <update id="customizeUpdateByGuid">
        UPDATE "att_res_stag_char" SET
        <if test="attResStagChar.deadStag !=null ">
        UPDATE "tb_res_stag_char" SET
        <if test="attResStagChar.deadStag !=null and attResStagChar.deadStag != ''">
            "dead_stag" = #{attResStagChar.deadStag},
        </if>
        <if test="attResStagChar.benResStag !=null ">
        <if test="attResStagChar.benResStag !=null and attResStagChar.benResStag != ''">
            "ben_res_stag" = #{attResStagChar.benResStag},
        </if>
        <if test="attResStagChar.checFlStag !=null ">
        <if test="attResStagChar.checFlStag !=null and attResStagChar.checFlStag != '' ">
            "chec_fl_stag" = #{attResStagChar.checFlStag},
        </if>
        <if test="attResStagChar.checFlFlow !=null ">
        <if test="attResStagChar.checFlFlow !=null and attResStagChar.checFlFlow != '' ">
            "chec_fl_flow" = #{attResStagChar.checFlFlow},
        </if>
        <if test="attResStagChar.checFlFlowMax !=null ">
        <if test="attResStagChar.checFlFlowMax !=null and attResStagChar.checFlFlowMax !='' ">
            "chec_fl_flow_max" = #{attResStagChar.checFlFlowMax},
        </if>
        <if test="attResStagChar.checFlStand !=null ">
        <if test="attResStagChar.checFlStand !=null and attResStagChar.checFlStand !='' ">
            "chec_fl_stand" = #{attResStagChar.checFlStand},
        </if>
        <if test="attResStagChar.desFlStag !=null ">
        <if test="attResStagChar.desFlStag !=null and attResStagChar.desFlStag != '' ">
            "des_fl_stag" = #{attResStagChar.desFlStag},
        </if>
        <if test="attResStagChar.desFlFlow !=null">
        <if test="attResStagChar.desFlFlow !=null  and attResStagChar.desFlFlow != ''">
            "des_fl_flow" = #{attResStagChar.desFlFlow},
        </if>
        <if test="attResStagChar.desFlFlowMax !=null ">
        <if test="attResStagChar.desFlFlowMax !=null  and attResStagChar.desFlFlowMax != '' ">
            "des_fl_flow_max" = #{attResStagChar.desFlFlowMax},
        </if>
        <if test="attResStagChar.desFlStand !=null ">
        <if test="attResStagChar.desFlStand !=null  and attResStagChar.desFlStand != '' ">
            "des_fl_stand" = #{attResStagChar.desFlStand},
        </if>
        <if test="attResStagChar.flprHighStag !=null ">
        <if test="attResStagChar.flprHighStag !=null  and attResStagChar.flprHighStag != '' ">
            "flpr_high_stag" = #{attResStagChar.flprHighStag},
        </if>
        <if test="attResStagChar.lowStagAleVal !=null ">
        <if test="attResStagChar.lowStagAleVal !=null  and attResStagChar.lowStagAleVal != '' ">
            "low_stag_ale_val" = #{attResStagChar.lowStagAleVal},
        </if>
        <if test="attResStagChar.flprHighStagStand !=null ">
        <if test="attResStagChar.flprHighStagStand !=null  and attResStagChar.flprHighStagStand != '' ">
            "flpr_high_stag_stand" = #{attResStagChar.flprHighStagStand},
        </if>
        <if test="attResStagChar.normPoolArea !=null ">
        <if test="attResStagChar.normPoolArea !=null  and attResStagChar.normPoolArea != '' ">
            "norm_pool_area" = #{attResStagChar.normPoolArea},
        </if>
        <if test="attResStagChar.normPoolStag !=null ">
        <if test="attResStagChar.normPoolStag !=null  and attResStagChar.normPoolStag != '' ">
            "norm_pool_stag" = #{attResStagChar.normPoolStag},
        </if>
        <if test="attResStagChar.benResCap !=null ">
        <if test="attResStagChar.benResCap !=null  and attResStagChar.benResCap != '' ">
            "ben_res_cap" = #{attResStagChar.benResCap},
        </if>
        <if test="attResStagChar.capCoef !=null">
        <if test="attResStagChar.capCoef !=null  and attResStagChar.capCoef != ''">
            "cap_coef" = #{attResStagChar.capCoef},
        </if>
        <if test="attResStagChar.deadCap !=null ">
        <if test="attResStagChar.deadCap !=null  and attResStagChar.deadCap != '' ">
            "dead_cap" = #{attResStagChar.deadCap},
        </if>
        <if test="attResStagChar.flcoCap !=null ">
        <if test="attResStagChar.flcoCap !=null  and attResStagChar.flcoCap != '' ">
            "flco_cap" = #{attResStagChar.flcoCap},
        </if>
        <if test="attResStagChar.normPoolCap !=null ">
        <if test="attResStagChar.normPoolCap !=null  and attResStagChar.normPoolCap != '' ">
            "norm_pool_cap" = #{attResStagChar.normPoolCap},
        </if>
        <if test="attResStagChar.flseLimCap !=null ">
        <if test="attResStagChar.flseLimCap !=null  and attResStagChar.flseLimCap != '' ">
            "flse_lim_cap" = #{attResStagChar.flseLimCap},
        </if>
        <if test="attResStagChar.siltStorageCapacity !=null ">
        <if test="attResStagChar.siltStorageCapacity !=null  and attResStagChar.siltStorageCapacity != '' ">
            "silt_storage_capacity" = #{attResStagChar.siltStorageCapacity},
        </if>
        <if test="attResStagChar.storFlCap !=null ">
        <if test="attResStagChar.storFlCap !=null  and attResStagChar.storFlCap != '' ">
            "stor_fl_cap" = #{attResStagChar.storFlCap},
        </if>
        <if test="attResStagChar.totCap !=null ">
        <if test="attResStagChar.totCap !=null  and attResStagChar.totCap != '' ">
            "tot_cap" = #{attResStagChar.totCap},
        </if>
        <if test="attResStagChar.conArea !=null ">
        <if test="attResStagChar.conArea !=null  and attResStagChar.conArea != '' ">
            "con_area" = #{attResStagChar.conArea},
        </if>
        <if test="attResStagChar.moyearFlAge !=null ">
        <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.floodSeasonMz !=null  and attResStagChar.floodSeasonMz != '' ">
            "flood_season_mz" = #{attResStagChar.floodSeasonMz},
        </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.updateUserCode !=null  and attResStagChar.updateUserCode != '' ">
            "update_user_code" = #{attResStagChar.updateUserCode},
        </if>
        <if test="attResStagChar.updateUserName !=null  and attResStagChar.updateUserName != '' ">
            "update_user_name" = #{attResStagChar.updateUserName},
        </if>
        <if test="attResStagChar.updateUserPhone !=null  and attResStagChar.updateUserPhone != '' ">
            "update_user_phone" = #{attResStagChar.updateUserPhone},
        </if>
            "update_time" = #{attResStagChar.updateTime}
            WHERE "guid" = #{attResStagChar.guid}
            WHERE "res_guid" = #{attResStagChar.resGuid}
    </update>

    <select id="getByResGuid" resultType="cn.gistack.sm.sjztmd.entity.AttResStagChar">
        SELECT * FROM "SJZT_MD"."att_res_stag_char" WHERE "res_guid" = #{resGuid}
        SELECT * FROM "SJZT_MD"."tb_res_stag_char" WHERE "res_guid" = #{resGuid}
    </select>
</mapper>

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

@@ -3,10 +3,13 @@
import cn.gistack.sm.sjztmd.entity.AttResStagChar;
import cn.gistack.sm.sjztmd.mapper.AttResStagCharMapper;
import cn.gistack.sm.sjztmd.service.IAttResStagCharService;
import cn.gistack.system.user.feign.IUserClient;
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.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.DateUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

/**
@@ -20,6 +23,9 @@
@DS("zt")
public class AttResStagCharServiceImpl extends ServiceImpl<AttResStagCharMapper, AttResStagChar> implements IAttResStagCharService {

    @Autowired
    private IUserClient userClient;

    @Override
    public AttResStagChar getByResGuid(String resGuid) {
        return baseMapper.getByResGuid(resGuid);
@@ -28,6 +34,9 @@
    @Override
    public Boolean customizeUpdateByGuid(AttResStagChar attResStagChar) {
        attResStagChar.setUpdateTime(DateUtil.now());
        attResStagChar.setUpdateUserCode(String.valueOf(AuthUtil.getUserId()));
        attResStagChar.setUpdateUserName(AuthUtil.getUserName());
        attResStagChar.setUpdateUserPhone(userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone());
        return SqlHelper.retBool(baseMapper.customizeUpdateByGuid(attResStagChar));
    }
}