From 889842eb8b64a0b72c449ce23ff21e4e8c935cae Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 26 七月 2024 16:06:49 +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 | 70 +++++++++++++++++++++++++++++++++--
1 files changed, 66 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 9308325..8b592a7 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
@@ -1,20 +1,24 @@
package com.vci.web.controller;
+import com.vci.corba.common.PLException;
+import com.vci.corba.omd.ltm.LinkType;
import com.vci.pagemodel.OsBtmTypeAttributeVO;
import com.vci.pagemodel.OsLinkTypeAttributeVO;
import com.vci.pagemodel.OsLinkTypeVO;
+import com.vci.starter.web.annotation.controller.VciUnCheckRight;
import com.vci.starter.web.pagemodel.BaseQueryObject;
import com.vci.starter.web.pagemodel.BaseResult;
import com.vci.starter.web.pagemodel.DataGrid;
+import com.vci.starter.web.util.VciBaseUtil;
import com.vci.web.service.OsLinkTypeServiceI;
import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
@@ -34,6 +38,11 @@
private OsLinkTypeServiceI linkTypeService;
/**
+ * 鏃ュ織
+ */
+ private Logger logger = LoggerFactory.getLogger(getClass());
+
+ /**
* 閾炬帴绫诲瀷鐨勫垪琛�
* @param baseQueryObject 鏌ヨ瀵硅薄
* @return 閾炬帴绫诲瀷鐨勬樉绀哄璞�
@@ -41,6 +50,23 @@
@GetMapping("/gridLinkType")
public DataGrid<OsLinkTypeVO> gridLinkType(BaseQueryObject baseQueryObject){
return linkTypeService.gridLinkType(baseQueryObject);
+ }
+
+ /**
+ * 鏌ヨ鎵�鏈夌殑閾炬帴绫诲瀷鍚嶇О锛屽彲鐢ㄤ簬灞炴�ф睜鐨勮繛鎺ョ被鍨嬮�夋嫨鏃剁殑瀵硅瘽妗�
+ * @return 閾炬帴绫诲瀷鐨勬樉绀哄璞�
+ */
+ @GetMapping("/getAllLtName")
+ @VciUnCheckRight
+ public BaseResult getAllLtName(){
+ try {
+ return BaseResult.dataList(linkTypeService.getAllLtName());
+ }catch (Exception e) {
+ e.printStackTrace();
+ String exceptionMessage = "閾炬帴绫诲瀷鍒楄〃鏌ヨ鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + VciBaseUtil.getExceptionMessage(e);
+ logger.error(exceptionMessage);
+ return BaseResult.fail(exceptionMessage);
+ }
}
/**
@@ -93,4 +119,40 @@
return BaseResult.success();
}
}
+
+
+ /**
+ * 閾炬帴绫诲瀷鐨勫垪琛�
+ *
+ * @return 閾炬帴绫诲瀷鐨勬樉绀哄璞�
+ */
+ @GetMapping("/gridLink")
+ public BaseResult<List<LinkType>> gridLink(){
+ try {
+ return linkTypeService.gridLink();
+ } catch (PLException e) {
+ BaseResult objectBaseResult = new BaseResult<>();
+ objectBaseResult.setCode(Integer.parseInt(e.code));
+ objectBaseResult.setMsg(Arrays.toString(e.messages));
+ return objectBaseResult;
+ }
+ }
+
+ /**
+ * 閾炬帴绫诲瀷淇濆瓨
+ * linkType 閾炬帴绫诲瀷鐨勪繚瀛樺璞�
+ * addFlag 鏄惁涓烘柊澧� true鏂板锛宖alse淇敼
+ * @return 淇濆瓨缁撴灉
+ */
+ @GetMapping("/addAndEditLink")
+ public BaseResult addAndEditLink(@RequestBody LinkType linkType, Boolean addFlag){
+ try {
+ return linkTypeService.addAndEditLink(linkType, addFlag);
+ } catch (PLException e) {
+ BaseResult objectBaseResult = new BaseResult<>();
+ objectBaseResult.setCode(Integer.parseInt(e.code));
+ objectBaseResult.setMsg(Arrays.toString(e.messages));
+ return objectBaseResult;
+ }
+ }
}
--
Gitblit v1.9.3