From f61a50e37c9d69d03c314fd74c5a8917ea25754f Mon Sep 17 00:00:00 2001
From: wany <13995595726@qq.com>
Date: Tue, 16 Jul 2024 17:03:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=8D=B1=E9=99=A9=E5=8C=BA?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9F=A5=E8=AF=A2=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/xyt/controller/IaCDanadController.java     |  4 ++--
 .../com/gunshi/project/xyt/mapper/IaCDanadMapper.java  | 10 +++++++++-
 .../gunshi/project/xyt/service/IaCDanadService.java    |  4 ++++
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/gunshi/project/xyt/controller/IaCDanadController.java b/src/main/java/com/gunshi/project/xyt/controller/IaCDanadController.java
index 39d483f..3b768d0 100644
--- a/src/main/java/com/gunshi/project/xyt/controller/IaCDanadController.java
+++ b/src/main/java/com/gunshi/project/xyt/controller/IaCDanadController.java
@@ -51,8 +51,8 @@ public class IaCDanadController {
 
     @Operation(summary = "详情")
     @GetMapping("/detail/{id}")
-    public R<IaCDanad> detail(@Schema(name = "id") @PathVariable("id") String id) {
-        return R.ok(service.getById(id));
+    public R<HomeIaCDanadVo> detail(@Schema(name = "id") @PathVariable("id") String id) {
+        return R.ok(service.detail(id));
     }
 
     @Operation(summary = "列表")
diff --git a/src/main/java/com/gunshi/project/xyt/mapper/IaCDanadMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/IaCDanadMapper.java
index b4e6bab..3135272 100644
--- a/src/main/java/com/gunshi/project/xyt/mapper/IaCDanadMapper.java
+++ b/src/main/java/com/gunshi/project/xyt/mapper/IaCDanadMapper.java
@@ -1,10 +1,10 @@
 package com.gunshi.project.xyt.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gunshi.project.xyt.entity.vo.HomeIaCBsnssinfoVo;
 import com.gunshi.project.xyt.entity.vo.HomeIaCDanadVo;
 import com.gunshi.project.xyt.model.IaCDanad;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
@@ -26,4 +26,12 @@ public interface IaCDanadMapper extends BaseMapper<IaCDanad> {
             """)
     List<HomeIaCDanadVo> getDetailsAndMonitoringDataLis();
 
+    @Select("""
+            <script>
+            SELECT st.*,r.adnm FROM ia_c_danad st
+            LEFT JOIN st_addvcd_d r ON st.adcd = r.adcd
+            WHERE st.dand = #{id}
+            </script>
+            """)
+    HomeIaCDanadVo detail(@Param("id") String id);
 }
\ No newline at end of file
diff --git a/src/main/java/com/gunshi/project/xyt/service/IaCDanadService.java b/src/main/java/com/gunshi/project/xyt/service/IaCDanadService.java
index 526ba4f..57adae8 100644
--- a/src/main/java/com/gunshi/project/xyt/service/IaCDanadService.java
+++ b/src/main/java/com/gunshi/project/xyt/service/IaCDanadService.java
@@ -24,6 +24,10 @@ public class IaCDanadService extends ServiceImpl<IaCDanadMapper, IaCDanad>
     public List<HomeIaCDanadVo> getDetailsAndMonitoringDataLis() {
         return baseMapper.getDetailsAndMonitoringDataLis();
     }
+
+    public HomeIaCDanadVo detail(String id) {
+        return baseMapper.detail(id);
+    }
 }