新增大中型水库统计数据维护（数据上报，分页查询）

zhongrj

2023-10-19 9254e84b203105f15385848ed3607df178a19023

新增大中型水库统计数据维护（数据上报，分页查询）

 skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/controller/AlarmRecordController.java

@@ -48,7 +48,7 @@
    @ApiOperation(value="告警记录-自定义分页列表查询", notes="告警记录-自定义分页列表查询")
    @GetMapping(value = "/page")
    public R selectAlarmPage(AlarmRecordVO alarmRecord, Query query) {
        return R.data( alarmRecordService.selectAlarmRecordPage(Condition.getPage(query),alarmRecord));
        return R.data(alarmRecordService.selectAlarmRecordPage(Condition.getPage(query),alarmRecord));
    }

    /**

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/controller/SkxsQkTjController.java

New file
@@ -0,0 +1,67 @@
package cn.gistack.sm.sjztods.controller;

import cn.gistack.sm.sjztods.entity.SkxsQkTj;
import cn.gistack.sm.sjztods.service.ISkxsQkTjService;
import cn.gistack.sm.sjztods.vo.SkxsQkTjVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springframework.web.bind.annotation.*;

import java.util.Date;


/**
 *
 * @ClassName SkxsQkTjController
 * @author zhongrj
 * @date 2023-10-19
 */
@Slf4j
@Api(tags = "大中型水库蓄水情况统计表")
@RestController
@RequestMapping("/sjztods/skxsQkTj")
@AllArgsConstructor
public class SkxsQkTjController {

    private final ISkxsQkTjService skxsQkTjService;

    /**
     * 上报
     * @param skxsQkTj
     * @return
     */
    @ApiOperation(value = "大中型水库蓄水情况统计-上报", notes = "大中型水库蓄水情况统计-上报")
    @PostMapping(value = "/exportSkxsQkTj")
    public R exportSkxsQkTj(@RequestBody SkxsQkTj skxsQkTj) {
        return R.status(skxsQkTjService.exportSkxsQkTj(skxsQkTj));
    }

    /**
     * 分页列表数据查询
     * @param skxsQkTj
     * @param query
     * @return
     */
    @GetMapping(value = "/page")
    public R page(SkxsQkTjVO skxsQkTj, Query query) {
        return R.data(skxsQkTjService.selectSkxsQkTjPage(Condition.getPage(query), skxsQkTj));
    }

    /**
     * 按行政区统计
     * @param skxsQkTj
     * @return
     */
    @ApiOperation(value = "大中型水库蓄水情况统计-按行政区统计", notes = "大中型水库蓄水情况统计-按行政区统计")
    @GetMapping(value = "/getStatisticList")
    public R getStatisticList(SkxsQkTjVO skxsQkTj) {
        return R.data(skxsQkTjService.getStatisticList(skxsQkTj));
    }

}

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

File was renamed from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/ZdxSkZhController.java
@@ -1,8 +1,7 @@
package cn.gistack.sm.sjztmd.controller;
package cn.gistack.sm.sjztods.controller;

import cn.gistack.sm.sjztmd.entity.ZdxSkZh;
import cn.gistack.sm.sjztmd.service.IZdxSkZhService;
import com.baomidou.dynamic.datasource.annotation.DS;
import cn.gistack.sm.sjztods.entity.ZdxSkZh;
import cn.gistack.sm.sjztods.service.IZdxSkZhService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/entity/SkxsQkTj.java

New file
@@ -0,0 +1,228 @@
package cn.gistack.sm.sjztods.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
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-18
 */
@Data
@TableName("\"skxs_qk_tj\"")
@ApiModel(value = "大中型水库蓄水情况统计表", description = "大中型水库蓄水情况统计表")
public class SkxsQkTj implements Serializable {
    private static final long serialVersionUID = 1L;

    /**
     * 主键
     */
    @ApiModelProperty(value = "主键")
    @TableId(value = "\"guid\"",type = IdType.ASSIGN_ID)
    private String guid;

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

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

    /**
     * 总库容
     */
    @ApiModelProperty(value = "总库容")
    @TableField("\"total_cap\"")
    private Double totalCap;

    /**
     * 当前水位
     */
    @ApiModelProperty(value = "当前水位")
    @TableField("\"rz\"")
    private Double rz;

    /**
     * 当日蓄水量
     */
    @ApiModelProperty(value = "当日蓄水量")
    @TableField("\"ws\"")
    private Double ws;

    /**
     * 上月最后一天蓄水量
     */
    @ApiModelProperty(value = "上月最后一天蓄水量")
    @TableField("\"up_month_ws\"")
    private Double upMonthWs;

