From 88c967d9af10a4557a037c47b6e8e4cd75f23932 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期二, 09 一月 2024 15:23:04 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java | 25 ++++++++----
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java | 18 +++++++++
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/result/ProjectResultCode.java | 5 ++
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrIntakeMapper.java | 21 ++++++++++
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml | 21 ++++++++++
5 files changed, 81 insertions(+), 9 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrIntakeMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrIntakeMapper.java
index 753a980..c1cb703 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrIntakeMapper.java
+++ b/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 涓嬩竴绾d
+ * @return
+ */
Long getSupperByVillageId(long vaId);
/**
* 鏍规嵁鍙栨按鍙ｇ紪鍙疯幏鍙栨湭鍒犻櫎鐨勫彇姘村彛鏁伴噺
* @param intakeId
- * @return
+ * @return address
*/
Integer getRecordCountOfIntake(@Param("intakeId") Long intakeId);
+
+ /**
+ * 鏍规嵁鏉慖d鑾峰彇鍏ㄩ儴鍦板潃
+ * @param villageId 鏉慖d
+ * @return address 鍏ㄩ儴浜旂骇鍦板潃
+ */
+ String getAddressByVillageId(long villageId);
+
+ /**
+ * 鏍规嵁鍖哄煙Id鑾峰彇鍖哄煙绛夌骇
+ * @param regionId 鍖哄煙Id
+ * @return Level 鍖哄煙绛夌骇
+ */
+ Integer getLevelByRegionId(long regionId);
}
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
index ef9ca39..bc529ac 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
+++ b/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>
+
+ <!--鏍规嵁鏉慖D鑾峰彇鍏ㄩ儴鍦板潃-->
+ <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>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java
index fd25e3e..fa5f55e 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java
+++ b/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) ;
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java
index e8cfeca..56e50c2 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java
+++ b/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);
}
+
+ /**
+ * 鏍规嵁鏉慖d鑾峰彇鍏ㄩ儴鍦板潃
+ * @param villageId 鏉慖d
+ * @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);
+ }
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/result/ProjectResultCode.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/result/ProjectResultCode.java
index 2de0a20..d56066c 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/result/ProjectResultCode.java
+++ b/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, "鍙栨按鍙ｅ垹闄ゅけ璐�"),
/**
* 鎺у埗鍣�
--
Gitblit v1.8.0