From eee018cdbf547cfbd246f42c66b315b595ee31a3 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期四, 13 二月 2025 20:37:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ltkj-admin/src/main/java/com/ltkj/web/jmreport/JimuController.java | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/jmreport/JimuController.java b/ltkj-admin/src/main/java/com/ltkj/web/jmreport/JimuController.java
index 855ac1d..f9b1399 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/jmreport/JimuController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/jmreport/JimuController.java
@@ -1,11 +1,19 @@
package com.ltkj.web.jmreport;
+import cn.hutool.http.server.HttpServerRequest;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ltkj.common.core.domain.AjaxResult;
+import com.ltkj.common.enums.DataSourceType;
+import com.ltkj.db.DataSourceConfig;
+import com.ltkj.db.DataSourceContextHolder;
+import com.ltkj.hosp.domain.DictHosp;
import com.ltkj.hosp.mapper.TestMapper;
+import com.ltkj.hosp.service.IDictHospService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import jodd.util.StringUtil;
import lombok.extern.slf4j.Slf4j;
import org.omg.CORBA.Environment;
import org.springframework.beans.factory.annotation.Autowired;
@@ -16,6 +24,8 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
@@ -41,6 +51,10 @@
@Autowired
private TestMapper testMapper;
+ @Autowired
+ private DataSourceConfig dataSourceConfig;
+ @Autowired
+ private IDictHospService dictHospService;
@Value ("${config.properties}")
public void setConfigPath(String path) {
@@ -91,7 +105,17 @@
@GetMapping("/view")
@ApiOperation(value = "view")
//@PreAuthorize("@ss.hasPermi('report:jimu:view')")
- public String view(){
+ public String view(HttpServletRequest request){
+// dataSourceConfig.addDataSource(DataSourceType.MASTER.name());
+// DataSourceContextHolder.setDataSourceKey(DataSourceType.MASTER.name());
+// String hospId = request.getHeader("hospId");
+// LambdaQueryWrapper<DictHosp> wrapper = new LambdaQueryWrapper<>();
+// wrapper.eq(DictHosp::getCode,hospId);
+// DictHosp hosp = dictHospService.getOne(wrapper);
+// if (hosp != null && StringUtil.isNotBlank(hosp.getDbname())) {
+// dataSourceConfig.addDataSource(hosp.getDbname());
+// DataSourceContextHolder.setDataSourceKey(hosp.getDbname());
+// }
return value+"/jmreport/view";
}
--
Gitblit v1.8.0