From 2147d023563a7c9d05d97547c00d6b0162c0644c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 09 十一月 2020 18:37:24 +0800
Subject: [PATCH] 刷单风险规则优化

---
 fanli/src/main/java/com/yeshi/fanli/controller/admin/UploadController.java |   24 ++++++++++--------------
 1 files changed, 10 insertions(+), 14 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 49caef7..386eed3 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
@@ -10,6 +10,7 @@
 
 import javax.annotation.Resource;
 
+import com.yeshi.fanli.entity.accept.AdminAcceptData;
 import org.springframework.core.task.TaskExecutor;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -31,7 +32,7 @@
 import com.yeshi.fanli.util.RedisKeyEnum;
 import com.yeshi.fanli.util.RedisManager;
 import com.yeshi.fanli.util.StringUtil;
-import com.yeshi.fanli.util.TimeUtil;
+import org.yeshi.utils.TimeUtil;
 import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;
 
 import net.sf.json.JSONObject;
@@ -69,7 +70,7 @@
 	// private static final String ORDERFAILURE = "璁㈠崟澶辨晥";
 
 	@RequestMapping(value = "uploadImg", method = RequestMethod.POST)
-	public void uploadImg(@RequestParam("file") CommonsMultipartFile file, PrintWriter out) {
+	public void uploadImg(AdminAcceptData acceptData, @RequestParam("file") CommonsMultipartFile file, PrintWriter out) {
 		try {
 			InputStream inputStream = file.getInputStream();
 			String contentType = file.getContentType();
@@ -92,7 +93,7 @@
 	 * @param out
 	 */
 	@RequestMapping(value = "uploadInstallApk")
-	public void uploadInstallApk(@RequestParam("file") CommonsMultipartFile file, PrintWriter out) {
+	public void uploadInstallApk(AdminAcceptData acceptData,@RequestParam("file") CommonsMultipartFile file, PrintWriter out) {
 		try {
 			InputStream inputStream = file.getInputStream();
 			String contentType = file.getContentType();
@@ -108,7 +109,7 @@
 	}
 
 	@RequestMapping(value = "uploadfImg")
-	public void uploadfImg(@RequestParam("file") CommonsMultipartFile file, PrintWriter out) {
+	public void uploadfImg(AdminAcceptData acceptData,@RequestParam("file") CommonsMultipartFile file, PrintWriter out) {
 		try {
 			InputStream inputStream = file.getInputStream();
 			long timeMillis = System.currentTimeMillis();
@@ -184,7 +185,7 @@
 	}
 
 	@RequestMapping(value = "uploadOrder", method = RequestMethod.POST)
-	public void uploadOrder(@RequestParam("file") CommonsMultipartFile file, PrintWriter out) {
+	public void uploadOrder(AdminAcceptData acceptData,@RequestParam("file") CommonsMultipartFile file, PrintWriter out) {
 		if (file != null) {
 			try {
 				List<TaoBaoOrder> orderList = TaoBaoOrderUtil.parseOrder(file.getInputStream());
@@ -213,17 +214,12 @@
 
 	/**
 	 * 鏂板悗鍙扮 涓婁紶璁㈠崟鏂囦欢
-	 * 
+	 * @param acceptData
 	 * @param file
-	 *            excel鏂囦欢
-	 * @param uid
-	 *            褰撳墠鐢ㄦ埛id
-	 * @param request
-	 * @param response
 	 * @param out
 	 */
 	@RequestMapping(value = "uploadOrderFile")
-	public void uploadOrderFile(@RequestParam("file") CommonsMultipartFile file, PrintWriter out) {
+	public void uploadOrderFile(AdminAcceptData acceptData,@RequestParam("file") CommonsMultipartFile file, PrintWriter out) {
 
 		if (file == null) {
 			out.print(JsonUtil.loadFalseResult("涓婁紶鏂囦欢涓嶈兘涓虹┖"));
@@ -264,7 +260,7 @@
 	 * @param out
 	 */
 	@RequestMapping(value = "uploadPicture")
-	public void uploadPicture(@RequestParam("file") CommonsMultipartFile file, PrintWriter out) {
+	public void uploadPicture(AdminAcceptData acceptData,@RequestParam("file") CommonsMultipartFile file, PrintWriter out) {
 
 		if (file == null) {
 			out.print(JsonUtil.loadFalseResult("涓婁紶鏂囦欢涓虹┖"));
@@ -302,7 +298,7 @@
 	 * @param out
 	 */
 	@RequestMapping(value = "installPackage")
-	public void installPackage(@RequestParam("file") CommonsMultipartFile file, PrintWriter out) {
+	public void installPackage(AdminAcceptData acceptData,@RequestParam("file") CommonsMultipartFile file, PrintWriter out) {
 		
 		if (file == null) {
 			out.print(JsonUtil.loadFalseResult("涓婁紶鏂囦欢涓虹┖"));

--
Gitblit v1.8.0