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

guoshilong

2023-05-30 bbaaa7dda42c73311c2cd526f7d31fcf4988a61c

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

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

@@ -13,7 +13,7 @@
        <if test="attResFlseLim.tbFloodSeasonEnd !=null and attResFlseLim.tbFloodSeasonEnd != ''">
            "tb_flood_season_end" = #{attResFlseLim.tbFloodSeasonEnd},
        </if>
        "update_by" = #{attResFlseLim.updateBy},
        "update_by" = concat("update_by",#{attResFlseLim.updateBy}),
        "update_time" = #{attResFlseLim.updateTime}
        WHERE "res_guid" = #{attResFlseLim.resGuid} and "flood_season_name" = #{type}
    </update>

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

@@ -27,7 +27,7 @@
        <if test="attResStagChar.watShedArea !=null  and attResStagChar.watShedArea != '' ">
            "wat_shed_area" = #{attResStagChar.watShedArea},
        </if>
        "update_by" = #{attResStagChar.updateBy},
        "update_by" = concat("update_by",#{attResStagChar.updateBy}),
        "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

@@ -10,6 +10,7 @@
import cn.gistack.sm.sjztmd.service.IAttResWaterBlockService;
import cn.gistack.sm.sjztmd.vo.EditResInfoVO;
import cn.gistack.system.user.feign.IUserClient;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
@@ -19,6 +20,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.Date;

/**
 * @PROJECT_NAME: skjcmanager
@@ -45,25 +48,67 @@
        editResInfoVO.setUpdateTime(DateUtil.now());

        // 修改汛期水位
        if (null != editResInfoVO.getXqswObjQ()) {
        if (null != editResInfoVO.getXqswObjQ() && StringUtil.isNotBlank(String.valueOf(editResInfoVO.getXqswObjQ().getTbFlseLimStag()))) {
            AttResFlseLim attResFlseLimQ = editResInfoVO.getXqswObjQ();
            attResFlseLimQ.setResGuid(editResInfoVO.getResGuid());
            attResFlseLimQ.setUpdateTime(DateUtil.now());
            attResFlseLimQ.setUpdateBy(AuthUtil.getUserName() + "-" + userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone());

            JSONObject paramJson = new JSONObject();
            paramJson.put("time", DateUtil.format(new Date(),"yyyy-MM-dd"));
            String editPar = "tb_flse_lim_stag";
            if (StringUtil.isNotBlank(editResInfoVO.getXqswObjQ().getTbFloodSeasonStart()))
                editPar += ",tb_flood_season_start";
            if (StringUtil.isNotBlank(editResInfoVO.getXqswObjQ().getTbFloodSeasonEnd()))
                editPar += ",tb_flood_season_end";
            paramJson.put("editPar", editPar);
            paramJson.put("ly", "ywxt");
            paramJson.put("user_id", AuthUtil.getUserId());
            paramJson.put("user_name", AuthUtil.getUserName());
            paramJson.put("phone", userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone());
            attResFlseLimQ.setUpdateBy(paramJson.toJSONString());

            baseMapper.updateAttResFlseLimByGuid(attResFlseLimQ,"前汛期");
        }
        if (null != editResInfoVO.getXqswObjZ()) {
        if (null != editResInfoVO.getXqswObjZ()  && StringUtil.isNotBlank(String.valueOf(editResInfoVO.getXqswObjZ().getTbFlseLimStag()))) {
            AttResFlseLim attResFlseLimZ = editResInfoVO.getXqswObjZ();
            attResFlseLimZ.setResGuid(editResInfoVO.getResGuid());
            attResFlseLimZ.setUpdateTime(DateUtil.now());
            attResFlseLimZ.setUpdateBy(AuthUtil.getUserName() + "-" + userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone());

            JSONObject paramJson = new JSONObject();
            paramJson.put("time", DateUtil.format(new Date(),"yyyy-MM-dd"));
            String editPar = "tb_flse_lim_stag";
            if (StringUtil.isNotBlank(editResInfoVO.getXqswObjQ().getTbFloodSeasonStart()))
                editPar += ",tb_flood_season_start";
            if (StringUtil.isNotBlank(editResInfoVO.getXqswObjQ().getTbFloodSeasonEnd()))
                editPar += ",tb_flood_season_end";
            paramJson.put("editPar", editPar);
            paramJson.put("ly", "ywxt");
            paramJson.put("user_id", AuthUtil.getUserId());
            paramJson.put("user_name", AuthUtil.getUserName());
            paramJson.put("phone", userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone());
            attResFlseLimZ.setUpdateBy(paramJson.toJSONString());

            baseMapper.updateAttResFlseLimByGuid(attResFlseLimZ,"中汛期");
        }
        if (null != editResInfoVO.getXqswObjH()) {
        if (null != editResInfoVO.getXqswObjH() && StringUtil.isNotBlank(String.valueOf(editResInfoVO.getXqswObjH().getTbFlseLimStag()))) {
            AttResFlseLim attResFlseLimH = editResInfoVO.getXqswObjH();
            attResFlseLimH.setResGuid(editResInfoVO.getResGuid());
            attResFlseLimH.setUpdateTime(DateUtil.now());
            attResFlseLimH.setUpdateBy(AuthUtil.getUserName() + "-" + userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone());

            JSONObject paramJson = new JSONObject();
            paramJson.put("time", DateUtil.format(new Date(),"yyyy-MM-dd"));
            String editPar = "tb_flse_lim_stag";
            if (StringUtil.isNotBlank(editResInfoVO.getXqswObjQ().getTbFloodSeasonStart()))
                editPar += ",tb_flood_season_start";
            if (StringUtil.isNotBlank(editResInfoVO.getXqswObjQ().getTbFloodSeasonEnd()))
                editPar += ",tb_flood_season_end";
            paramJson.put("editPar", editPar);
            paramJson.put("ly", "ywxt");
            paramJson.put("user_id", AuthUtil.getUserId());
            paramJson.put("user_name", AuthUtil.getUserName());
            paramJson.put("phone", userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone());
            attResFlseLimH.setUpdateBy(paramJson.toJSONString());

            baseMapper.updateAttResFlseLimByGuid(attResFlseLimH,"后汛期");
        }


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

@@ -4,13 +4,18 @@
import cn.gistack.sm.sjztmd.mapper.AttResStagCharMapper;
import cn.gistack.sm.sjztmd.service.IAttResStagCharService;
import cn.gistack.system.user.feign.IUserClient;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.nacos.shaded.com.google.gson.JsonObject;
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.springblade.core.tool.utils.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.Date;

/**
 * @ClassName AttResStagCharServiceImpl
@@ -34,9 +39,30 @@
    @Override
    public Boolean customizeUpdateByGuid(AttResStagChar attResStagChar) {
        attResStagChar.setUpdateTime(DateUtil.now());
//        attResStagChar.setUpdateUserCode(String.valueOf(AuthUtil.getUserId()));
        attResStagChar.setUpdateBy(AuthUtil.getUserName() + "-" + userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone());
//        attResStagChar.setUpdateUserPhone(userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone());
        JSONObject paramJson = new JSONObject();
        paramJson.put("time", DateUtil.format(new Date(),"yyyy-MM-dd"));
        String editPar = "";
        if (StringUtil.isNotBlank(attResStagChar.getTbChecFlStag()))
            editPar += ",tb_chec_fl_stag";
        if (StringUtil.isNotBlank(attResStagChar.getTbDeadStag()))
            editPar += ",tb_dead_stag";
        if (StringUtil.isNotBlank(attResStagChar.getTbDesFlStag()))
            editPar += ",tb_des_fl_stag";
        if (StringUtil.isNotBlank(attResStagChar.getTbFlprHighStag()))
            editPar += ",tb_flpr_high_stag";
        if (StringUtil.isNotBlank(attResStagChar.getTbNormPoolStag()))
            editPar += ",tb_norm_pool_stag";
        if (StringUtil.isNotBlank(attResStagChar.getTbDeadCap()))
            editPar += ",tb_dead_cap";
        if (StringUtil.isNotBlank(attResStagChar.getTbTotCap()))
            editPar += ",tb_tot_cap";
        paramJson.put("editPar", editPar);
        paramJson.put("ly", "ywxt");
        paramJson.put("user_id", AuthUtil.getUserId());
        paramJson.put("user_name", AuthUtil.getUserName());
        paramJson.put("phone", userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone());

        attResStagChar.setUpdateBy(paramJson.toJSONString());
        return SqlHelper.retBool(baseMapper.customizeUpdateByGuid(attResStagChar));
    }
}