From aa59ddfc2c48dd540fe769e95c2429623f3851c8 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 31 十月 2024 10:54:39 +0800
Subject: [PATCH] 重构日漏损量查询，增加果询条件和排序方法，及增加显示内容
---
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/captcha/CaptchaCtrl.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/captcha/CaptchaCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/captcha/CaptchaCtrl.java
index 95abb7a..a2449e2 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/captcha/CaptchaCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/captcha/CaptchaCtrl.java
@@ -1,5 +1,8 @@
package com.dy.pipIrrApp.captcha;
+import com.dy.common.multiDataSource.DataSourceContext;
+import com.dy.common.webUtil.BaseResponse;
+import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.pipIrrApp.captcha.dto.CaptchaDomain;
import com.dy.pipIrrGlobal.pojoBa.BaCaptcha;
import jakarta.servlet.ServletOutputStream;
@@ -34,7 +37,18 @@
*/
@GetMapping("/get")
@ResponseBody
- public CaptchaDomain getCaptcha(HttpServletRequest request, @RequestParam(value = "type", required = false, defaultValue = "char") String type) {
+ public BaseResponse<CaptchaDomain> getCaptcha(HttpServletRequest request, @RequestParam(value = "type", required = false, defaultValue = "char") String type) {
+ // 閰嶇疆鏁版嵁婧�
+ HttpServletRequest httpRequest = (HttpServletRequest) request;
+ String wxDataSourceName = httpRequest.getHeader("tag");
+ if(wxDataSourceName != null && wxDataSourceName.trim().length() > 0){
+ log.info("寰俊寮�鍙戯紝璁剧疆鏁版嵁婧愬悕绉颁负:" + wxDataSourceName);
+ //鎶婄粍缁囧崟浣嶆爣绛句綔涓烘暟鎹簮鍚嶇О
+ DataSourceContext.set(wxDataSourceName);
+ } else {
+ log.info("鐢ㄦ埛鏈�夋嫨鏁版嵁婧�");
+ }
+
// 鐢熸垚楠岃瘉鐮佸疄浣�
CaptchaDomain captchaDomain = captchaSV.createGoogleCaptcha(type);
if (null != captchaDomain) {
@@ -66,7 +80,7 @@
captchaDomain.setText(null);
captchaDomain.setCode(null);
// 杩斿洖鍓嶇淇℃伅
- return captchaDomain;
+ return BaseResponseUtils.buildSuccess(captchaDomain);
} else {
return null;
}
--
Gitblit v1.8.0