From 4440cdda8530906faf89348a3e480b05c20d4e25 Mon Sep 17 00:00:00 2001
From: chengf <2156125618@qq.com>
Date: 星期四, 07 八月 2025 18:46:34 +0800
Subject: [PATCH] 费用初始化2025/08/07
---
service-api/src/main/java/com/java110/api/controller/component/CallComponentController.java | 34 +++++++++++++++++++++-------------
1 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/controller/component/CallComponentController.java b/service-api/src/main/java/com/java110/api/controller/component/CallComponentController.java
index 53b080a..a92b8a8 100644
--- a/service-api/src/main/java/com/java110/api/controller/component/CallComponentController.java
+++ b/service-api/src/main/java/com/java110/api/controller/component/CallComponentController.java
@@ -16,9 +16,11 @@
package com.java110.api.controller.component;
import com.alibaba.fastjson.JSONObject;
-import com.java110.core.base.controller.BaseController;
+import com.java110.api.smo.DefaultAbstractComponentSMO;
import com.java110.core.context.IPageData;
import com.java110.core.context.PageData;
+import com.java110.core.language.Java110Lang;
+import com.java110.core.log.LoggerFactory;
import com.java110.utils.constant.CommonConstant;
import com.java110.utils.exception.SMOException;
import com.java110.utils.factory.ApplicationContextFactory;
@@ -27,16 +29,13 @@
import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import org.springframework.web.client.RestTemplate;
import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.support.StandardMultipartHttpServletRequest;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -49,7 +48,7 @@
* 缁勪欢璋冪敤澶勭悊绫�
*/
@RestController
-public class CallComponentController extends BaseController {
+public class CallComponentController extends DefaultAbstractComponentSMO {
private final static Logger logger = LoggerFactory.getLogger(CallComponentController.class);
private static final String VERSION = "version";
@@ -67,6 +66,7 @@
*/
@RequestMapping(path = "/callComponent/{api}")
+ @Java110Lang
public ResponseEntity<String> callApi(
@PathVariable String api,
//@RequestBody String info,
@@ -79,7 +79,7 @@
Assert.hasLength(api, "鍙傛暟閿欒锛屾湭浼犲叆api缂栫爜");
IPageData pd = (IPageData) request.getAttribute(CommonConstant.CONTEXT_PAGE_DATA);
- pd.setApiUrl("/api/" + api);
+ pd.setApiUrl(api);
//鏉冮檺鏍￠獙
hasPrivilege(restTemplate, pd, "/callComponent/" + api);
@@ -102,6 +102,7 @@
logger.error("璋冪敤api寮傚父", e);
responseEntity = new ResponseEntity<>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
} catch (Exception e) {
+ e.printStackTrace();
logger.error("璋冪敤api寮傚父", e);
String msg = "";
if (e instanceof InvocationTargetException) {
@@ -137,6 +138,7 @@
*/
@RequestMapping(path = "/callComponent/{componentCode}/{componentMethod}")
+ @Java110Lang
public ResponseEntity<String> callComponent(
@PathVariable String componentCode,
@PathVariable String componentMethod,
@@ -170,9 +172,11 @@
} catch (SMOException e) {
/*MultiValueMap<String, String> headers = new HttpHeaders();
headers.add("code", e.getResult().getCode());*/
+ e.printStackTrace();
logger.error("璋冪敤缁勪欢寮傚父", e);
responseEntity = new ResponseEntity<>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
} catch (Exception e) {
+ e.printStackTrace();
logger.error("璋冪敤缁勪欢寮傚父", e);
String msg = "";
if (e instanceof InvocationTargetException) {
@@ -181,7 +185,8 @@
msg = targetEx.getMessage();
}
} else {
- msg = e.getMessage();
+ //msg = e.getMessage();
+ msg ="璋冪敤寮傚父";
}
responseEntity = new ResponseEntity<>(msg, HttpStatus.INTERNAL_SERVER_ERROR);
} finally {
@@ -209,11 +214,12 @@
*/
@RequestMapping(path = "/callComponent/upload/{componentCode}/{componentMethod}")
+ @Java110Lang
public ResponseEntity<String> callComponentUploadFile(
@PathVariable String componentCode,
@PathVariable String componentMethod,
- @RequestParam("uploadFile") MultipartFile uploadFile,
- //@RequestBody String info,
+ @RequestParam(value = "uploadFile", required = false) MultipartFile uploadFile,
+ @RequestParam(value = "userId", required = false) String userId,
HttpServletRequest request) {
ResponseEntity<String> responseEntity = null;
Map formParam = null;
@@ -223,6 +229,7 @@
Assert.hasLength(componentMethod, "鍙傛暟閿欒锛屾湭浼犲叆璋冪敤缁勪欢鏂规硶");
pd = freshPageDate(request);
+
//鏉冮檺鏍￠獙
hasPrivilege(restTemplate, pd, "/callComponent/" + componentCode + "/" + componentMethod);
@@ -278,6 +285,7 @@
*/
@RequestMapping(path = "/callComponent/download/{componentCode}/{componentMethod}")
+ @Java110Lang
public ResponseEntity<Object> callComponentDownloadFile(
@PathVariable String componentCode,
@PathVariable String componentMethod,
@@ -330,7 +338,7 @@
* @param request HttpServletRequest 瀵硅薄
* @return pd 瀵硅薄
*/
- private IPageData freshPageDate(HttpServletRequest request) {
+ public IPageData freshPageDate(HttpServletRequest request) {
Map<String, String[]> params = request.getParameterMap();
IPageData pd = (IPageData) request.getAttribute(CommonConstant.CONTEXT_PAGE_DATA);
String reqData = "";
@@ -351,7 +359,7 @@
}
IPageData newPd = PageData.newInstance().builder(pd.getUserId(), pd.getUserName(), pd.getToken(),
- reqData, pd.getComponentCode(), pd.getComponentMethod(), "", pd.getSessionId(), "");
+ reqData, pd.getComponentCode(), pd.getComponentMethod(), "", pd.getSessionId(), pd.getAppId());
return newPd;
}
--
Gitblit v1.8.0