    /**
     * 去年同期蓄水量
     */
    @ApiModelProperty(value = "去年同期蓄水量")
    @TableField("\"last_year_ws\"")
    private Double lastYearWs;

    /**
     * 历史同期蓄水量
     */
    @ApiModelProperty(value = "历史同期蓄水量")
    @TableField("\"his_ws\"")
    private Double hisWs;

    /**
     * 今年以来灌溉放水量
     */
    @ApiModelProperty(value = "今年以来灌溉放水量")
    @TableField("\"now_year_irr_dw\"")
    private Double nowYearIrrDw;

    /**
     * 今年以来生活放水量
     */
    @ApiModelProperty(value = "今年以来生活放水量")
    @TableField("\"now_year_live_dw\"")
    private Double nowYearLiveDw;

    /**
     * 今年以来生态放水量
     */
    @ApiModelProperty(value = "今年以来生态放水量 ")
    @TableField("\"now_year_zoo_dw\"")
    private Double nowYearZooDw;

    /**
     * 总蓄水现有-历史
     */
    @ApiModelProperty(value = "总蓄水现有-历史 ")
    @TableField("\"total_ws_dif\"")
    private String totalWsDif;

    /**
     * 总蓄水较历史同期（%）
     */
    @ApiModelProperty(value = "总蓄水较历史同期（%）")
    @TableField("\"total_ws_his_pro\"")
    private String totalWsHisPro;

    /**
     * 死库容
     */
    @ApiModelProperty(value = "死库容")
    @TableField("\"dead_cap\"")
    private Double deadCap;

    /**
     * 当前有效蓄水
     */
    @ApiModelProperty(value = "当前有效蓄水 ")
    @TableField("\"now_valid_ws\"")
    private Double nowValidWs;

    /**
     * 兴利库容
     */
    @ApiModelProperty(value = "兴利库容 ")
    @TableField("\"ben_res_cap\"")
    private Double benResCap;

    /**
     * 有效蓄水/兴利（%）
     */
    @ApiModelProperty(value = "有效蓄水/兴利（%） ")
    @TableField("\"valid_ws_ben_pro\"")
    private String validWsBenPro;
    /**
     * 历史同期有效蓄水
     */
    @ApiModelProperty(value = "历史同期有效蓄水 ")
    @TableField("\"his_valid_ws\"")
    private Double hisValidWs;
    /**
     * 当前有效比历史同期（%）
     */
    @ApiModelProperty(value = "当前有效比历史同期（%） ")
    @TableField("\"now_valid_his_pro\"")
    private String nowValidHisPro;

    /**
     * 去年有效蓄水
     */
    @ApiModelProperty(value = "去年有效蓄水 ")
    @TableField("\"last_year_valid_ws\"")
    private Double lastYearValidWs;

    /**
     * 当前有效比去年同期（%）
     */
    @ApiModelProperty(value = "当前有效比去年同期（%） ")
    @TableField("\"now_valid_last_pro\"")
    private String nowValidLastPro;

    /**
     * 统计时间
     */
    @ApiModelProperty(value = "统计时间 ")
    @TableField("\"statistic_time\"")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date statisticTime;

    /**
     * 创建人
     */
    @ApiModelProperty(value = "创建人")
    @TableField("\"create_user\"")
    private Long createUser;

    /**
     * 创建时间
     */
    @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_user\"")
    private Long updateUser;

    /**
     * 更新时间
     */
    @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/sjztods/entity/XsfsQktj.java

New file
@@ -0,0 +1,241 @@
package cn.gistack.sm.sjztods.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
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-18
 */
@Data
@TableName("\"xsfs_qktj\"")
@ApiModel(value = "蓄水放水情况统计表", description = "蓄水放水情况统计表")
public class XsfsQktj implements Serializable {
    private static final long serialVersionUID = 1L;

    /**
     * 主键
     */
    @ApiModelProperty(value = "主键")
    @TableId(value = "\"guid\"",type = IdType.ASSIGN_ID)
    private String guid;

    /**
     * 区域名称
     */
    @ApiModelProperty(value = "区域名称")
    @TableField("\"ad_name\"")
    private String adName;

    /**
     * 区域等级
     */
    @ApiModelProperty(value = "区域等级")
    @TableField("\"ad_grad\"")
    private String adGrad;

    /**
     * 区域编号
     */
    @ApiModelProperty(value = "区域编号")
    @TableField("\"ad_code\"")
    private String adCode;

    /**
     * 总蓄水合计
     */
    @ApiModelProperty(value = "总蓄水合计")
    @TableField("\"zxs_total\"")
    private Double zxsTotal;

