From 06a7debe678e7ae30f39c61a7f71a926d52d1ae7 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@S0ZHK00LKCA6OYY>
Date: 星期二, 13 十一月 2018 10:26:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/UploadController.java | 35 ++++++++++++++++++++++++++++-------
1 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/UploadController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/UploadController.java
index 75c30ca..e3552f6 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/UploadController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/UploadController.java
@@ -12,6 +12,7 @@
import net.sf.json.JSONObject;
+import org.springframework.core.task.TaskExecutor;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -27,6 +28,7 @@
import com.yeshi.fanli.service.inter.order.OrderProcessService;
import com.yeshi.fanli.service.inter.order.OrderService;
import com.yeshi.fanli.util.TimeUtil;
+import com.yeshi.fanli.util.annotation.RequestNoLogin;
import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;
@Controller
@@ -44,6 +46,10 @@
@Resource
private AdminUserService adminUserService;
+
+ @Resource(name = "taskExecutor")
+ private TaskExecutor executor;
+
// private static final String PAYSUCCESS = "鏀粯鎴愬姛";
@@ -146,6 +152,7 @@
* @param response
* @param out
*/
+ @RequestNoLogin()
@RequestMapping(value = "uploadOrderFile")
public void uploadOrderFile(@RequestParam("file") CommonsMultipartFile file, Long uid,
HttpServletRequest request, HttpServletResponse response, PrintWriter out) {
@@ -164,17 +171,31 @@
return;
}
+ List<TaoBaoOrder> orderList = null ;
try {
- List<TaoBaoOrder> orderList = TaoBaoOrderUtil.parseOrder(file.getInputStream());
-
- orderProcessService.processOrder(TaoBaoOrderUtil.classifyTaoBaoOrderByOrderId(orderList));
-
- out.print(JsonUtil.loadTrueResult("涓婁紶鎴愬姛"));
-
+ orderList = TaoBaoOrderUtil.parseOrder(file.getInputStream());
+ out.print(JsonUtil.loadTrueResult("涓婁紶鏂囦欢鎴愬姛"));
} catch (IOException e) {
+ out.print(JsonUtil.loadFalseResult("涓婁紶鏂囦欢澶辫触"));
e.printStackTrace();
- out.print(JsonUtil.loadFalseResult("涓婁紶寮傚父"));
}
+
+ final List<TaoBaoOrder> list = orderList;
+
+ executor.execute(new Runnable() {
+ @Override
+ public void run() {
+ try {
+
+ orderProcessService.processOrder(TaoBaoOrderUtil.classifyTaoBaoOrderByOrderId(list));
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ }
+ });
+
}
}
--
Gitblit v1.8.0