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

guoshilong

2023-10-10 6725778e1afd0b455fb9eb561fc1b77a7f6b2ae3

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

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

New file
@@ -0,0 +1,45 @@
package cn.gistack.sm.sjztmd.controller;

import cn.gistack.sm.sjztmd.entity.ZdxSkZh;
import cn.gistack.sm.sjztmd.service.IZdxSkZhService;
import com.baomidou.dynamic.datasource.annotation.DS;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.tool.api.R;
import org.springframework.web.bind.annotation.*;

import java.util.Date;


/**
 *
 * @ClassName ZdxSkZhController
 * @author zhongrj
 * @date 2023-10-09
 */
@Slf4j
@Api(tags = "中大型数据整合填报")
@RestController
@RequestMapping("/sjztmd/zdSkZh")
@AllArgsConstructor
public class ZdxSkZhController {

    private final IZdxSkZhService zdxSkZhService;

    /**
     * 新增
     * @param zdxSkZh
     * @return
     */
    @ApiOperation(value = "中大型数据整合-新增", notes = "中大型数据整合-新增")
    @PostMapping(value = "/save")
    public R save(@RequestBody ZdxSkZh zdxSkZh) {
        zdxSkZh.setCreateTime(new Date());
        zdxSkZh.setUpdateTime(new Date());
        zdxSkZh.setSysResource("zj");
        return R.status(zdxSkZhService.saveZdxSkZh(zdxSkZh));
    }

}

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

New file
@@ -0,0 +1,207 @@
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 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;

/**
 * 中大型数据整合
 * @author zhongrj
 * @date 2023-10-09
 */
@Data
@TableName("\"zdx_sk_zh\"")
@ApiModel(value = "中大型数据整合", description = "中大型数据整合")
public class ZdxSkZh implements Serializable {
    private static final long serialVersionUID = 1L;

    /**
     * 水库编码
     */
    @ApiModelProperty(value = "水库编码")
    @TableField("\"res_code\"")
    private String resCode;

    /**
     * 水库名称
     */
    @ApiModelProperty(value = "水库名称")
    @TableField("\"res_name\"")
    private String resName;

    /**
     * 行政区划编码
     */
    @ApiModelProperty(value = "行政区划编码")
    @TableField("\"ad_code\"")
    private String adCode;

    /**
     * 管理部门行政区划编码
     */
    @ApiModelProperty(value = "管理部门行政区划编码")
    @TableField("\"mgr_ad_code\"")
    private String mgrAdCode;

    /**
     * 内部行政区划编码
     */
    @ApiModelProperty(value = "内部行政区划编码")
    @TableField("\"interior_ad_guid\"")
    private String interiorAdGuid;

    /**
     * 工程规模
     */
    @ApiModelProperty(value = "工程规模")
    @TableField("\"eng_scal\"")
    private String engScal;

    /**
     * 水库功能
     */
    @ApiModelProperty(value = "水库功能")
    @TableField("\"res_func\"")
    private String resFunc;

    /**
     * 水库类型
     */
    @ApiModelProperty(value = "水库类型")
    @TableField("\"res_type\"")
    private String resType;

    /**
     * 水库所在位置
     */
    @ApiModelProperty(value = "水库所在位置")
    @TableField("\"res_loc\"")
    private String resLoc;

    /**
     * 管理部门
     */
    @ApiModelProperty(value = "管理部门 ")
    @TableField("\"mgr_dept\"")
    private String mgrDept;

    /**
     * 所属行业部门
     */
    @ApiModelProperty(value = "所属行业部门 ")
    @TableField("\"industry_dept\"")
    private String industryDept;

    /**
     * 测站编码
     */
    @ApiModelProperty(value = "测站编码")
    @TableField("\"st_code\"")
    private String stCode;

    /**
     * 正常蓄水位
     */
    @ApiModelProperty(value = "正常蓄水位")
    @TableField("\"norm_pool_stag\"")
    private Double normPoolStag;