    /**
     * 总蓄水较上次
     */
    @ApiModelProperty(value = "总蓄水较上次")
    @TableField("\"zxs_sc\"")
    private String zxsSc;

    /**
     * 总蓄水较历史同期
     */
    @ApiModelProperty(value = "总蓄水较历史同期")
    @TableField("\"zxs_his_tq\"")
    private String zxsHisTq;

    /**
     * 总蓄水较历史同期增减(%)
     */
    @ApiModelProperty(value = "总蓄水较历史同期增减(%)")
    @TableField("\"zxs_his_tqzj\"")
    private String zxsHisTqzj;

    /**
     * 总蓄水较去年同期
     */
    @ApiModelProperty(value = "总蓄水较去年同期")
    @TableField("\"zxs_last_year_tq\"")
    private String zxsLastYearTq;

    /**
     * 总蓄水较去年同期增减(%)
     */
    @ApiModelProperty(value = "总蓄水较去年同期增减(%)")
    @TableField("\"zxs_last_year_tqzj\"")
    private String zxsLastYearTqzj;

    /**
     * 有效蓄水合计
     */
    @ApiModelProperty(value = "有效蓄水合计")
    @TableField("\"yxxs_total\"")
    private Double yxxsTotal;

    /**
     * 有效蓄水较同期历史有效蓄水增减（%）
     */
    @ApiModelProperty(value = "有效蓄水较同期历史有效蓄水增减（%） ")
    @TableField("\"yxxs_his_tqzj\"")
    private String yxxsHisTqzj;

    /**
     * 有效蓄水较同期去年有效蓄水增减（%）
     */
    @ApiModelProperty(value = "有效蓄水较同期去年有效蓄水增减（%） ")
    @TableField("\"yxxs_last_year_tqzj\"")
    private String yxxsLastYearTqzj;

    /**
     * 占兴利库容百分比（%）
     */
    @ApiModelProperty(value = "占兴利库容百分比（%）")
    @TableField("\"yxxs_z_xlkr\"")
    private String yxxsZXlkr;

    /**
     * 大型水库蓄水合计
     */
    @ApiModelProperty(value = "大型水库蓄水合计")
    @TableField("\"dxsk_xs_total\"")
    private Double dxskXsTotal;

    /**
     * 大型水库蓄水较历史同期
     */
    @ApiModelProperty(value = "大型水库蓄水较历史同期 ")
    @TableField("\"dxsk_xs_his\"")
    private String dxskXsHis;
    /**
     * 大型水库蓄水较去年同期
     */
    @ApiModelProperty(value = "大型水库蓄水较去年同期 ")
    @TableField("\"dxsk_xs_last_year\"")
    private String dxskXsLastYear;
    /**
     * 大型水库有效蓄水
     */
    @ApiModelProperty(value = "大型水库有效蓄水 ")
    @TableField("\"dxsk_yxxs\"")
    private Double dxskYxxs;
    /**
     * 中型水库蓄水合计
     */
    @ApiModelProperty(value = "中型水库蓄水合计 ")
    @TableField("\"zxsk_xs_total\"")
    private Double zxskXsTotal;
    /**
     * 中型水库较历史同期
     */
    @ApiModelProperty(value = "中型水库较历史同期 ")
    @TableField("\"zxsk_xs_his\"")
    private String zxskXsHis;

    /**
     * 中型水库较去年同期
     */
    @ApiModelProperty(value = "中型水库较去年同期 ")
    @TableField("\"zxsk_xs_last_year\"")
    private String zxskXsLastYear;

    /**
     * 中型水库有效蓄水
     */
    @ApiModelProperty(value = "中型水库有效蓄水 ")
    @TableField("\"zxsk_yxxs\"")
    private Double zxskYxxs;

    /**
     * 小型水库蓄水合计
     */
    @ApiModelProperty(value = "小型水库蓄水合计 ")
    @TableField("\"xxsk_xs_total\"")
    private Double xxskXsTotal;

    /**
     * 小型水库有效蓄水
     */
    @ApiModelProperty(value = "小型水库有效蓄水 ")
    @TableField("\"xxsk_yxxs\"")
    private Double xxskYxxs;

    /**
     * 统计时间
     */
    @ApiModelProperty(value = "统计时间 ")
    @TableField("\"statistic_time\"")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date statisticTime;


    /**
     * 创建人
     */
    @ApiModelProperty(value = "创建人")
    @TableField("\"create_user\"")
    private Long createUser;

    /**
     * 创建时间
     */
    @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_user\"")
    private Long updateUser;

    /**
     * 更新时间
     */
    @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/sjztods/entity/ZdxSkZh.java

