|
|
@@ -1,42 +1,10 @@
|
|
|
package com.uas.platform.b2b.controller;
|
|
|
|
|
|
-import java.io.IOException;
|
|
|
-import java.io.InputStream;
|
|
|
-import java.net.URLDecoder;
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.List;
|
|
|
-
|
|
|
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
|
|
|
-import org.apache.poi.ss.usermodel.Workbook;
|
|
|
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
|
|
|
-import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.data.domain.Page;
|
|
|
-import org.springframework.http.HttpStatus;
|
|
|
-import org.springframework.http.ResponseEntity;
|
|
|
-import org.springframework.ui.ModelMap;
|
|
|
-import org.springframework.web.bind.annotation.PathVariable;
|
|
|
-import org.springframework.web.bind.annotation.RequestBody;
|
|
|
-import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
-import org.springframework.web.bind.annotation.RequestMethod;
|
|
|
-import org.springframework.web.bind.annotation.ResponseBody;
|
|
|
-import org.springframework.web.bind.annotation.RestController;
|
|
|
-import org.springframework.web.servlet.ModelAndView;
|
|
|
-
|
|
|
import com.alibaba.dubbo.common.utils.CollectionUtils;
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.uas.platform.b2b.manage.service.MasterService;
|
|
|
-import com.uas.platform.b2b.model.AccessToken;
|
|
|
-import com.uas.platform.b2b.model.DeputyEnterprise;
|
|
|
-import com.uas.platform.b2b.model.DeputyHisVendors;
|
|
|
-import com.uas.platform.b2b.model.DeputyLastOrderKeywords;
|
|
|
-import com.uas.platform.b2b.model.DeputyOrder;
|
|
|
-import com.uas.platform.b2b.model.DeputyOrderKeywords;
|
|
|
-import com.uas.platform.b2b.model.DeputyOrdersLog;
|
|
|
-import com.uas.platform.b2b.model.DeputyPaymentCompany;
|
|
|
-import com.uas.platform.b2b.model.FileUpload;
|
|
|
-import com.uas.platform.b2b.model.SearchFilter;
|
|
|
-import com.uas.platform.b2b.model.Vendor;
|
|
|
+import com.uas.platform.b2b.model.*;
|
|
|
import com.uas.platform.b2b.search.SearchService;
|
|
|
import com.uas.platform.b2b.service.AccessTokenService;
|
|
|
import com.uas.platform.b2b.service.DeputyOrderService;
|
|
|
@@ -60,6 +28,22 @@ import com.uas.search.b2b.model.Sort;
|
|
|
import com.uas.search.b2b.model.Sort.Type;
|
|
|
import com.uas.search.b2b.util.SearchConstants;
|
|
|
import com.uas.sso.common.util.HttpUtil.ResponseWrap;
|
|
|
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
|
|
|
+import org.apache.poi.ss.usermodel.Workbook;
|
|
|
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
|
|
|
+import org.springframework.beans.factory.annotation.Autowired;
|
|
|
+import org.springframework.data.domain.Page;
|
|
|
+import org.springframework.http.HttpStatus;
|
|
|
+import org.springframework.http.ResponseEntity;
|
|
|
+import org.springframework.ui.ModelMap;
|
|
|
+import org.springframework.web.bind.annotation.*;
|
|
|
+import org.springframework.web.servlet.ModelAndView;
|
|
|
+
|
|
|
+import java.io.IOException;
|
|
|
+import java.io.InputStream;
|
|
|
+import java.net.URLDecoder;
|
|
|
+import java.util.ArrayList;
|
|
|
+import java.util.List;
|
|
|
|
|
|
/**
|
|
|
* 代采订单
|
|
|
@@ -668,6 +652,7 @@ public class DeputyOrderController {
|
|
|
ResponseWrap res = com.uas.sso.common.util.HttpUtil.doGet(redirectUrl.toString());
|
|
|
if (!res.isSuccess())
|
|
|
map.put("error", "暂未获取到相关数据");
|
|
|
+ System.out.println(res.getContent());
|
|
|
JSONObject jsonObject = JSONObject.parseObject(res.getContent());
|
|
|
if (jsonObject != null) {
|
|
|
String nodeStr = URLDecoder.decode(jsonObject.getString("nodes"), "UTF-8");
|
hejq