优化接口 获得全部取水口 重构返回结构，增加片区名称字段、增加县镇村名称字段

wuzeyu

2024-12-16 4c6fcde6404479dc00e14733c37efe4fd3799cf5

优化接口 获得全部取水口  重构返回结构，增加片区名称字段、增加县镇村名称字段

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrIntakeMapper.java

@@ -2,6 +2,7 @@


import com.dy.pipIrrGlobal.pojoPr.PrIntake;
import com.dy.pipIrrGlobal.voPr.VoAllIntake;
import com.dy.pipIrrGlobal.voPr.VoIntake;
import com.dy.pipIrrGlobal.voPr.VoOnLineIntake;
import org.apache.ibatis.annotations.Mapper;
@@ -30,7 +31,7 @@
     * 得到全部实体
     * @return 全部实体
     * */
    List<PrIntake> selectAll();
    List<VoAllIntake> selectAll();

    /**
     * 逻辑删除

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoAllIntake.java

New file
@@ -0,0 +1,98 @@
package com.dy.pipIrrGlobal.voPr;

import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
import com.dy.common.po.BaseEntity;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import lombok.Data;

import java.util.Date;

/**
 * @author :WuZeYu
 * @Date :2024/12/16  9:58
 * @LastEditTime :2024/12/16  9:58
 * @Description
 */
@Data
@JsonPropertyOrder({ "id", "countyId", "townId", "villageId", "divideId", "blockId", "name", "lng", "lat", "remarks", "operator", "operateDt", "blockName", "address"})
public class VoAllIntake implements BaseEntity {
    private static final long serialVersionUID = 202412161003001L;

    /**
     * 主键
     */
    @JSONField(serializeUsing = ObjectWriterImplToString.class)
    private Long id;

    /**
     * 所在县
     */
    @JSONField(serializeUsing = ObjectWriterImplToString.class)
    private Long countyId;

    /**
     * 所在镇
     */
    @JSONField(serializeUsing = ObjectWriterImplToString.class)
    private Long townId;

    /**
     * 所在村
     */
    @JSONField(serializeUsing = ObjectWriterImplToString.class)
    private Long villageId;

    /**
     * 所在分水口
     */
    @JSONField(serializeUsing = ObjectWriterImplToString.class)
    private Long divideId;

    /**
     * 所在片区
     */
    @JSONField(serializeUsing = ObjectWriterImplToString.class)
    private Long blockId;

    /**
     * 取水口名称
     */
    private String name;

    /**
     * 经度
     */
    private Double lng;

    /**
     * 纬度
     */
    private Double lat;

    /**
     * 备注信息
     */
    private String remarks;

    /**
     * 操作人ID
     */
    @JSONField(serializeUsing = ObjectWriterImplToString.class)
    private Long operator;

    /**
     * 操作时间
     */
    private Date operateDt;

    /**
     * 片区名称
     */
    private String blockName;

    /**
     * 地址
     */
    private String address;
}

 pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml

@@ -50,12 +50,33 @@
        where id = #{id,jdbcType=BIGINT}
    </delete>

    <select id="selectAll" resultMap="BaseResultMap">
    <select id="selectAll"  resultType="com.dy.pipIrrGlobal.voPr.VoAllIntake">
        <!--@mbg.generated-->
        select
        <include refid="Base_Column_List"/>
        from pr_intake
        where deleted != 1
        ge.id,
        ge.countyId,
        ge.townId,
        ge.villageId,
        ge.divideId,
        ge.blockId,
        ge.`name`,
        ge.lng,
        ge.lat,
        ge.remarks,
        ge.`operator`,
        ge.operateDt,
        blo.`name`                                          AS blockName,
        CONCAT(country.`name`, town.`name`, village.`name`)              AS address
        FROM pr_intake ge
        INNER JOIN pr_divide divi ON ge.divideId = divi.id
        INNER JOIN ba_block blo ON divi.blockId = blo.id
        LEFT JOIN ba_district country ON ge.countyId = country.id
        LEFT JOIN ba_district town ON ge.townId = town.id
        LEFT JOIN ba_district village ON ge.villageId = village.id
        where
        ge.deleted = 0
        AND divi.deleted = 0
        AND blo.deleted = 0
    </select>
    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
        <!--@mbg.generated-->

 pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java

@@ -9,6 +9,7 @@
import com.dy.pipIrrGlobal.excel.CellWriteHandler;
import com.dy.pipIrrGlobal.excel.ExcelUtil;
import com.dy.pipIrrGlobal.pojoPr.PrIntake;
import com.dy.pipIrrGlobal.voPr.VoAllIntake;
import com.dy.pipIrrGlobal.voPr.VoIntake;
import com.dy.pipIrrGlobal.voPr.VoOnLineIntake;
import com.dy.pipIrrGlobal.voSe.VoActiveCard;
@@ -75,9 +76,9 @@
    })
    @GetMapping(path = "all")
    @SsoAop()
    public BaseResponse<QueryResultVo<List<PrIntake>>> all() {
    public BaseResponse<QueryResultVo<List<VoAllIntake>>> all() {
        try {
            QueryResultVo<List<PrIntake>> res = this.intakeSv.selectAll();
            QueryResultVo<List<VoAllIntake>> res = this.intakeSv.selectAll();
            if (res == null) {
                return BaseResponseUtils.buildErrorMsg(ProjectResultCode.NO_INTAKES.getMessage());
            } else {

 pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java

@@ -12,6 +12,7 @@
import com.dy.pipIrrGlobal.daoPr.PrDivideMapper;
import com.dy.pipIrrGlobal.daoPr.PrIntakeMapper;
import com.dy.pipIrrGlobal.pojoPr.PrIntake;
import com.dy.pipIrrGlobal.voPr.VoAllIntake;
import com.dy.pipIrrGlobal.voPr.VoIntake;
import com.dy.pipIrrGlobal.voPr.VoOnLineIntake;
import lombok.extern.slf4j.Slf4j;
@@ -164,8 +165,8 @@
     *
     * @return 所有取水口集合
     */
    public QueryResultVo<List<PrIntake>> selectAll() {
        QueryResultVo<List<PrIntake>> rsVo = new QueryResultVo<>();
    public QueryResultVo<List<VoAllIntake>> selectAll() {
        QueryResultVo<List<VoAllIntake>> rsVo = new QueryResultVo<>();
        rsVo.obj = this.prIntakeMapper.selectAll();
        return rsVo;
    }