ruoyi
/
RuoYi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

开发DOE分析功能

This commit is contained in:
wangwu 2020-09-18 14:35:55 +08:00
parent 98b55bbcab
commit 22a4436964
2 changed files with 38 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
ruoyi-admin/src/main/java/com/ruoyi/dfm/controller/DoeAnalysisController.java
View File

@ -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();
}
}

8
ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
View File

@ -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());