From 9f9f7637f0cfd99497d2a5457089c7e92951a426 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 24 十一月 2023 14:46:34 +0800
Subject: [PATCH] 本地日志文件下载工具类中的方法修改，sql拼接错误修改
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSyncUniversalController.java | 69 ++++++++++++++++++++++++++++------
1 files changed, 56 insertions(+), 13 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSyncUniversalController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSyncUniversalController.java
index b82489f..0f2f922 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSyncUniversalController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSyncUniversalController.java
@@ -39,7 +39,7 @@
/****
* 鐢宠鎺ュ彛
- * @param dataString 灞炴�т俊鎭�
+ * @param dataString 鏁版嵁淇℃伅
* @param dataType 鏁版嵁鏍煎紡绫诲瀷
* @return
* @throws Throwable
@@ -48,9 +48,7 @@
public String applyCode(@RequestParam("dataString")String dataString, @RequestParam("dataType")String dataType, HttpServletRequest request) {
String result="";
try {
- ThreadLocal<HttpServletRequest> threadLocal = new ThreadLocal<>();
- threadLocal.set(request);
- universalInterfaceI.setThreadLocal(threadLocal);
+ this.setHttpToThreadLocal(request);
result = universalInterfaceI.applyCode(dataString, dataType);
}catch (Throwable e){
e.printStackTrace();
@@ -61,18 +59,19 @@
/****
* 鏇存柊/鍒犻櫎/鐘舵�佹帴鍙�
- * @param dataString 灞炴�т俊鎭�
+ * @param dataString 鏁版嵁淇℃伅
* @param dataType 鏁版嵁鏍煎紡绫诲瀷
* @return
* @throws Throwable
*/
@PostMapping("/syncData")
- public String syncData(@RequestParam("dataString")String dataString,@RequestParam("dataType")String dataType) {
+ public String syncData(@RequestParam("dataString")String dataString,@RequestParam("dataType")String dataType, HttpServletRequest request) {
String result="";
try {
+ this.setHttpToThreadLocal(request);
result= universalInterfaceI.syncEditData(dataString,dataType);
}catch (Throwable e){
- e.printStackTrace();;
+ e.printStackTrace();
logger.error("syncData->"+e.getMessage());
}
return result;
@@ -80,15 +79,16 @@
/****
* 鏌ヨ鍒嗙被鍙�
- * @param dataString 灞炴�т俊鎭�
+ * @param dataString 鏁版嵁淇℃伅
* @param dataType 鏁版嵁鏍煎紡绫诲瀷
* @return
* @throws Throwable
*/
@PostMapping("/queryClassify")
- public String queryClassify(@RequestParam("dataString")String dataString,@RequestParam("dataType")String dataType) throws Throwable {
+ public String queryClassify(@RequestParam("dataString")String dataString,@RequestParam("dataType")String dataType, HttpServletRequest request) throws Throwable {
String result="";
try {
+ this.setHttpToThreadLocal(request);
result = universalInterfaceI.queryClassify(dataString, dataType);
}catch (Throwable e){
e.printStackTrace();
@@ -99,15 +99,16 @@
/****
* 鏌ヨ鍒嗙被鍙�
- * @param dataString 灞炴�т俊鎭�
+ * @param dataString 鏁版嵁淇℃伅
* @param dataType 鏁版嵁鏍煎紡绫诲瀷
* @return
* @throws Throwable
*/
@PostMapping("/queryData")
- public String queryData(@RequestParam("dataString")String dataString,@RequestParam("dataType")String dataType) throws Throwable {
+ public String queryData(@RequestParam("dataString")String dataString,@RequestParam("dataType")String dataType, HttpServletRequest request) throws Throwable {
String result="";
try {
+ this.setHttpToThreadLocal(request);
result= universalInterfaceI.queryData(dataString,dataType);
}catch (Throwable e){
e.printStackTrace();
@@ -118,15 +119,16 @@
/****
* 鏌ヨ瑙勫垯
- * @param dataString 灞炴�т俊鎭�
+ * @param dataString 鏁版嵁淇℃伅
* @param dataType 鏁版嵁鏍煎紡绫诲瀷
* @return
* @throws Throwable
*/
@PostMapping("/queryClassifyRule")
- public String queryClassifyRule(@RequestParam("dataString")String dataString,@RequestParam("dataType")String dataType) throws Throwable {
+ public String queryClassifyRule(@RequestParam("dataString")String dataString,@RequestParam("dataType")String dataType, HttpServletRequest request) throws Throwable {
String result="";
try {
+ this.setHttpToThreadLocal(request);
result= universalInterfaceI.queryClassifyRule(dataString,dataType);
}catch (Throwable e){
e.printStackTrace();
@@ -135,4 +137,45 @@
return result;
}
+ /****
+ * 鏍囧噯鍖栫敵璇锋帴鍙�
+ * @param dataString 鏁版嵁淇℃伅
+ * @param dataType 鏁版嵁鏍煎紡绫诲瀷
+ * @return
+ * @throws Throwable
+ */
+ public String applyCodeForBZ(@RequestParam("dataString")String dataString,@RequestParam("dataType")String dataType, HttpServletRequest request){
+ String result="";
+ try {
+ this.setHttpToThreadLocal(request);
+ result= universalInterfaceI.applyCodeForBZ(dataString,dataType);
+ }catch (Throwable e){
+ e.printStackTrace();
+ logger.error("queryData->"+e.getMessage());
+ }
+ return result;
+ }
+
+ /**
+ * 璁剧疆request锛屽埌ThreadLocal涓�
+ * @param request
+ */
+ public void setHttpToThreadLocal(HttpServletRequest request){
+ ThreadLocal<HttpServletRequest> threadLocal = new ThreadLocal<>();
+ threadLocal.set(request);
+ universalInterfaceI.setThreadLocal(threadLocal);
+ }
+
+ /***
+ *
+ * @param dataString
+ * @param dataType
+ * @param request
+ * @return
+ */
+ @PostMapping("/test")
+ public String test(@RequestParam("dataString")String dataString, @RequestParam("dataType")String dataType,HttpServletRequest request){
+ String result="{\"data\": {\"object\": {\"code\": \"0201040133\",\"oid\": \"0000001\",\"erroid\": \"0\",\"msg\": \"娴嬭瘯鎴愬姛\"}}}";
+ return result;
+ }
}
--
Gitblit v1.9.3