    /**
     * 死水位
     */
    @ApiModelProperty(value = "死水位 ")
    @TableField("\"dead_stag\"")
    private Double deadStag;
    /**
     * 防洪高水位
     */
    @ApiModelProperty(value = "防洪高水位 ")
    @TableField("\"flpr_high_stag\"")
    private Double flprHighStag;
    /**
     * 兴利水位
     */
    @ApiModelProperty(value = "兴利水位 ")
    @TableField("\"ben_res_stag\"")
    private Double benResStag;
    /**
     * 讯限水位
     */
    @ApiModelProperty(value = "讯限水位 ")
    @TableField("\"flse_lim_stag\"")
    private Double flseLimStag;
    /**
     * 设计洪水位
     */
    @ApiModelProperty(value = "设计洪水位 ")
    @TableField("\"des_fl_stag\"")
    private Double desFlStag;
    /**
     * 校核洪水位
     */
    @ApiModelProperty(value = "校核洪水位 ")
    @TableField("\"chec_fl_stag\"")
    private Double checFlStag;
    /**
     * 总库容
     */
    @ApiModelProperty(value = "总库容 ")
    @TableField("\"tot_cap\"")
    private Double totCap;
    /**
     * 死库容
     */
    @ApiModelProperty(value = "死库容 ")
    @TableField("\"dead_cap\"")
    private Double deadCap;
    /**
     * 坝顶高程
     */
    @ApiModelProperty(value = "坝顶高程 ")
    @TableField("\"dam_top_elev\"")
    private Double damTopElev;
    /**
     * 堰顶高程
     */
    @ApiModelProperty(value = "堰顶高程 ")
    @TableField("\"weir_top_elev\"")
    private Double weirTopElev;
    /**
     * 集雨面积
     */
    @ApiModelProperty(value = "集雨面积 ")
    @TableField("\"wat_shed_area\"")
    private Double watShedArea;

    /**
     * 创建时间
     */
    @ApiModelProperty(value = "创建时间 ")
    @TableField("\"create_time\"")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date createTime;

    /**
     * 更新时间
     */
    @ApiModelProperty(value = "更新时间 ")
    @TableField("\"update_time\"")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date updateTime;

    /**
     * 来源
     */
    @ApiModelProperty(value = "来源 ")
    @TableField("\"sys_resource\"")
    private String sysResource;

}

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

New file
@@ -0,0 +1,16 @@
package cn.gistack.sm.sjztmd.mapper;

import cn.gistack.sm.sjztmd.entity.ZdxSkZh;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;


/**
 * ZdxSkZhMapper 接口
 *
 * @author zhongrj
 * @date 2023-10-09
 */
@DS("ztznwh")
public interface ZdxSkZhMapper extends BaseMapper<ZdxSkZh> {
}

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

New file
@@ -0,0 +1,6 @@
<?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.ZdxSkZhMapper">


</mapper>

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

New file
@@ -0,0 +1,19 @@
package cn.gistack.sm.sjztmd.service;

import cn.gistack.sm.sjztmd.entity.ZdxSkZh;
import com.baomidou.mybatisplus.extension.service.IService;

/**
 * @ClassName IZdxSkZhService
 * @author zhongrj
 * @date 2023-10-09
 */
public interface IZdxSkZhService extends IService<ZdxSkZh> {

    /**
     * 新增
     * @param zdxSkZh
     * @return
     */
    boolean saveZdxSkZh(ZdxSkZh zdxSkZh);
}

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

New file
@@ -0,0 +1,30 @@
package cn.gistack.sm.sjztmd.service.impl;

import cn.gistack.sm.sjztmd.entity.ZdxSkZh;
import cn.gistack.sm.sjztmd.mapper.ZdxSkZhMapper;
import cn.gistack.sm.sjztmd.service.IZdxSkZhService;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

/**
 * @ClassName ZdxSkZhServiceImpl
 * @author zhongrj
 * @date 2023-10-09
 */
@Service
@DS("ztznwh")
public class ZdxSkZhServiceImpl extends ServiceImpl<ZdxSkZhMapper, ZdxSkZh> implements IZdxSkZhService {

    /**
     * 新增
     * @param zdxSkZh
     * @return
     */
    @Override
    @DS("ztznwh")
    public boolean saveZdxSkZh(ZdxSkZh zdxSkZh) {
        return save(zdxSkZh);
    }
}