guoshilong
2023-06-01 7c0a5de3896d097142c694af43b9cb4805c46895
Merge remote-tracking branch 'origin/jtdev' into jtdev
2 files modified
6 files added
207 ■■■■■ changed files
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResDangerManageSpecialController.java 44 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResDangerManageSpecial.java 62 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResDangerManageSpecialMapper.java 17 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResDangerManageSpecialMapper.xml 15 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResFlseLimMapper.xml 2 ●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResStagCharMapper.xml 2 ●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttResDangerManageSpecialService.java 16 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResDangerManageSpecialServiceImpl.java 49 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResDangerManageSpecialController.java
New file
@@ -0,0 +1,44 @@
package cn.gistack.sm.sjztmd.controller;
import cn.gistack.sm.sjztmd.entity.AttResDangerManageSpecial;
import cn.gistack.sm.sjztmd.service.IAttResDangerManageSpecialService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.StringUtil;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
 * @PROJECT_NAME: skjcmanager
 * @DESCRIPTION: 病险水库controller
 * @USER: aix
 * @DATE: 2023/6/1 14:33
 */
@Slf4j
@Api(tags = "中台病险水库")
@RestController
@RequestMapping("/sjztmd/attResDangerManageSpecial")
@AllArgsConstructor
public class AttResDangerManageSpecialController extends BladeController {
    private final IAttResDangerManageSpecialService attResDangerManageSpecialService;
    @ApiOperation(value = "病险水库控制水位-编辑", notes = "病险水库控制水位-编辑")
    @PostMapping(value = "/edit")
    public R edit(@RequestBody AttResDangerManageSpecial attResDangerManageSpecial) {
        if (StringUtil.isBlank(attResDangerManageSpecial.getResGuid())) {
            return R.fail("参数不正确");
        }
        return R.data(attResDangerManageSpecialService.updateAttResDangerManageSpecialByResId(attResDangerManageSpecial));
    }
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResDangerManageSpecial.java
New file
@@ -0,0 +1,62 @@
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.util.Date;
/**
 * @PROJECT_NAME: skjcmanager
 * @DESCRIPTION: 病险水库信息
 * @USER: aix
 * @DATE: 2023/6/1 14:15
 */
@Data
@TableName("\"att_res_danger_manage_special\"")
@ApiModel(value = "病险水库信息对象", description = "病险水库信息对象")
public class AttResDangerManageSpecial {
    /**
     * 主键
     */
    @JsonSerialize(using = ToStringSerializer.class)
    @ApiModelProperty(value = "主键")
    @TableField("\"guid\"")
    private String guid;
    /**
     * 水库GUID
     */
    @ApiModelProperty(value = "水库GUID")
    @TableField("\"res_guid\"")
    private String resGuid;
    /**
     * 填报限制运行水位
     */
    @ApiModelProperty(value = "填报限制运行水位")
    @TableField("\"tb_control_z\"")
    private String tbControlZ;
    /**
     * 更新人
     */
    @ApiModelProperty(value = "更新人 ")
    @TableField("\"update_by\"")
    private String updateBy;
    /**
     * 更新时间
     */
    @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/AttResDangerManageSpecialMapper.java
New file
@@ -0,0 +1,17 @@
package cn.gistack.sm.sjztmd.mapper;
import cn.gistack.sm.sjztmd.entity.AttResDangerManageSpecial;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
/**
 * @PROJECT_NAME: skjcmanager
 * @DESCRIPTION: 病险水库Mapper
 * @USER: aix
 * @DATE: 2023/6/1 14:18
 */
public interface AttResDangerManageSpecialMapper extends BaseMapper<AttResDangerManageSpecial> {
    Integer updateAttResDangerManageSpecialByResId(@Param("attResDangerManageSpecial") AttResDangerManageSpecial attResDangerManageSpecial );
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResDangerManageSpecialMapper.xml
New file
@@ -0,0 +1,15 @@
<?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.AttResDangerManageSpecialMapper">
    <update id="updateAttResDangerManageSpecialByResId">
        UPDATE "att_res_danger_manage_special" SET
        <if test="attResDangerManageSpecial.tbControlZ !=null and attResDangerManageSpecial.tbControlZ != ''">
            "tb_control_z" = #{attResDangerManageSpecial.tbControlZ},
        </if>
        "update_by" = concat("update_by",',',#{attResDangerManageSpecial.updateBy}),
        "update_time" = #{attResDangerManageSpecial.updateTime}
        WHERE "res_guid" = #{attResDangerManageSpecial.resGuid}
    </update>
</mapper>
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" = concat("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" = concat("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/IAttResDangerManageSpecialService.java
New file
@@ -0,0 +1,16 @@
package cn.gistack.sm.sjztmd.service;
import cn.gistack.sm.sjztmd.entity.AttResDangerManageSpecial;
import com.baomidou.mybatisplus.extension.service.IService;
/**
 * @PROJECT_NAME: skjcmanager
 * @DESCRIPTION: 病险水库信息service
 * @USER: aix
 * @DATE: 2023/6/1 14:23
 */
public interface IAttResDangerManageSpecialService extends IService<AttResDangerManageSpecial> {
    Boolean updateAttResDangerManageSpecialByResId(AttResDangerManageSpecial attResDangerManageSpecial);
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResDangerManageSpecialServiceImpl.java
New file
@@ -0,0 +1,49 @@
package cn.gistack.sm.sjztmd.service.impl;
import cn.gistack.sm.sjztmd.entity.AttResDangerManageSpecial;
import cn.gistack.sm.sjztmd.mapper.AttResDangerManageSpecialMapper;
import cn.gistack.sm.sjztmd.service.IAttResDangerManageSpecialService;
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 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;
/**
 * @PROJECT_NAME: skjcmanager
 * @DESCRIPTION: serviceImpl
 * @USER: aix
 * @DATE: 2023/6/1 14:25
 */
@Service
@DS("zt")
public class AttResDangerManageSpecialServiceImpl extends ServiceImpl<AttResDangerManageSpecialMapper, AttResDangerManageSpecial> implements IAttResDangerManageSpecialService {
    @Autowired
    private IUserClient userClient;
    @Override
    public Boolean updateAttResDangerManageSpecialByResId(AttResDangerManageSpecial attResDangerManageSpecial) {
        if (StringUtil.isBlank(attResDangerManageSpecial.getResGuid()))
            return false;
        attResDangerManageSpecial.setUpdateTime(DateUtil.now());
        JSONObject paramJson = new JSONObject();
        paramJson.put("time", DateUtil.format(new Date(),"yyyy-MM-dd"));
        paramJson.put("editPar", "tb_control_z");
        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());
        attResDangerManageSpecial.setUpdateBy(paramJson.toJSONString());
        return baseMapper.updateAttResDangerManageSpecialByResId(attResDangerManageSpecial) > 0;
    }
}