File was renamed from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/ZdxSkZh.java
@@ -1,4 +1,4 @@
package cn.gistack.sm.sjztmd.entity;
package cn.gistack.sm.sjztods.entity;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/mapper/SkxsQkTjMapper.java

New file
@@ -0,0 +1,36 @@
package cn.gistack.sm.sjztods.mapper;

import cn.gistack.sm.sjztods.entity.SkxsQkTj;
import cn.gistack.sm.sjztods.vo.SkxsQkTjVO;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;

import java.util.List;


/**
 * SkxsQkTjMapper 接口
 *
 * @author zhongrj
 * @date 2023-10-19
 */
@DS("ztznwh")
public interface SkxsQkTjMapper extends BaseMapper<SkxsQkTj> {

    /**
     * 分页列表数据查询
     * @param page
     * @param skxsQkTj
     * @return
     */
    List<SkxsQkTjVO> selectSkxsQkTjPage(@Param("page") IPage<SkxsQkTjVO> page,@Param("skxsQkTj") SkxsQkTjVO skxsQkTj);

    /**
     * 按行政区统计
     * @param skxsQkTj
     * @return
     */
    Object getStatisticList(@Param("skxsQkTj") SkxsQkTjVO skxsQkTj);
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/mapper/SkxsQkTjMapper.xml

New file
@@ -0,0 +1,46 @@
<?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.sjztods.mapper.SkxsQkTjMapper">

