田间灌溉项目管理 批量删除项目接口
查询一个项目接口
分页查询项目接口
5个文件已修改
2个文件已添加
251 ■■■■■ 已修改文件
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoIr/IrProjectMapper.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoProject.java 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrProjectMapper.xml 51 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/project/ProjectCtrl.java 71 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/project/ProjectSv.java 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/project/QueryVo.java 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/result/IrrigateResultCode.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoIr/IrProjectMapper.java
@@ -4,8 +4,13 @@
import com.dy.pipIrrGlobal.pojoIr.IrProject;
import com.dy.pipIrrGlobal.pojoPr.PrController;
import com.dy.pipIrrGlobal.pojoPr.PrIntake;
import com.dy.pipIrrGlobal.voIr.VoProject;
import com.dy.pipIrrGlobal.voPr.VoIntake;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
/**
 * @author :WuZeYu
@@ -21,10 +26,11 @@
    int deleteLogicById(Long id);
//改
    int updateByPrimaryKeySelective(IrProject record);
//查一个
    IrProject selectById(Long id);
    /**
     * 修改项目状态
     * @param id
     * @return
     */
    int updateProjectState(IrProject record);
@@ -35,4 +41,18 @@
     * @return
     */
    Long getSupperByVillageId(long vaId);
    /**
     * 根据指定条件获取取水口记录数
     * @param params
     * @return
     */
    Long getRecordCount(Map<?, ?> params);
    /**
     * 根据指定条件获取取水口记录
     * @param params
     * @return
     */
    List<VoProject> getProjects(Map<?, ?> params);
}
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoProject.java
New file
@@ -0,0 +1,46 @@
package com.dy.pipIrrGlobal.voIr;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.dy.common.po.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
/**
 * @author :WuZeYu
 * @Date :2024/5/15  21:02
 * @LastEditTime :2024/5/15  21:02
 * @Description
 */
@Data
@Schema(title = "项目视图对象")
public class VoProject  implements BaseEntity {
    @Schema(title = "项目ID")
    @ExcelProperty("项目ID")
    @ColumnWidth(15)
    private String projectId;
    @Schema(title = "项目名称")
    @ExcelProperty("项目名称")
    @ColumnWidth(15)
    private String projectName;
    @Schema(title = "项目状态")
    @ExcelProperty("项目状态")
    @ColumnWidth(2)
    private String projectState;
    @Schema(title = "项目地址")
    @ExcelProperty("项目地址")
    @ColumnWidth(25)
    private String address;
    @Schema(title = "项目备注")
    @ExcelProperty("项目备注")
    @ColumnWidth(250)
    private String remarks;
}
pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrProjectMapper.xml
@@ -17,6 +17,11 @@
        <result column="operate_time" jdbcType="TIMESTAMP" property="operateDt" />
        <result column="deleted" jdbcType="TINYINT" property="deleted" />
    </resultMap>
    <sql id="Base_Column_List">
        <!--@mbg.generated-->
        id, project_name, province_id, city_id, county_id, town_id, `village_id`, project_state, remarks, `operator`,
        operate_time, deleted
    </sql>
    <!--添加-->
    <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoIr.IrProject">
        <!--@mbg.generated-->
@@ -115,7 +120,7 @@
        set deleted = 1
        where id = #{id,jdbcType=BIGINT}
    </delete>
    <!--修改信息-->
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoIr.IrProject">
        update ir_project
        <set>
@@ -155,7 +160,7 @@
        </set>
        where id = #{id,jdbcType=BIGINT}
    </update>
    <!--修改状态-->
    <update id="updateProjectState">
        update ir_project
        set project_state = #{projectState,jdbcType=TINYINT},
