From a5b39478de866b68d0e19ac8aeebb4d0cccb18a2 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 29 Mar 2022 08:47:57 +0800
Subject: [PATCH] 新增 ureport spring bean连接方式获取数据
---
Jenkinsfile | 14 +++++++-------
src/main/java/org/springblade/modules/ureport/controller/UreportController.java | 36 ++++++++++++++++++++++++++++++++++++
2 files changed, 43 insertions(+), 7 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index ff13d7c..b89e867 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -51,15 +51,15 @@
}
stage('deploy to dev') {
- agent none
- steps {
- container('maven') {
- withCredentials([kubeconfigContent(credentialsId : 'kube-zhba' ,variable : 'KUBE_VAR' ,)]) {
- sh 'kubectl apply -f deploy/deploy.yml'
- }
- }
+ agent none
+ steps {
+ container('maven') {
+ withCredentials([kubeconfigContent(credentialsId : 'kube-zhba' ,variable : 'KUBE_VAR' ,)]) {
+ sh 'kubectl apply -f deploy/deploy.yml'
}
}
+ }
+ }
//部署到 生成环境
stage('deploy to production') {
diff --git a/src/main/java/org/springblade/modules/ureport/controller/UreportController.java b/src/main/java/org/springblade/modules/ureport/controller/UreportController.java
new file mode 100644
index 0000000..49ee6b0
--- /dev/null
+++ b/src/main/java/org/springblade/modules/ureport/controller/UreportController.java
@@ -0,0 +1,36 @@
+package org.springblade.modules.ureport.controller;
+
+import com.bstek.ureport.provider.report.ReportFile;
+import org.springblade.core.report.entity.ReportFileEntity;
+import org.springblade.core.report.service.IReportFileService;
+import org.springblade.core.tool.api.R;
+import org.springblade.modules.desk.entity.Notice;
+import org.springblade.modules.desk.service.INoticeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * ureport sringbean 方式注入
+ */
+@Component("ureport")
+public class UreportController {
+
+ @Autowired
+ private INoticeService noticeService;
+
+ /**
+ * springbean 方式注入，以下三个参数都必须有
+ * @param dsName 数据源名称
+ * @param datasetName 数据集名称
+ * @param parameters 传入集合数据
+ */
+ public List<Notice> test(String dsName, String datasetName, Map<String,Object> parameters){
+ System.out.println("dsName = " + dsName);
+ System.out.println("datasetName = " + datasetName);
+ System.out.println("parameters = " + parameters);
+ return noticeService.list();
+ }
+}
--
Gitblit v1.9.3