From 0c5c679dbb98f5fd30e0ebd88a73d145c15c6fe8 Mon Sep 17 00:00:00 2001
From: Rui_Li <877258667@qq.com>
Date: Wed, 22 Jan 2025 10:05:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Eapi=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/spring/ifs/bean/BaseSearchBean.java   | 31 ++++++++++++++-----
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/spring/ifs/bean/BaseSearchBean.java b/src/main/java/com/spring/ifs/bean/BaseSearchBean.java
index e6d0d7e1..7eff77dd 100644
--- a/src/main/java/com/spring/ifs/bean/BaseSearchBean.java
+++ b/src/main/java/com/spring/ifs/bean/BaseSearchBean.java
@@ -1,5 +1,6 @@
 package com.spring.ifs.bean;
 
+import com.alibaba.fastjson.JSON;
 import com.spring.ifs.api.BaseSearchApi;
 import com.spring.ifs.api.IfsServer;
 import com.spring.ifs.api.TechnicalClassApi;
@@ -17,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -174,16 +176,29 @@ public class BaseSearchBean {
      * @date 2025/1/17 13:20
      * @version 1.0
      */
-    public List<TechnicalAttribute> getTechnicalAttributesByCon(Server srv, BaseSearchData inData) throws APException {
+    public Map<String, String> getTechnicalAttributesByCon(Server srv, BaseSearchData inData) throws APException {
+        logger.info("技术等级查询开始："+JSON.toJSONString(inData));
+        //公共参数
+        Map<String, String> returnMap = new HashMap<>();
         String keyRef = inData.getKeyRef();
         String luName = inData.getLuName() ;
-        //查询主表对应的信息
-        Map<String, String> resultMap = TechnicalClassApi.getTechnicalClass(srv, luName, keyRef);
-        //获取关联键
-        String technicalSpecNo = resultMap.get("TECHNICAL_SPEC_NO");
-        //查询技术等级属性的列表数据
-        List<TechnicalAttribute> resultList = BaseSearchApi.getTechnicalAttributesByCon(srv, technicalSpecNo);
-        return resultList;
+        try {
+            //查询主表对应的信息
+            Map<String, String> resultMap = TechnicalClassApi.getTechnicalClass(srv, luName, keyRef);
+            //获取关联键
+            String technicalSpecNo = resultMap.get("TECHNICAL_SPEC_NO");
+            //查询技术等级属性的列表数据
+            List<TechnicalAttribute> resultList = BaseSearchApi.getTechnicalAttributesByCon(srv, technicalSpecNo);
+            returnMap.put("resultCode", "200");
+            returnMap.put("obj", JSON.toJSONString(resultList));
+        } catch(APException e){
+                returnMap.put("resultCode", "400");
+                returnMap.put("resultMsg", e.getMessage());
+                logger.info("异常信息:"+e.getMessage());
+        }
+        logger.info("技术等级查询结束："+JSON.toJSONString(inData));
+        //返回参数
+        return returnMap;
     }
 
 }