@@ -163,4 +168,46 @@
            operate_time = #{operateDt,jdbcType=TIMESTAMP}
        where id = #{id,jdbcType=BIGINT}
    </update>
    <!--查询一个信息-->
    <select id="selectById" resultMap="BaseResultMap">
        select     <include refid="Base_Column_List" /> from ir_project where id = #{id,jdbcType=BIGINT} and deleted = 0
    </select>
    <!--分页查询数量-->
    <select id="getRecordCount" resultType="java.lang.Long">
        SELECT COUNT(*) AS recordCount
        FROM ir_project pro
        <where>
            pro.deleted = 0
            <if test="projectName != null and projectName != ''">
                AND pro.project_name LIKE CONCAT('%', #{projectName}, '%')
            </if>
            <if test = "projectState != null and projectState != ''">
                AND pro.project_state = #{projectState}
            </if>
        </where>
    </select>
    <!--分页查询数据-->
    <select id="getProjects" resultType="com.dy.pipIrrGlobal.voIr.VoProject">
        SELECT
        CAST(pro.id AS char)AS projectId,
        pro.project_name  AS  projectName,
        pro.project_state  AS  projectState,
        CONCAT(province.`name`,city.`name`,country.`name`, town.`name`, village.`name`) AS address,
        pro.remarks
        FROM ir_project pro
        LEFT JOIN ba_district province ON pro.province_id = province.id
        LEFT JOIN ba_district city ON pro.city_id = city.id
        LEFT JOIN ba_district country ON pro.county_id = country.id
        LEFT JOIN ba_district town ON pro.town_id = town.id
        LEFT JOIN ba_district village ON pro.village_id = village.id
        <where>
            pro.deleted = 0
            <if test="projectName != null and projectName != ''">
                AND pro.project_name LIKE CONCAT('%', #{projectName}, '%')
            </if>
            <if test = "projectState != null and projectState != ''">
                AND pro.project_state = #{projectState}
            </if>
        </where>
    </select>
</mapper>
pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/project/ProjectCtrl.java
@@ -3,8 +3,13 @@
import com.dy.common.aop.SsoAop;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.common.webUtil.ResultCodeMsg;
import com.dy.pipIrrGlobal.pojoIr.IrProject;
import com.dy.pipIrrGlobal.pojoPr.PrIntake;
import com.dy.pipIrrGlobal.voIr.VoProject;
import com.dy.pipIrrGlobal.voPr.VoIntake;
import com.dy.pipIrrGlobal.voSe.VoActiveCard;
import com.dy.pipIrrIrrigate.result.IrrigateResultCode;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Content;
@@ -19,10 +24,7 @@
import org.springframework.http.MediaType;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.BindingResult;
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;
import org.springframework.web.bind.annotation.*;
import java.lang.reflect.Array;
import java.util.*;
@@ -118,12 +120,13 @@
    @PostMapping(path = "delete_batch", consumes = MediaType.APPLICATION_JSON_VALUE)
    @Transactional(rollbackFor = Exception.class)
    @SsoAop()
    public BaseResponse<Boolean> delete_batch(@RequestBody List<Long> projectIds) {
    public BaseResponse<Boolean> delete_batch(@RequestBody Map<String,List> projectIds) {
        if (projectIds == null || projectIds.size() <= 0) {
            BaseResponseUtils.buildFail(IrrigateResultCode.PLEASE_INPUT_PROJECT_ID.getMessage());
        }
        for (int i = 0; i < projectIds.size(); i++) {
            Long projectId = projectIds.get(i);
        List ids = projectIds.get("projectIds");
        for (int i = 0; i < ids.size(); i++) {
            long projectId = Long.parseLong(ids.get(i).toString());
            try {
                Integer rows = projectSv.deleteProject(projectId);
                if (rows == 0) {
@@ -201,4 +204,58 @@
        }
        return BaseResponseUtils.buildSuccess(true);
    }
    /**
     * 获取一个项目数据
     *
     * @return 获取一个项目数据
     */
    @Operation(summary = "获取一个项目数据", description = "获取一个项目数据")
    @ApiResponses(value = {
            @ApiResponse(
                    responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
                    description = "获取一个项目数据(BaseResponse.content:{})",
                    content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
                            schema = @Schema(implementation = IrProject.class))}
            )
    })
    @GetMapping(path = "one")
    @SsoAop()
    public BaseResponse<IrProject> one(@RequestParam Long id) {
        IrProject irProject = this.projectSv.selectById(id);
        if (irProject == null) {
            return BaseResponseUtils.buildFail(IrrigateResultCode.NO_PROJECT.getMessage());
        } else {
            return BaseResponseUtils.buildSuccess(irProject);
        }
    }
    /**
     * 分页查询
     * @param vo
     * @return
     */
    @Operation(summary = "获得一页项目记录", description = "获得一页项目记录")
    @ApiResponses(value = {
            @ApiResponse(
                    responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
                    description = "获得一页项目记录(BaseResponse.content:QueryResultVo[{}])",
                    content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
                            schema = @Schema(implementation = VoActiveCard.class))}
            )
    })
    @GetMapping(path = "some")
    @SsoAop()
    public BaseResponse<QueryResultVo<List<VoProject>>> getIntakes(QueryVo vo) {
        try {
            QueryResultVo<List<VoProject>> res = projectSv.getProjects(vo);
            if (res == null) {
                return BaseResponseUtils.buildFail(IrrigateResultCode.NO_PROJECT.getMessage());
            }
            return BaseResponseUtils.buildSuccess(res);
        } catch (Exception e) {
            log.error("获取项目记录异常", e);
            return BaseResponseUtils.buildException(e.getMessage());
        }
    }
}
pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/project/ProjectSv.java
@@ -1,13 +1,19 @@
package com.dy.pipIrrIrrigate.project;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.daoIr.IrProjectMapper;
import com.dy.pipIrrGlobal.pojoIr.IrProject;
import com.dy.pipIrrGlobal.voIr.VoProject;
import com.dy.pipIrrGlobal.voPr.VoIntake;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
import java.util.Map;
/**
 * @author :WuZeYu
@@ -113,4 +119,31 @@
        }
        return 1;
    }
    /**
     * 获取一个项目数据
     * @param id
     * @return
     */
    public IrProject selectById(Long id){
        IrProject irProject = irProjectMapper.selectById(id);
        return irProject;
    }
    /**
     * 分页查询项目
     * @param queryVo
     * @return
     */
    public QueryResultVo<List<VoProject>> getProjects(QueryVo queryVo){
        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
        Long itemTotal = irProjectMapper.getRecordCount(params);
        QueryResultVo<List<VoProject>> rsVo = new QueryResultVo<>();
        rsVo.pageSize = queryVo.pageSize;
        rsVo.pageCurr = queryVo.pageCurr;
        rsVo.calculateAndSet(itemTotal, params);
        rsVo.obj = irProjectMapper.getProjects(params);
        return rsVo;
    }
}
pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/project/QueryVo.java
New file
@@ -0,0 +1,26 @@
package com.dy.pipIrrIrrigate.project;
import com.dy.common.webUtil.QueryConditionVo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
/**
 * @author :WuZeYu
 * @Date :2024/5/15  21:11
 * @LastEditTime :2024/5/15  21:11
 * @Description
 */
@Data
@EqualsAndHashCode(callSuper = false)
@ToString(callSuper = true)
@NoArgsConstructor
@AllArgsConstructor
@Builder
@Schema(name = "项目查询条件")
public class QueryVo extends QueryConditionVo {
    @Schema(description = "项目名称")
    public String projectName;
    @Schema(description = "项目状态")
    public String projectState;
}
pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/result/IrrigateResultCode.java
@@ -20,7 +20,7 @@
    PLEASE_INPUT_PROJECT_ID(10002, "请输入项目ID"),
    DELETE_PROJECT_FAIL(10003, "项目删除失败"),
    UPDATE_PROJECT_FAIL(10004, "项目修改失败"),
    NO_DIVIDES(10001, "无符合条件的分水房记录");
    NO_PROJECT(10005, "无符合条件的项目记录");
    private final Integer code;