pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrIntakeMapper.java
@@ -77,12 +77,31 @@ */ List<VoIntake> getIntakes(Map<?, ?> params); /** * 根据下级Id获取上一级地址Id * @param vaId 下一级Id * @return */ Long getSupperByVillageId(long vaId); /** * 根据取水口编号获取未删除的取水口数量 * @param intakeId * @return * @return address */ Integer getRecordCountOfIntake(@Param("intakeId") Long intakeId); /** * 根据村Id获取全部地址 * @param villageId 村Id * @return address 全部五级地址 */ String getAddressByVillageId(long villageId); /** * 根据区域Id获取区域等级 * @param regionId 区域Id * @return Level 区域等级 */ Integer getLevelByRegionId(long regionId); } pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
@@ -288,4 +288,25 @@ <select id="getRecordCountOfIntake" resultType="java.lang.Integer"> SELECT COUNT(*) AS recordCount FROM pr_intake WHERE deleted = 0 AND id = ${intakeId} </select> <!--根据村ID获取全部地址--> <select id="getAddressByVillageId" parameterType="_long" resultType="java.lang.String"> select CONCAT(dis_province.`name`, dis_city.`name`, dis_county.`name`, dis_town.`name`, dis_village.`name`) AS address from ba_district dis_village inner join ba_district dis_town on dis_village.supperId = dis_town.id inner join ba_district dis_county on dis_town.supperId = dis_county.id inner join ba_district dis_city on dis_county.supperId = dis_city.id inner join ba_district dis_province on dis_city.supperId = dis_province.id where dis_village.id = #{villageId,jdbcType=BIGINT} </select> <!--根据区域Id获取区域等级--> <select id="getLevelByRegionId" parameterType="_long" resultType="java.lang.Integer"> select region.level from ba_district region where region.id = #{regionId,jdbcType=BIGINT} </select> </mapper> pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java
@@ -10,6 +10,7 @@ import com.dy.pipIrrGlobal.pojoPr.PrIntake; import com.dy.pipIrrGlobal.voPr.VoIntake; import com.dy.pipIrrGlobal.voSe.VoActiveCard; import com.dy.pipIrrProject.result.ProjectResultCode; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.media.Content; @@ -70,7 +71,11 @@ public BaseResponse<QueryResultVo<List<PrIntake>>> all(){ try { QueryResultVo<List<PrIntake>> res = this.intakeSv.selectAll(); return BaseResponseUtils.buildSuccess(res); if(res == null) { return BaseResponseUtils.buildFail(ProjectResultCode.NO_INTAKES.getMessage()); }else { return BaseResponseUtils.buildSuccess(res); } } catch (Exception e) { log.error("查询取水口异常", e); return BaseResponseUtils.buildException(e.getMessage()) ; @@ -93,7 +98,11 @@ @GetMapping(path = "one/{id}") @SsoAop() public BaseResponse<PrIntake> one(@PathVariable("id") Long id){ return BaseResponseUtils.buildSuccess(this.intakeSv.selectById(id)); if(this.intakeSv.selectById(id) == null) { return BaseResponseUtils.buildFail(ProjectResultCode.NO_INTAKES.getMessage()); }else { return BaseResponseUtils.buildSuccess(this.intakeSv.selectById(id)); } } @Operation(summary = "获得一页取水口记录", description = "返回一页取水口数据") @@ -111,7 +120,7 @@ try { QueryResultVo<List<VoIntake>> res = intakeSv.getIntakes(vo); if(res == null) { return BaseResponseUtils.buildFail("查询失败"); return BaseResponseUtils.buildFail(ProjectResultCode.NO_INTAKES.getMessage()); } return BaseResponseUtils.buildSuccess(res); } catch (Exception e) { @@ -142,7 +151,7 @@ po.setOperateDt(operateTime); Integer rec = Optional.ofNullable(intakeSv.addIntake(po)).orElse(0); if(rec == 0) { return BaseResponseUtils.buildFail("数据库存储失败"); return BaseResponseUtils.buildFail(ProjectResultCode.ADD_INTAKE_FAIL.getMessage()); } return BaseResponseUtils.buildSuccess(true) ; } @@ -177,7 +186,7 @@ return BaseResponseUtils.buildException(e.getMessage()) ; } if(count <= 0){ return BaseResponseUtils.buildFail("数据库存储失败") ; return BaseResponseUtils.buildFail(ProjectResultCode.UPDATE_INTAKE.getMessage()) ; }else{ return BaseResponseUtils.buildSuccess(true) ; } @@ -200,8 +209,8 @@ @GetMapping(path = "delete/{id}") @SsoAop() public BaseResponse<Boolean> delete(@PathVariable("id") Long id){ if(id == null){ return BaseResponseUtils.buildFail("id不能为空") ; if(id == null ){ return BaseResponseUtils.buildFail(ProjectResultCode.PLEASE_INPUT_INTAKE_ID.getMessage()) ; } int count; try { @@ -211,7 +220,7 @@ return BaseResponseUtils.buildException(e.getMessage()) ; } if(count <= 0){ return BaseResponseUtils.buildFail("数据库存储失败") ; return BaseResponseUtils.buildFail(ProjectResultCode.DELETE_INTAKE_FAIL.getMessage()) ; }else{ return BaseResponseUtils.buildSuccess(true) ; } pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java
@@ -139,4 +139,22 @@ public Integer getRecordCountOfIntake(Long intakeId) { return prIntakeMapper.getRecordCountOfIntake(intakeId); } /** * 根据村Id获取全部地址 * @param villageId 村Id * @return address 全部五级地址 */ public String getAddressByVillageId(long villageId){ return prIntakeMapper.getAddressByVillageId(villageId); } /** * 根据区域Id获取区域等级 * @param regionId 区域Id * @return Level 区域等级 */ public int getLevelByRegionId(long regionId){ return prIntakeMapper.getLevelByRegionId(regionId); } } pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/result/ProjectResultCode.java
@@ -21,6 +21,11 @@ /** * 取水口 */ ADD_INTAKE_FAIL(20001, "取水口添加失败"), NO_INTAKES(20002, "没有符合条件的取水口数据"), UPDATE_INTAKE(20003, "修改取水口数据失败"), PLEASE_INPUT_INTAKE_ID(20004, "取水口编号不为空"), DELETE_INTAKE_FAIL(20005, "取水口删除失败"), /** * 控制器
