From e35c2621a7823981d7842de7a0260d8b218bfc2e Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期一, 21 十月 2019 22:06:07 +0800
Subject: [PATCH] 优化商户ID判断
---
WebService/src/main/java/com/java110/web/controller/CallComponentController.java | 63 ++++++++++++++++++++++++++++---
1 files changed, 56 insertions(+), 7 deletions(-)
diff --git a/WebService/src/main/java/com/java110/web/controller/CallComponentController.java b/WebService/src/main/java/com/java110/web/controller/CallComponentController.java
index 39665a0..6e87433 100644
--- a/WebService/src/main/java/com/java110/web/controller/CallComponentController.java
+++ b/WebService/src/main/java/com/java110/web/controller/CallComponentController.java
@@ -1,24 +1,22 @@
package com.java110.web.controller;
import com.alibaba.fastjson.JSONObject;
-import com.java110.common.constant.CommonConstant;
-import com.java110.common.exception.SMOException;
-import com.java110.common.factory.ApplicationContextFactory;
-import com.java110.common.util.Assert;
+import com.java110.utils.constant.CommonConstant;
+import com.java110.utils.exception.SMOException;
+import com.java110.utils.factory.ApplicationContextFactory;
+import com.java110.utils.util.Assert;
import com.java110.core.base.controller.BaseController;
import com.java110.core.context.IPageData;
import com.java110.core.context.PageData;
-import com.java110.web.smo.impl.LoginServiceSMOImpl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
-import org.springframework.util.MultiValueMap;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.Map;
@@ -144,6 +142,57 @@
}
/**
+ * 璋冪敤缁勪欢 鏂囦欢涓婁紶
+ * /callComponent/upload/assetImport/importData
+ *
+ * @return
+ */
+
+ @RequestMapping(path = "/callComponent/download/{componentCode}/{componentMethod}")
+ public ResponseEntity<Object> callComponentDownloadFile(
+ @PathVariable String componentCode,
+ @PathVariable String componentMethod,
+ HttpServletRequest request,
+ HttpServletResponse response) {
+ ResponseEntity<Object> responseEntity = null;
+ Map formParam = null;
+ IPageData pd = null;
+ try {
+ Assert.hasLength(componentCode, "鍙傛暟閿欒锛屾湭浼犲叆缁勪欢缂栫爜");
+ Assert.hasLength(componentMethod, "鍙傛暟閿欒锛屾湭浼犲叆璋冪敤缁勪欢鏂规硶");
+
+ Object componentInstance = ApplicationContextFactory.getBean(componentCode);
+
+ Assert.notNull(componentInstance, "鏈壘鍒扮粍浠跺搴旂殑澶勭悊绫伙紝璇风‘璁� " + componentCode);
+
+ Method cMethod = componentInstance.getClass().getDeclaredMethod(componentMethod, IPageData.class);
+
+ Assert.notNull(cMethod, "鏈壘鍒扮粍浠跺搴斿鐞嗙被鐨勬柟娉曪紝璇风‘璁� " + componentCode + "鏂规硶锛�" + componentMethod);
+ pd = freshPageDate(request);
+ responseEntity = (ResponseEntity<Object>) cMethod.invoke(componentInstance, pd);
+
+ } catch (SMOException e) {
+ logger.error("缁勪欢杩愯寮傚父",e);
+ responseEntity = new ResponseEntity<Object>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
+ } catch (Exception e) {
+ logger.error("缁勪欢杩愯寮傚父",e);
+ String msg = "";
+ if (e instanceof InvocationTargetException) {
+ Throwable targetEx = ((InvocationTargetException) e).getTargetException();
+ if (targetEx != null) {
+ msg = targetEx.getMessage();
+ }
+ } else {
+ msg = e.getMessage();
+ }
+ responseEntity = new ResponseEntity<Object>(msg, HttpStatus.INTERNAL_SERVER_ERROR);
+ } finally {
+ logger.debug("缁勪欢璋冪敤杩斿洖淇℃伅涓簕}", responseEntity);
+ return responseEntity;
+ }
+ }
+
+ /**
* 鍒锋柊 pd 瀵硅薄
*
* @param request HttpServletRequest 瀵硅薄
--
Gitblit v1.8.0