From 9c06f1650313b76c8e1c06ac35a18dce44664320 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 21 十一月 2024 15:05:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsLinkTypeController.java |   62 +++++++++++++++++++++++++++++--
 1 files changed, 58 insertions(+), 4 deletions(-)

diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsLinkTypeController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsLinkTypeController.java
index eededfb..1ae1fc1 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsLinkTypeController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsLinkTypeController.java
@@ -25,6 +25,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.IOException;
+import java.text.ParseException;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -91,7 +92,15 @@
         String attrId = baseQueryObject.getConditionMap().containsKey("name")?baseQueryObject.getConditionMap().get("name").replace("*",""):"";
         String attrName = baseQueryObject.getConditionMap().containsKey("label") ? baseQueryObject.getConditionMap().get("label").replace("*","") : "";
         OsLinkTypeVO linkTypeVO = linkTypeService.selectByOid(linkTypeOid);
-        List<OsLinkTypeAttributeVO> boAttrs = linkTypeService.listAttributeByLinkId(linkTypeVO.getId());
+        List<OsLinkTypeAttributeVO> boAttrs = null;
+        try {
+            boAttrs = linkTypeService.listAttributeByLinkId(linkTypeVO.getId());
+        }catch (Exception e){
+            e.printStackTrace();
+            String errorLog = "鏌ヨ閾炬帴绫诲瀷鍏宠仈鐨勫睘鎬ф椂鍑虹幇閿欒锛屽師鍥狅細"+VciBaseUtil.getExceptionMessage(e);
+            logger.error(errorLog);
+            throw new VciBaseException(errorLog);
+        }
         List<OsLinkTypeAttributeVO> attrList = boAttrs.stream().filter(s->{
             boolean usedFlag = true;
             if(StringUtils.isNotBlank(attrId) && !s.getId().contains(attrId)){
@@ -106,6 +115,27 @@
         dataGrid.setTotal(attrList.size());;
         dataGrid.setData(attrList);
         return dataGrid;
+    }
+
+    /**
+     * 鑾峰彇閾炬帴绫诲瀷鍖呭惈鐨勫睘鎬�
+     * @param name 閾炬帴绫诲瀷鐨勭紪鍙�
+     * @return 灞炴�х殑淇℃伅
+     */
+    @GetMapping("/getAllAttributeByLink")
+    public BaseResult<List<OsLinkTypeAttributeVO>> getAllAttributeByLink(String name){
+
+        try {
+            List<OsLinkTypeAttributeVO> osLinkTypeAttributeVOS = linkTypeService.getAllAttributeByLink(name);
+            return BaseResult.dataList(osLinkTypeAttributeVOS);
+        } catch (PLException e) {
+            BaseResult objectBaseResult = new BaseResult<>();
+            objectBaseResult.setCode(Integer.parseInt(e.code));
+            objectBaseResult.setMsg(Arrays.toString(e.messages));
+            return objectBaseResult;
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
     }
 
     /**
@@ -152,7 +182,7 @@
      * addFlag 鏄惁涓烘柊澧� true鏂板锛宖alse淇敼
      * @return 淇濆瓨缁撴灉
      */
-    @GetMapping("/addAndEditLink")
+    @PostMapping("/addAndEditLink")
     public BaseResult addAndEditLink(@RequestBody LinkType linkType, Boolean addFlag){
         try {
             return linkTypeService.addAndEditLink(linkType, addFlag);
@@ -250,11 +280,35 @@
      * @return
      */
     @PostMapping("/impData")
-    @VciUnCheckRight
-    public BaseResult impData(MultipartFile file){try {
+    public BaseResult impData(MultipartFile file){
+        try {
              return linkTypeService.impData(file);
         }catch (Throwable e) {
             throw new VciBaseException(VciBaseUtil.getExceptionMessage(e),new String[0],e);
         }
     }
+
+
+    /**
+     * 鑾峰彇璁剧疆鎺掑簭瀛楁鐨勬帓搴忓瓧娈�
+     * @param linkType 閾炬帴绫诲瀷鐨勭紪鍙�
+     * @param btmType 涓氬姟绫诲瀷鐨勭紪鍙�
+     * @param direction 姝�/鍙嶅悜
+     * @return 灞炴�х殑淇℃伅
+     */
+    @GetMapping("/getAllOrderbyAttributeByLink")
+    public BaseResult<List<String>> getAllOrderbyAttributeByLink(String linkType, String btmType, String direction){
+
+        try {
+            List<String> osLinkTypeAttributes = linkTypeService.getAllOrderbyAttributeByLink(linkType, btmType, direction);
+            return BaseResult.dataList(osLinkTypeAttributes);
+        } catch (PLException e) {
+            BaseResult objectBaseResult = new BaseResult<>();
+            objectBaseResult.setCode(Integer.parseInt(e.code));
+            objectBaseResult.setMsg(Arrays.toString(e.messages));
+            return objectBaseResult;
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
+    }
 }

--
Gitblit v1.9.3