From 31e20ddb1eafa5bf64a0824629fb8c7a05450318 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 19 六月 2020 20:26:28 +0800
Subject: [PATCH] 商品系统完善

---
 src/main/java/com/ks/tool/bkz/controller/ParseController.java |   68 +++++++++++++++++++++-------------
 1 files changed, 42 insertions(+), 26 deletions(-)

diff --git a/src/main/java/com/ks/tool/bkz/controller/ParseController.java b/src/main/java/com/ks/tool/bkz/controller/ParseController.java
index bcecf8e..0535661 100644
--- a/src/main/java/com/ks/tool/bkz/controller/ParseController.java
+++ b/src/main/java/com/ks/tool/bkz/controller/ParseController.java
@@ -3,41 +3,48 @@
 import com.alibaba.fastjson.JSONObject;
 import com.ks.tool.bkz.dto.FirstOrderSubParseResult;
 import com.ks.tool.bkz.entity.FirstOrderSubInfo;
-import com.ks.tool.bkz.service.FirstOrderSubInfoService;
+import com.ks.tool.bkz.entity.user.UserInfo;
+import com.ks.tool.bkz.exception.TBCookieException;
 import com.ks.tool.bkz.service.manager.RedisManager;
-import com.ks.tool.bkz.util.FirstOrderSubDataUtil;
-import com.ks.tool.bkz.util.JsonUtil;
-import com.ks.tool.bkz.util.UrlUtil;
-import org.omg.CORBA.PUBLIC_MEMBER;
+import com.ks.tool.bkz.service.sdlj.SDLJGoodsService;
+import com.ks.tool.bkz.service.user.UserService;
+import com.ks.tool.bkz.util.*;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.io.PrintWriter;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
-import java.util.List;
 import java.util.Map;
 
 @Controller
-@RequestMapping("parse")
+@RequestMapping("sdlj/parse")
 public class ParseController {
-    String cookie = null;
     @Resource
     private RedisManager redisManager;
 
     @Resource
-    private FirstOrderSubInfoService firstOrderSubInfoService;
+    private SDLJGoodsService sdljGoodsService;
+
+    @Resource
+    private UserService userService;
+
+    private String getCookieKey(String tbUid) {
+        return "tbcookie-" + tbUid;
+    }
 
     @RequestMapping("getRequestUrl")
     @ResponseBody
-    public String getRequestUrl(String baseUrl) {
+    public String getRequestUrl(String baseUrl, String tbUid) {
         String host = UrlUtil.getHost(baseUrl);
         Map<String, String> params = UrlUtil.getParamsMap(baseUrl);
         params.put("t", System.currentTimeMillis() + "");
-        cookie = redisManager.get("cookie");
+
+        String cookie = redisManager.get(getCookieKey(tbUid));
         String token = FirstOrderSubDataUtil.getTokenFromCookie(cookie);
         String data = params.get("data");
         try {
@@ -78,9 +85,11 @@
     @RequestMapping("uploadCookies")
     @ResponseBody
     public String uploadCookie(String cookies) {
-        this.cookie = cookies;
-        redisManager.save("cookie", cookies, 60 * 60);
-        return cookies;
+        String tbUid = TBCookieUtil.getTBUid(cookies);
+        if (!StringUtil.isNullOrEmpty(tbUid)) {
+            redisManager.save(getCookieKey(tbUid), cookies, 60 * 60);
+        }
+        return JsonUtil.loadTrueResult("");
     }
 
     @RequestMapping("getLoginUrl")
@@ -99,18 +108,25 @@
 
     @RequestMapping("uploadContent")
     @ResponseBody
-    public String uploadContent(String content) {
-        FirstOrderSubParseResult result = FirstOrderSubDataUtil.parseOrderSubData(content);
-        if (result != null && result.isHasNextPage()) {
-            if (result.getGoodsList() != null)
-                for (FirstOrderSubInfo info : result.getGoodsList()) {
-                    firstOrderSubInfoService.add(info);
-                    System.out.println(info.getId() + "-" + info.getTitle());
-                }
-            System.out.println("----------------------------");
-            return JsonUtil.loadTrueResult(null);
-        } else {
-            return JsonUtil.loadFalseResult(1, "鏃犳洿澶氭暟鎹�");
+    public String uploadContent(String content, String tbUid, HttpServletRequest request) {
+        String token = request.getHeader("token");
+        String account = UserUtil.getAccountFromToken(token);
+        UserInfo user = userService.selectByAccount(account);
+        try {
+            FirstOrderSubParseResult result = FirstOrderSubDataUtil.parseOrderSubData(content);
+            if (result != null && result.isHasNextPage()) {
+                if (result.getGoodsList() != null)
+                    for (FirstOrderSubInfo info : result.getGoodsList()) {
+                        sdljGoodsService.addSDLJGoods(info,user.getId(),tbUid );
+                        System.out.println(info.getId() + "-" + info.getTitle());
+                    }
+                System.out.println("----------------------------");
+                return JsonUtil.loadTrueResult("");
+            } else {
+                return JsonUtil.loadFalseResult(1, "鏃犳洿澶氭暟鎹�");
+            }
+        } catch (TBCookieException e) {
+            return JsonUtil.loadFalseResult(1001, "娣樺疂鎺堟潈鍑洪敊");
         }
     }
 

--
Gitblit v1.8.0