From 22a4436964aa3a9f395b6b9950a2d63242e4af2b Mon Sep 17 00:00:00 2001
From: wangwu <wangwu@haier.com>
Date: Fri, 18 Sep 2020 14:35:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8F=91DOE=E5=88=86=E6=9E=90?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dfm/controller/DoeAnalysisController.java | 42 +++++++++++++++----
 .../ruoyi/common/utils/http/HttpUtils.java    |  8 ++--
 2 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/dfm/controller/DoeAnalysisController.java b/ruoyi-admin/src/main/java/com/ruoyi/dfm/controller/DoeAnalysisController.java
index a352042b2..3073667b5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/dfm/controller/DoeAnalysisController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/dfm/controller/DoeAnalysisController.java
@@ -43,6 +43,9 @@ public class DoeAnalysisController extends BaseController {
     @Value("${api.doe.Calculate}")
     private String calculateUrl;
 
+    @Value("${api.doe.Save}")
+    private String saveUrl;
+
     /**
      * 获取分析页面
      *
@@ -71,9 +74,25 @@ public class DoeAnalysisController extends BaseController {
         }
         log.info("request remote api, url={}, param={}", apiUrl, param);
         String result = HttpUtils.sendGet(apiUrl, param);
-
         log.info("response remote api, url={}, param={}, result={}", apiUrl, param, result);
-        result = StringUtils.replace(result, "\\\"", "\"");
+        JSONObject resultObj = JSON.parseObject(result);
+        if(null != resultObj && SUCCESS_CODE.equals(resultObj.getInteger("code"))) {
+            JSONArray data = resultObj.getJSONArray("data");
+            return getDataTable(data);
+        } else {
+            log.error("reponse result failed. url={}, param={}, result={}", apiUrl, param, result);
+        }
+        return getDataTable(Collections.emptyList());
+    }
+
+    @RequestMapping("/calculate")
+    @ResponseBody
+    public TableDataInfo calculate(@RequestParam("productname") String productname, @RequestParam("version") String version, @RequestParam("dataType") String dataType) {
+        String apiUrl = apiRootUrl + calculateUrl;
+        String param = "";
+        log.info("request remote api, apiUrl={}, param={}", apiUrl, param);
+        String result = HttpUtils.sendPost(apiUrl, param);
+        log.info("response remote api, apiUrl={}, param={}, result={}", apiUrl, param, result);
         JSONObject resultObj = JSON.parseObject(result);
         if(null != resultObj && SUCCESS_CODE.equals(resultObj.getInteger("code"))) {
             JSONArray data = resultObj.getJSONArray("data");
@@ -85,12 +104,21 @@ public class DoeAnalysisController extends BaseController {
     }
 
 
-    @RequestMapping("/calculate")
+    @RequestMapping("/save")
     @ResponseBody
-    public TableDataInfo calculate(@RequestParam("productname") String productname, @RequestParam("version") String version, @RequestParam("dataType") String dataType) {
-        String url = apiRootUrl + calculateUrl;
-//        HttpUtils.sendPost();
-        return null;
+    public AjaxResult save(@RequestParam("productname") String productname, @RequestParam("version") String version, @RequestParam("dataType") String dataType) {
+        String apiUrl = apiRootUrl + saveUrl;
+        String param = "";
+        log.info("request remote api, apiUrl={}, param={}", apiUrl, param);
+        String result = HttpUtils.sendPost(apiUrl, param);
+        log.info("response remote api, apiUrl={}, param={}, result={}", apiUrl, param, result);
+        JSONObject resultObj = JSON.parseObject(result);
+        if(null != resultObj && SUCCESS_CODE.equals(resultObj.getInteger("code"))) {
+            return AjaxResult.success();
+        } else {
+            log.error("reponse result failed. url={}, param={}, result={}", apiUrl, param, result);
+        }
+        return AjaxResult.error();
     }
 
 }
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
index 5e92cde8f..7333ad3b8 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
@@ -5,10 +5,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.PrintWriter;
-import java.net.ConnectException;
-import java.net.SocketTimeoutException;
-import java.net.URL;
-import java.net.URLConnection;
+import java.net.*;
 import java.security.cert.X509Certificate;
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.HttpsURLConnection;
@@ -121,12 +118,13 @@ public class HttpUtils
             String urlNameString = url;
             log.info("sendPost - {}", urlNameString);
             URL realUrl = new URL(urlNameString);
-            URLConnection conn = realUrl.openConnection();
+            HttpURLConnection conn = (HttpURLConnection)realUrl.openConnection();
             conn.setRequestProperty("accept", "*/*");
             conn.setRequestProperty("connection", "Keep-Alive");
             conn.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)");
             conn.setRequestProperty("Accept-Charset", "utf-8");
             conn.setRequestProperty("contentType", "utf-8");
+            conn.setRequestMethod("POST");
             conn.setDoOutput(true);
             conn.setDoInput(true);
             out = new PrintWriter(conn.getOutputStream());