From c86748a2c254ea22ac8f57d7984cc4743efaaed7 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 26 七月 2024 16:53:07 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/PLTWEB
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebEnumController.java | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebEnumController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebEnumController.java
index d9a5837..a8048f4 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebEnumController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebEnumController.java
@@ -29,6 +29,7 @@
import java.io.IOException;
import java.util.Date;
import java.util.List;
+import java.util.Map;
/**
@@ -58,7 +59,6 @@
* @return 鏋氫妇鐨勪笅鎷夊��
*/
@VciBusinessLog(notStore=true,operateName="鑾峰彇鏋氫妇")
- @VciUnCheckRight
@GetMapping("/getEnum")
public BaseResult<List<KeyValue>> getEnum(String comboxKey){
return BaseResult.success(enumService.getEnum(comboxKey));
@@ -96,6 +96,24 @@
@GetMapping("/getDataEnum")
public BaseResult<List<KeyValue>> getDataEnum(String oid,String btmname){
return BaseResult.success(enumService.getDataEnum(oid,btmname));
+ }
+
+ /**
+ * 鏍规嵁鏋氫妇绫诲瀷鑾峰彇鏋氫妇
+ * @param enumType 鏌ヨ鏉′欢name
+ * @return 鍒楄〃鐨勫唴瀹�
+ */
+ @GetMapping( "/getEnumMapByType")
+ @VciBusinessLog(operateName = "鏋氫妇鍒楄〃")
+ public BaseResult getEnumMapByType(String enumType) {
+ try {
+ return BaseResult.dataList(enumService.getEnumMapByType(enumType));
+ }catch (Exception e) {
+ e.printStackTrace();
+ String exceptionMessage = "鏋氫妇绠＄悊鍒楄〃鏌ヨ鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + VciBaseUtil.getExceptionMessage(e);
+ logger.error(exceptionMessage);
+ return BaseResult.fail(exceptionMessage);
+ }
}
/**
@@ -196,7 +214,6 @@
*/
@GetMapping( "/exportEnumTypes")
@VciBusinessLog(operateName = "瀵煎嚭鏋氫妇绫诲瀷")
- @VciUnCheckRight
public void exportEnumTypes(String exportFileName,String enumNames, HttpServletResponse response){
try {
String excelPath = enumService.exportEnumTypes(exportFileName,enumNames);
@@ -220,7 +237,6 @@
*/
@GetMapping( "/downloadEnumTemplate")
@VciBusinessLog(operateName = "瀵煎嚭鏋氫妇绫诲瀷")
- @VciUnCheckRight
public void downloadEnumTemplate(String exportFileName, HttpServletResponse response){
try {
String excelPath = enumService.downloadEnumTemplate(exportFileName);
@@ -254,7 +270,7 @@
return BaseResult.fail(FrameWorkLangCodeConstant.IMPORT_FAIL, new String[]{"鏃犲鍏ョ殑鏂囦欢"});
}
}catch (Throwable e) {
- throw new VciBaseException(e.getMessage(),new String[0],e);
+ throw new VciBaseException(VciBaseUtil.getExceptionMessage(e),new String[0],e);
}finally {
file1.delete();
}
--
Gitblit v1.9.3