From 112c70fa4ed8079b04acd11253d685268ed22d64 Mon Sep 17 00:00:00 2001
From: huangge1199 <huangge1199@hotmail.com>
Date: Fri, 8 Aug 2025 15:38:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=87=E6=A0=87=E5=BA=93=EF=BC=9A=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E4=B8=AD=E7=82=B9=E5=87=BB=E8=A1=8D=E7=94=9F=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E5=8E=9F=E5=AD=90=E6=8C=87=E6=A0=87=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ustb/sf/controller/TargetController.java  | 11 +++++++++++
 .../iet/ustb/sf/service/TargetService.java    |  2 ++
 .../sf/service/impl/TargetServiceImpl.java    | 19 ++++++++++++++++---
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/src/main/java/iet/ustb/sf/controller/TargetController.java b/src/main/java/iet/ustb/sf/controller/TargetController.java
index 62e8328..c1c2413 100644
--- a/src/main/java/iet/ustb/sf/controller/TargetController.java
+++ b/src/main/java/iet/ustb/sf/controller/TargetController.java
@@ -89,4 +89,15 @@ public class TargetController {
         targetService.deleteTargetById(params);
         return R.ok();
     }
+
+    @Operation(summary = "获取原子指标配置(指标库列表中点击衍生)")
+    @PostMapping("/getDetailExpandTarget")
+    public R<JSONObject> getDetailExpandTarget(@RequestBody JSONObject params) {
+        JSONObject result;
+        result = targetService.getDetailExpandTarget(params);
+        Page<?> list = tableColumnService.getDataByTableName(result.getJSONObject("list"));
+        result.put("list", list);
+        result.put("columnList", tableColumnService.getColumnsByTableName(result.getString("tableName")));
+        return R.ok(result);
+    }
 }
diff --git a/src/main/java/iet/ustb/sf/service/TargetService.java b/src/main/java/iet/ustb/sf/service/TargetService.java
index 56d0b20..d766d5a 100644
--- a/src/main/java/iet/ustb/sf/service/TargetService.java
+++ b/src/main/java/iet/ustb/sf/service/TargetService.java
@@ -28,4 +28,6 @@ public interface TargetService extends IService<Target> {
     Page<?> getDataByParam(JSONObject params);
 
     void deleteTargetById(JSONObject params);
+
+    JSONObject getDetailExpandTarget(JSONObject params);
 }
diff --git a/src/main/java/iet/ustb/sf/service/impl/TargetServiceImpl.java b/src/main/java/iet/ustb/sf/service/impl/TargetServiceImpl.java
index c867593..ed8a1a4 100644
--- a/src/main/java/iet/ustb/sf/service/impl/TargetServiceImpl.java
+++ b/src/main/java/iet/ustb/sf/service/impl/TargetServiceImpl.java
@@ -1,6 +1,5 @@
 package iet.ustb.sf.service.impl;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -19,7 +18,6 @@ import iet.ustb.sf.util.CheckUtils;
 import jakarta.annotation.Resource;
 import org.apache.commons.lang3.SerializationUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -60,7 +58,8 @@ public class TargetServiceImpl extends ServiceImpl<TargetMapper, Target>
 
     @Resource
     private RuleMapper ruleMapper;
-    @Autowired
+
+    @Resource
     private MonitorMapper monitorMapper;
 
     @Override
@@ -441,6 +440,20 @@ public class TargetServiceImpl extends ServiceImpl<TargetMapper, Target>
         monitorMapper.delete(new QueryWrapper<Monitor>().eq("target_id", id));
     }
 
+    @Override
+    public JSONObject getDetailExpandTarget(JSONObject params) {
+        Target target = params.getObject("target", Target.class);
+        String id = target.getId();
+        CheckUtils.checkEmpty(id, "指标ID");
+        target = targetMapper.selectById(id);
+        List<TargetOption> optionList = new ArrayList<>();
+        while (id != null) {
+            optionList.addAll(0, targetOptionMapper.selectList(new QueryWrapper<TargetOption>().eq("target_id", id)));
+            id = target.getParent();
+        }
+        return getDetailTarget(optionList, target);
+    }
+
     /**
      * 查看指标详情
      *