From 3bb8dc295880450581e8ca84b2b3b14d73944f46 Mon Sep 17 00:00:00 2001
From: 喻健 <喻健@Admin>
Date: 星期一, 12 十一月 2018 11:52:06 +0800
Subject: [PATCH] 新后台订单上传
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/UploadController.java | 46 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 39 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..dad3056 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
@@ -1,8 +1,13 @@
package com.yeshi.fanli.controller.admin;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStream;
import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import java.util.UUID;
@@ -12,6 +17,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;
@@ -20,14 +26,21 @@
import org.yeshi.utils.JsonUtil;
import org.yeshi.utils.tencentcloud.COSManager;
+import com.yeshi.fanli.entity.bus.user.ShamUser;
import com.yeshi.fanli.entity.common.AdminUser;
+import com.yeshi.fanli.entity.taobao.ScanHistory;
+import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
import com.yeshi.fanli.service.AdminUserService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoService;
import com.yeshi.fanli.service.inter.order.OrderProcessService;
import com.yeshi.fanli.service.inter.order.OrderService;
+import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.ThreadUtil;
import com.yeshi.fanli.util.TimeUtil;
+import com.yeshi.fanli.util.annotation.RequestNoLogin;
import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;
+import com.yeshi.fanli.util.taobao.TaoBaoUtil;
@Controller
@RequestMapping("admin/new/api/v1/upload")
@@ -44,6 +57,10 @@
@Resource
private AdminUserService adminUserService;
+
+ @Resource(name = "taskExecutor")
+ private TaskExecutor executor;
+
// private static final String PAYSUCCESS = "鏀粯鎴愬姛";
@@ -146,6 +163,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 +182,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