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 new file mode 100644 index 000000000..ba862afd2 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/dfm/controller/DoeAnalysisController.java @@ -0,0 +1,56 @@ +package com.ruoyi.dfm.controller; + +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.utils.http.HttpUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.*; + + +/** + * DOE分析控制器 + * + * @author wangwu + */ +@Controller +@RequestMapping("/doeAnalysis.do") +public class DoeAnalysisController extends BaseController { + + private static final Logger log = LoggerFactory.getLogger(DoeAnalysisController.class); + + @Value("${api.doe.GetDataByKeyParam}") + private String getDataByKeyParamUrl; + + /** + * 获取分析页面 + * + * @param mmap + * @return + */ + @GetMapping("") + public String index(ModelMap mmap) { + return "dfm/doeAnalysis"; + } + + /** + * 获取分析页面 + * + * @return + */ + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(@RequestParam("productname") String productname, @RequestParam("version") String version, @RequestParam("dataType") String dataType) { + String apiUrl = apiRootUrl + getDataByKeyParamUrl; + String param = "productname=" + productname +"&version=" + version; + 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); + return getDataTable(null); + } + +} diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 425bb8634..07f472911 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -144,3 +144,10 @@ wait: task: result: inquire=admin: admin + + +api: + root: + url: http://101.133.130.84:8210/ + doe: + GetDataByKeyParam: api/DOEAnalysis/GetDataByKeyParam \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/dfm/dataAnalysis.html b/ruoyi-admin/src/main/resources/templates/dfm/dataAnalysis.html index b9fff3b78..792cf5cb8 100644 --- a/ruoyi-admin/src/main/resources/templates/dfm/dataAnalysis.html +++ b/ruoyi-admin/src/main/resources/templates/dfm/dataAnalysis.html @@ -95,7 +95,7 @@
-
+
diff --git a/ruoyi-admin/src/main/resources/templates/dfm/doeAnalysis.html b/ruoyi-admin/src/main/resources/templates/dfm/doeAnalysis.html new file mode 100644 index 000000000..c92ddb81b --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/dfm/doeAnalysis.html @@ -0,0 +1,113 @@ + + + + + + +
+
+
+
+
+
    +
  • + 板名： +
    • +
  • + 版本： +
    • +
  • + 筛选： + +
    • +
  • +  检索 +
    • +
+
+
+
+ +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/dfm/userList.html b/ruoyi-admin/src/main/resources/templates/dfm/userList.html index c62ac5995..5b93fe490 100644 --- a/ruoyi-admin/src/main/resources/templates/dfm/userList.html +++ b/ruoyi-admin/src/main/resources/templates/dfm/userList.html @@ -150,13 +150,8 @@ pauseOperType = "启用"; userState = 0; } - // actions.push('编辑 '); actions.push('删除 '); actions.push('' + pauseOperType + ' '); - // var more = []; - // more.push("数据权限 "); - // more.push("分配用户"); - // actions.push('更多操作'); return actions.join(''); } } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java index 2b29d2de2..e7ec3c54d 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java @@ -9,6 +9,7 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.WebDataBinder; import org.springframework.web.bind.annotation.InitBinder; import com.github.pagehelper.PageHelper; @@ -32,6 +33,9 @@ public class BaseController { protected final Logger logger = LoggerFactory.getLogger(BaseController.class); + @Value("${api.root.url}") + protected String apiRootUrl; + /** * 将前台传递过来的日期格式的字符串，自动转化为Date类型 */