    <!--分页列表数据查询-->
    <select id="selectSkxsQkTjPage" resultType="cn.gistack.sm.sjztods.vo.SkxsQkTjVO">
        select * from (
            select
            sqt.*,
            arb."res_reg_code" resRegCode,arb."eng_scal" engScal,
            case when b."ad_grad" = 4 THEN b."ad_name" ELSE NULL END AS townName,
            case when b."ad_grad" = 4 THEN b."ad_code" ELSE NULL END AS townCode,
            case when b."ad_grad" = 3 THEN b."ad_name"
                when c."ad_grad" = 3 THEN c."ad_name" END AS countyName,
            case when b."ad_grad" = 3 THEN b."ad_code"
                when c."ad_grad" = 3 THEN c."ad_code" END AS countyCode,
            case when b."ad_grad" = 2 THEN b."ad_code"
                when c."ad_grad" = 2 THEN c."ad_code"
                ELSE d."ad_code" END AS cityCode,
            case when b."ad_grad" = 2 THEN b."ad_name"
                when c."ad_grad" = 2 THEN c."ad_name"
                ELSE d."ad_name" END AS cityName
            from SJZT_ODS."skxs_qk_tj" sqt
            left join SJZT_MD."att_res_base" arb on arb."guid" = sqt."res_code"
            left join SJZT_MD."att_ad_base" b ON arb."interior_ad_guid" = b."guid"
            left join SJZT_MD."att_ad_base" c ON b."p_ad_code" = c."guid"
            left join SJZT_MD."att_ad_base" d ON c."p_ad_code" = d."guid"
            where 1=1
            <if test="skxsQkTj.statisticTime!=null">
                and date_format(sqt."statistic_time","%Y-%m-%d") = #{skxsQkTj.statisticTime}
            </if>
            <if test="skxsQkTj.resName!=null and skxsQkTj.resName!=''">
                and sqt."res_name" like concat('%',#{skxsQkTj.resName},'%')
            </if>
        ) x
        <if test="skxsQkTj.adCode!=null and skxsQkTj.adCode!=''">
            and (townCode = #{skxsQkTj.adCode} or countyCode = #{skxsQkTj.adCode} or cityCode = #{skxsQkTj.adCode})
        </if>
    </select>

    <!--按行政区统计-->
    <select id="getStatisticList" resultType="cn.gistack.sm.sjztods.vo.SkxsQkTjVO">

    </select>

</mapper>

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

File was renamed from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/ZdxSkZhMapper.java
@@ -1,6 +1,6 @@
package cn.gistack.sm.sjztmd.mapper;
package cn.gistack.sm.sjztods.mapper;

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


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

File was renamed from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/ZdxSkZhMapper.xml
@@ -1,6 +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 namespace="cn.gistack.sm.sjztods.mapper.ZdxSkZhMapper">


</mapper>

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/service/ISkxsQkTjService.java

New file
@@ -0,0 +1,36 @@
package cn.gistack.sm.sjztods.service;

import cn.gistack.sm.sjztods.entity.SkxsQkTj;
import cn.gistack.sm.sjztods.vo.SkxsQkTjVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;

/**
 * @ClassName ISkxsQkTjService
 * @author zhongrj
 * @date 2023-10-19
 */
public interface ISkxsQkTjService extends IService<SkxsQkTj> {

    /**
     * 上报
     * @param skxsQkTj
     * @return
     */
    boolean exportSkxsQkTj(SkxsQkTj skxsQkTj);

    /**
     * 分页列表数据查询
     * @param skxsQkTj
     * @param page
     * @return
     */
    Object selectSkxsQkTjPage(IPage<SkxsQkTjVO> page, SkxsQkTjVO skxsQkTj);

    /**
     * 按行政区统计
     * @param skxsQkTj
     * @return
     */
    Object getStatisticList(SkxsQkTjVO skxsQkTj);
}

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

File was renamed from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IZdxSkZhService.java
@@ -1,6 +1,6 @@
package cn.gistack.sm.sjztmd.service;
package cn.gistack.sm.sjztods.service;

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

/**

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/service/impl/SkxsQkTjServiceImpl.java

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

import cn.gistack.sm.sjztods.entity.SkxsQkTj;
import cn.gistack.sm.sjztods.mapper.SkxsQkTjMapper;
import cn.gistack.sm.sjztods.service.ISkxsQkTjService;
import cn.gistack.sm.sjztods.vo.SkxsQkTjVO;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.core.secure.utils.AuthUtil;
import org.springframework.stereotype.Service;

import java.util.Date;

/**
 * @ClassName SkxsQkTjServiceImpl
 * @author zhongrj
 * @date 2023-10-19
 */
@Service
@DS("ztznwh")
public class SkxsQkTjServiceImpl extends ServiceImpl<SkxsQkTjMapper, SkxsQkTj> implements ISkxsQkTjService {

    /**
     * 上报
     * @param skxsQkTj
     * @return
     */
    @Override
    @DS("ztznwh")
    public boolean exportSkxsQkTj(SkxsQkTj skxsQkTj) {
        // 查询库中是否包含当前日期，当前行政区的数据，如果有，则更新，没有则新增
        QueryWrapper<SkxsQkTj> wrapper = new QueryWrapper<>();
        wrapper.eq("\"statistic_time\"",skxsQkTj.getStatisticTime())
            .eq("\"res_code\"",skxsQkTj.getResCode());
        SkxsQkTj qkTj = baseMapper.selectOne(wrapper);
        // 设置更新人员，更新时间，来源信息
        skxsQkTj.setUpdateTime(new Date());
        skxsQkTj.setUpdateUser(AuthUtil.getUserId());
        skxsQkTj.setSysResource("sb");
        if (null!= qkTj){
            skxsQkTj.setGuid(qkTj.getGuid());
            // 更新并返回
            return updateById(skxsQkTj);
        }
        // 设置创建人员，时间信息
        skxsQkTj.setCreateUser(AuthUtil.getUserId());
        skxsQkTj.setCreateTime(new Date());
        // 保存并返回
        return save(skxsQkTj);
    }

    /**
     * 分页列表数据查询
     * @param skxsQkTj
     * @param page
     * @return
     */
    @Override
    public Object selectSkxsQkTjPage(IPage<SkxsQkTjVO> page, SkxsQkTjVO skxsQkTj) {
        if (null!=skxsQkTj.getIsExport()){
            // 导出，查询所有数据
            return baseMapper.selectSkxsQkTjPage(null,skxsQkTj);
        }
        return page.setRecords(baseMapper.selectSkxsQkTjPage(page,skxsQkTj));
    }

    /**
     * 按行政区统计
     * @param skxsQkTj
     * @return
     */
    @Override
    public Object getStatisticList(SkxsQkTjVO skxsQkTj) {
        return baseMapper.getStatisticList(skxsQkTj);
    }
}


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

File was renamed from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/ZdxSkZhServiceImpl.java
@@ -1,8 +1,8 @@
package cn.gistack.sm.sjztmd.service.impl;
package cn.gistack.sm.sjztods.service.impl;

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

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/vo/SkxsQkTjVO.java

New file
@@ -0,0 +1,43 @@
package cn.gistack.sm.sjztods.vo;

import cn.gistack.sm.sjztods.entity.SkxsQkTj;
import lombok.Data;

@Data
public class SkxsQkTjVO extends SkxsQkTj {

    /**
     * 按行政区划统计
     */
    private String adCode;

    /**
     * 水库规模
     */
    private String engScal;

    /**
     * 水库注册码
     */
    private String resRegCode;

    /**
     * 水库规模
     */
    private Integer isExport;

    /**
     * 市州名称
     */
    private String cityName;

    /**
     * 区县名称
     */
    private String countyName;

    /**
     * 乡镇名称
     */
    private String townName;
}