From 6dd90a95c5dff764f7ea6e8f61a36fc0e3bf6aa3 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期一, 16 十二月 2024 17:20:10 +0800
Subject: [PATCH] 优化接口 获得一个取水口接口 优化传参方式、增加片区名称和地址两个字段
---
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java | 4 ++--
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java | 2 +-
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrIntakeMapper.java | 2 +-
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml | 30 +++++++++++++++++++++++++-----
4 files changed, 29 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 722b709..d50e077 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
@@ -25,7 +25,7 @@
* @param id primary key
* @return object by primary key
*/
- PrIntake selectByPrimaryKey(Long id);
+ VoAllIntake selectByPrimaryKey(Long id);
/**
* 寰楀埌鍏ㄩ儴瀹炰綋
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 8936453..5873b07 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
@@ -34,13 +34,33 @@
operateDt,
deleted
</sql>
- <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+ <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultType="com.dy.pipIrrGlobal.voPr.VoAllIntake">
<!--@mbg.generated-->
select
- <include refid="Base_Column_List"/>
- from pr_intake
- where id = #{id,jdbcType=BIGINT}
- and deleted = 0
+ 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.id = #{id,jdbcType=BIGINT}
+ AND ge.deleted = 0
+ AND divi.deleted = 0
+ AND blo.deleted = 0
</select>
<delete id="deleteLogicById" parameterType="java.lang.Long">
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 cb60cfe..6bd5789 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
@@ -104,9 +104,9 @@
schema = @Schema(implementation = PrIntake.class))}
)
})
- @GetMapping(path = "one/{id}")
+ @GetMapping(path = "one")
@SsoAop()
- public BaseResponse<PrIntake> one(@PathVariable("id") Long id) {
+ public BaseResponse<VoAllIntake> one(@RequestParam("id") Long id) {
if (this.intakeSv.selectById(id) == null) {
return BaseResponseUtils.buildErrorMsg(ProjectResultCode.NO_INTAKES.getMessage());
} else {
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 7bbc8ea..97843f9 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
@@ -177,7 +177,7 @@
* @param id 鍙栨按鍙D
* @return 鍙栨按鍙ｅ疄浣�
*/
- public PrIntake selectById(Long id) {
+ public VoAllIntake selectById(Long id) {
return this.prIntakeMapper.selectByPrimaryKey(id);
}
--
Gitblit v1.8.0