From 5e1670170c18cf31b8491e0609bf0178c29227f2 Mon Sep 17 00:00:00 2001
From: 6c <420680616@qq.com>
Date: 星期五, 31 十月 2025 09:32:00 +0800
Subject: [PATCH] Merge branch 'dev' of http://nonxin.cn:8090/r/product/product-server-report/V2.0.0 into dev
---
src/main/java/com/product/server/report/controller/ReportDatasourceController.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/product/server/report/controller/ReportDatasourceController.java b/src/main/java/com/product/server/report/controller/ReportDatasourceController.java
index 02395f1..f0d0fac 100644
--- a/src/main/java/com/product/server/report/controller/ReportDatasourceController.java
+++ b/src/main/java/com/product/server/report/controller/ReportDatasourceController.java
@@ -30,11 +30,11 @@
@RestController
@RequestMapping("/api/report-datasource")
public class ReportDatasourceController extends AbstractBaseController{
-
+
@Autowired
ReportDatasourceService reportDatasourceService;
-
-
+
+
/**
* 鎶ヨ〃鏁版嵁婧愬垪琛�
* @param response
@@ -70,7 +70,7 @@
return this.error(ReportCode.REPORT_DATASOURCE_ERROR.getValue(), ReportCode.REPORT_DATASOURCE_ERROR.getText()+e.getMessage());
}
}
-
+
/**
* 鎶ヨ〃鏁版嵁婧愯鎯�
* @param response
@@ -110,7 +110,7 @@
return this.error(ReportCode.REPORT_DATASOURCE_ERROR.getValue(), ReportCode.REPORT_DATASOURCE_ERROR.getText()+e.getMessage());
}
}
-
+
/**
* 鏁版嵁婧�-淇濆瓨
* @param response
@@ -182,7 +182,7 @@
return this.error(ReportCode.REPORT_DATASOURCE_COPY_FAIL.getValue(), ReportCode.REPORT_DATASOURCE_COPY_FAIL.getText() + e.getMessage());
}
}
-
+
/**
* 鎶ヨ〃鏁版嵁婧愬垹闄�
* @param response
@@ -227,7 +227,7 @@
return this.error(ReportCode.REPORT_DATASOURCE_ERROR.getValue(), ReportCode.REPORT_DATASOURCE_ERROR.getText()+e.getMessage());
}
}
-
+
/**
* 鎶ヨ〃sql瑙ｆ瀽涓庨獙璇�
* @param response
@@ -257,13 +257,13 @@
return OK_List(dt);
} catch (BaseException e) {
e.printStackTrace();
- return this.error(e.getCode());
+ return this.error(e);
} catch (Exception e) {
e.printStackTrace();
- return this.error("", ReportCode.REPORT_DATASOURCE_ERROR.getText()+e.getMessage());
+ return this.error(ReportCode.REPORT_DATASOURCE_ERROR.getValue(), ReportCode.REPORT_DATASOURCE_ERROR.getText()+e.getMessage());
}
}
-
+
/**
* 鑾峰彇绯荤粺鍙傛暟
* @param response
@@ -323,7 +323,7 @@
return this.error("", e.getMessage());
}
}
-
+
/**
* 鎶ヨ〃鏁版嵁婧愯鎯�
* @param response
@@ -363,7 +363,7 @@
return this.error(ReportCode.REPORT_DATASOURCE_ERROR.getValue(), ReportCode.REPORT_DATASOURCE_ERROR.getText()+e.getMessage());
}
}
-
+
/**
* 鎶ヨ〃鏁版嵁婧愯鎯�
* @param response
--
Gitblit v1.9.2