guoshilong
2023-06-03 515973966fa1b60b30f9dbb0062d7198e5fcce85
Merge remote-tracking branch 'origin/jtdev' into jtdev
3 files modified
6 files added
230 ■■■■■ changed files
skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/sms/entity/SmsTemplate.java 8 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsTemplateMapper.xml 3 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResRsbNorspiController.java 47 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResRsbNorspi.java 67 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResRsbNorspiMapper.java 21 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResRsbNorspiMapper.xml 14 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttResRsbNorspiService.java 16 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttResWaterBlockService.java 3 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResRsbNorspiServiceImpl.java 51 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/sms/entity/SmsTemplate.java
@@ -41,10 +41,16 @@
    /**
     * 通知类型 1:水情告警 2:雨情告警
     */
    @ApiModelProperty(value = "通知类型")
    @ApiModelProperty(value = "通知类型:1:水情告警 2:雨情告警")
    private String noticeType;
    /**
     * 通知方式:短信,电话,站内信
     */
    @ApiModelProperty(value = "通知方式:短信,电话,站内信")
    private String noticeMode;
    /**
     * 模板内容
     */
    @ApiModelProperty(value = "模板内容")
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsTemplateMapper.xml
@@ -17,5 +17,8 @@
        <if test="smsTemplate.type!=null and smsTemplate.type!=''">
            and type = #{smsTemplate.type}
        </if>
        <if test="smsTemplate.noticeMode!=null and smsTemplate.noticeMode!=''">
            and notice_mode = #{smsTemplate.noticeMode}
        </if>
    </select>
</mapper>
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResRsbNorspiController.java
New file
@@ -0,0 +1,47 @@
package cn.gistack.sm.sjztmd.controller;
import cn.gistack.sm.sjztmd.entity.AttResRsbNorspi;
import cn.gistack.sm.sjztmd.service.IAttResRsbNorspiService;
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/3 11:07
 */
@Slf4j
@Api(tags = "水库正常溢洪道")
@RestController
@RequestMapping("/sjztmd/attResRsbNorspi")
@AllArgsConstructor
public class AttResRsbNorspiController extends BladeController {
    private final IAttResRsbNorspiService attResRsbNorspiService;
    /**
     * 编辑
     *
     * @param attResRsbNorspi
     * @return
     */
    @ApiOperation(value = "水库特征水位-编辑", notes = "水库特征水位-编辑")
    @PostMapping(value = "/edit")
    public R edit(@RequestBody AttResRsbNorspi attResRsbNorspi) {
        if (StringUtil.isBlank(attResRsbNorspi.getResGuid())) {
            return R.fail("参数不正确");
        }
        return R.data(attResRsbNorspiService.updateAttResRsbNorspiByResId(attResRsbNorspi));
    }
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResRsbNorspi.java
New file
@@ -0,0 +1,67 @@
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/6/3 10:55
 */
@Data
@TableName("\"att_res_rsb_norspi\"")
@ApiModel(value = "水库正常溢洪道对象", description = "水库正常溢洪道对象")
public class AttResRsbNorspi 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("\"tb_weir_top_elevation\"")
    private String tbWeirTopElevation;
    /**
     * 更新人
     */
    @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/AttResRsbNorspiMapper.java
New file
@@ -0,0 +1,21 @@
package cn.gistack.sm.sjztmd.mapper;
import cn.gistack.sm.sjztmd.entity.AttResRsbNorspi;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Service;
/**
 * @PROJECT_NAME: skjcmanager
 * @DESCRIPTION:
 * @USER: aix
 * @DATE: 2023/6/3 10:58
 */
@Service
@DS("zt")
public interface AttResRsbNorspiMapper extends BaseMapper<AttResRsbNorspi> {
    Integer updateAttResRsbNorspiByResId(@Param("attResRsbNorspi")AttResRsbNorspi attResRsbNorspi);
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResRsbNorspiMapper.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.AttResRsbNorspiMapper">
    <!--namespace根据自己需要创建的的mapper的路径和名称填写-->
    <update id="updateAttResRsbNorspiByResId">
        UPDATE "att_res_rsb_norspi" SET
        <if test="attResRsbNorspi.tbWeirTopElevation !=null and attResRsbNorspi.tbWeirTopElevation != ''">
            "tb_weir_top_elevation" = #{attResRsbNorspi.tbWeirTopElevation},
        </if>
        "update_by" = concat("update_by",',',#{attResRsbNorspi.updateBy}),
        "update_time" = #{attResRsbNorspi.updateTime}
        WHERE "res_guid" = #{attResRsbNorspi.resGuid}
    </update>
</mapper>
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttResRsbNorspiService.java
New file
@@ -0,0 +1,16 @@
package cn.gistack.sm.sjztmd.service;
import cn.gistack.sm.sjztmd.entity.AttResRsbNorspi;
import com.baomidou.mybatisplus.extension.service.IService;
/**
 * @PROJECT_NAME: skjcmanager
 * @DESCRIPTION:
 * @USER: aix
 * @DATE: 2023/6/3 11:02
 */
public interface IAttResRsbNorspiService extends IService<AttResRsbNorspi> {
    Boolean updateAttResRsbNorspiByResId(AttResRsbNorspi attResRsbNorspi);
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttResWaterBlockService.java
@@ -1,6 +1,7 @@
package cn.gistack.sm.sjztmd.service;
import cn.gistack.sm.sjztmd.entity.AttResWaterBlock;
import com.baomidou.mybatisplus.extension.service.IService;
/**
 * @PROJECT_NAME: skjcmanager
@@ -8,7 +9,7 @@
 * @USER: aix
 * @DATE: 2023/5/26 14:42
 */
public interface IAttResWaterBlockService {
public interface IAttResWaterBlockService extends IService<AttResWaterBlock> {
    Boolean updateAttResWaterBlockByResId(AttResWaterBlock attResWaterBlock);
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResRsbNorspiServiceImpl.java
New file
@@ -0,0 +1,51 @@
package cn.gistack.sm.sjztmd.service.impl;
import cn.gistack.sm.sjztmd.entity.AttResRsbNorspi;
import cn.gistack.sm.sjztmd.mapper.AttResRsbNorspiMapper;
import cn.gistack.sm.sjztmd.service.IAttResRsbNorspiService;
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;
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;
import java.util.Date;
/**
 * @PROJECT_NAME: skjcmanager
 * @DESCRIPTION:
 * @USER: aix
 * @DATE: 2023/6/3 11:03
 */
@Service
@DS("zt")
public class AttResRsbNorspiServiceImpl extends ServiceImpl<AttResRsbNorspiMapper, AttResRsbNorspi> implements IAttResRsbNorspiService {
    @Autowired
    private IUserClient userClient;
    @Override
    public Boolean updateAttResRsbNorspiByResId(AttResRsbNorspi attResRsbNorspi) {
        attResRsbNorspi.setUpdateTime(DateUtil.now());
        JSONObject paramJson = new JSONObject();
        paramJson.put("time", DateUtil.format(new Date(),"yyyy-MM-dd"));
        paramJson.put("editPar", "tb_weir_top_elevation");
        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());
        attResRsbNorspi.setUpdateBy(paramJson.toJSONString());
        return SqlHelper.retBool(baseMapper.updateAttResRsbNorspiByResId(attResRsbNorspi));
    }
}