修改导出及添加排队接口

src/main/java/com/steerinfo/dil/controller/TMSController.java

@@ -1006,4 +1006,37 @@ public class TMSController extends BaseRESTfulController {
     public Map<String,Object> updateCarNo(@RequestBody Map<String,Object> map) {
         return tmsFeign.updateCarNo(map);
     }
+
+    @ApiOperation(value = "查询排队网格信息")
+    @PostMapping("/likeQueueGrid")
+    public Map<String, Object> likeQueueGrid(@RequestBody(required = false) Map<String, Object> map,
+                                                 Integer apiId,
+                                                 Integer pageNum,
+                                                 Integer pageSize) {
+        return tmsFeign.likeQueueGrid(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+    }
+
+    @ApiOperation(value = "查询排队实绩信息")
+    @PostMapping("/likeQueueResult")
+    public Map<String, Object> likeQueueResult(@RequestBody(required = false) Map<String, Object> map,
+                                             Integer apiId,
+                                             Integer pageNum,
+                                             Integer pageSize) {
+        return tmsFeign.likeQueueResult(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+    }
+
+    @ApiOperation(value = "处理排队网格数据")
+    @PostMapping("/disposeQueueGrid")
+    public Map<String,Object> disposeQueueGrid(@RequestBody Map<String,Object> map) {
+        return tmsFeign.disposeQueueGrid(map);
+    }
+
+    @ApiOperation(value = "处理排队实绩数据")
+    @PostMapping("/disposeQueueResult")
+    public Map<String,Object> disposeQueueResult(@RequestBody Map<String,Object> map) {
+        return tmsFeign.disposeQueueResult(map);
+    }
+
+
+
 }

src/main/java/com/steerinfo/dil/controller/UniversalController.java

@@ -24,6 +24,7 @@ import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
 
 import javax.imageio.ImageIO;
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.xml.crypto.Data;
 import java.awt.*;
@@ -375,11 +376,11 @@ public class UniversalController extends BaseRESTfulController {
 
     @ApiOperation("通用导出")
     @PostMapping("/excleExport")
-    public RESTfulResult excleExport(@RequestBody Map<String,Object> map) throws IOException {
+    public RESTfulResult excleExport(@RequestBody Map<String,Object> map, HttpServletRequest httpServletRequest) throws IOException {
         JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(map));
         jsonObject.putAll( JSONObject.parseObject(JSONObject.toJSONString(map.get("requestQuery"))));
-        String url  =  "http://172.16.90.202:80"+map.get("requestUrl").toString() + "&pageNum=1&pageSize=10000";
-        JSONObject json = HttpUtil.sendPost(url,jsonObject);
+        String url  =  "http://localhost:8080"+map.get("requestUrl").toString() + "&pageNum=1&pageSize=10000";
+        JSONObject json = HttpUtil.sendPost(url,jsonObject,httpServletRequest.getHeader("cookie"));
         Map<String, Object> data = (Map<String, Object>) json.get("data");
         List<Map<String,Object>> listMap = (List<Map<String, Object>>) data.get("list");
         List<Map<String,Object>> columnData = (List<Map<String, Object>>) data.get("columnData");

src/main/java/com/steerinfo/dil/feign/TmsFeign.java

@@ -345,6 +345,23 @@ public interface TmsFeign {
     @PostMapping(value = "api/v1/tms/omstransorders/updateCarNo")
     Map<String, Object> updateCarNo(Map<String, Object> map);
 
+    @PostMapping(value = "/api/v1/tms/tmsqueuegrids/likeQueueGrid")
+    Map<String, Object> likeQueueGrid(@RequestBody Map<String, Object> objectMap,
+                                      @RequestParam Integer apiId,
+                                      @RequestParam Integer pageNum,
+                                      @RequestParam Integer pageSize);
+
+    @PostMapping(value = "/api/v1/tms/tmsqueueresults/likeQueueResult")
+    Map<String, Object> likeQueueResult(@RequestBody Map<String, Object> objectMap,
+                                        @RequestParam Integer apiId,
+                                        @RequestParam Integer pageNum,
+                                        @RequestParam Integer pageSize);
+
+    @PostMapping(value = "/api/v1/tms/tmsqueuegrids/disposeQueueGrid")
+    Map<String, Object> disposeQueueGrid(Map<String, Object> map);
+
+    @PostMapping(value = "/api/v1/tms/tmsqueueresults/disposeQueueResult")
+    Map<String, Object> disposeQueueResult(Map<String, Object> map);
 }
 
 

src/main/java/com/steerinfo/dil/util/HttpUtil.java

@@ -6,6 +6,7 @@ import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.HttpException;
 import org.apache.commons.httpclient.methods.*;
 import org.apache.commons.httpclient.params.HttpMethodParams;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.io.IOException;
 
@@ -40,7 +41,7 @@ public class HttpUtil {
     }
 
 
-    public static JSONObject sendPost(String url,JSONObject param) throws HttpException, IOException {
+    public static JSONObject sendPost(String url,JSONObject param,@RequestParam(required = false) String headerValue) throws HttpException, IOException {
         // 创建httpClient实例对象
         HttpClient httpClient = new HttpClient();
         // 设置httpClient连接/执行超时时间(ms)
@@ -49,7 +50,7 @@ public class HttpUtil {
         // 创建post请求方法实例对象
         PostMethod postMethod = new PostMethod(url);
         postMethod.addRequestHeader("Content-Type", "application/json;charset=utf-8");
-        postMethod.setRequestHeader("Cookie","rootCompanyMap=; urlFlag=null; icore.icp-Authorization=zym; icore.icp-username=%E5%BC%A0%E7%A6%B9%E9%93%AD; accessToken=eyJhbGciOiJIUzI1NiJ9.eyJqdGkiOiJqd3QiLCJpYXQiOjE3MTk0NzY5OTgsInN1YiI6IntcImlkXCI6XCIxMTc5NDU0Nzc0ODMyMTQwMjg4XCIsXCJ1c2VyQ29kZVwiOlwienltXCIsXCJ1c2VyTmFtZVwiOlwi5byg56a56ZOtXCIsXCJwYXNzd29yZFwiOlwiN2M0YThkMDljYTM3NjJhZjYxZTU5NTIwOTQzZGMyNjQ5NGY4OTQxYlwiLFwib3JnQ29kZVwiOlwiMTAwMDBcIn0iLCJpc3MiOiJzdGVlciIsImV4cCI6MTcyMDA4MTc5OH0.GVRWAqphggeKN7f2MeerOkIzBAAFJkHJEKRGEr4dzbs; refreshToken=eyJhbGciOiJIUzI1NiJ9.eyJqdGkiOiJRT1hZSjdWNFduRWRReWNkRnFndFM3VTVodUVaMlhsb1A1VVRwNFZ2bG5rPSIsImlhdCI6MTcxOTQ3Njk5OCwic3ViIjoiXCIxMTc5NDU0Nzc0ODMyMTQwMjg4XCIiLCJpc3MiOiJzdGVlciIsImV4cCI6MTcyMTI5MTM5OH0.inSO_CsI4-JESCFZbU21T884cmbXGQXyOgobLe7DoNE; orgCode=10000; userId=1179454774832140288; userName=%E5%BC%A0%E7%A6%B9%E9%93%AD; appId=821034072422879232; loginId=1179454774832140288; loginName=zym; roleCodes=%5B%22superadmin%22%2C%22superadminApp%22%5D; dilCompanyList=%5B%5D; JSESSIONID=839C89FB4DBDB193971AFD0F14E8C84A");
+        postMethod.setRequestHeader("Cookie",headerValue);
         // 构建参数
         RequestEntity entity = new StringRequestEntity(param.toJSONString(),"application/json", "UTF-8");
         postMethod.setRequestEntity(entity);