ops / monitor-ui · Commits

Go to a project

Authored by qinchao
Commit 9a4c1f4d863fbe1fe6cf9b14db87efdb16cddd14 1 parent c0c44385

去掉aws相关的zk

Inline Side-by-side
Showing 8 changed files with 29 additions and 12 deletions
... ... @@ -28,6 +28,7 @@ public class HttpUriContants {
public static String TYPE_QUERY_NODE = "/type/queryNode";
public static String TYPE_QUERY_JAVAAPI = "/type/queryJavaApi";
public static String TYPE_GET_ZKTREE = "/type/queryZk";
public static String TYPE_GET_ZK_LEAF = "/type/queryZkLeaf";
/***
* 主机信息
... ...
... ... @@ -24,6 +24,11 @@ public class CacheInfoCtrl {
@SuppressWarnings("unchecked")
@RequestMapping("/info")
public ModelAndView getCacheInfoInitList(Model model) {
BaseResponse zkListResponse=httpClient.defaultGet(HttpUriContants.TYPE_GET_ZK_LEAF, BaseResponse.class);
if(zkListResponse!=null&&zkListResponse.getCode()==200&&zkListResponse.getData()!=null){
model.addAttribute("zkList",zkListResponse.getData());
}
BaseResponse<List<String>> categories = httpClient.defaultPost(HttpUriContants.GET_CACHE_FUNCTION, null,
BaseResponse.class);
List<String> catList = categories.getData();
... ...
... ... @@ -4,6 +4,7 @@ import com.ui.contants.HttpUriContants;
import com.ui.http.HttpRestClient;
import com.ui.model.BaseResponse;
import com.ui.model.req.DegradeInfoReq;
import com.ui.model.req.TypeInfoReq;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
... ... @@ -12,6 +13,8 @@ import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.servlet.ModelAndView;
import java.util.HashMap;
import java.util.List;
import java.util.stream.Collectors;
/**
* Created by zhaoqi on 2016/8/29 0029.
... ... @@ -25,6 +28,11 @@ public class DegradeInfoCtrl {
@RequestMapping("/info")
public ModelAndView toDegradeList(Model model) {
BaseResponse zkListResponse=httpClient.defaultGet(HttpUriContants.TYPE_GET_ZK_LEAF, BaseResponse.class);
if(zkListResponse!=null&&zkListResponse.getCode()==200&&zkListResponse.getData()!=null){
model.addAttribute("zkList",zkListResponse.getData());
}
BaseResponse degradeFunction = httpClient.defaultPost(HttpUriContants.GET_DEGRADE_FUNCTION,null,BaseResponse.class);
if (degradeFunction.getData() != null){
model.addAttribute("functionPoints",((HashMap)degradeFunction.getData()).get("function"));
... ...
... ... @@ -24,6 +24,11 @@ public class HystrixInfoCtrl {
@SuppressWarnings("unchecked")
@RequestMapping("/info")
public ModelAndView getHystrixInfoInitList(Model model) {
BaseResponse zkListResponse=httpClient.defaultGet(HttpUriContants.TYPE_GET_ZK_LEAF, BaseResponse.class);
if(zkListResponse!=null&&zkListResponse.getCode()==200&&zkListResponse.getData()!=null){
model.addAttribute("zkList",zkListResponse.getData());
}
BaseResponse<List<String>> categories = httpClient.defaultPost(HttpUriContants.GET_HYSTRIX_FUNCTION, null,
BaseResponse.class);
List<String> catList = categories.getData();
... ...
... ... @@ -89,10 +89,9 @@
<div class="input-group" style="float: left;">
<span class="input-group-addon">服务器：</span>
<select id="serverType" name="serverType" class="form-control">
<!-- <option value="all">全部</option> -->
<option value="zookeeper_aws">aws</option>
<option value="zookeeper_qq">qCloud</option>
<option value="gray_qq">gray</option>
<c:forEach items="${zkList}" var="zk">
<option value="${zk.typeName}">${zk.typeName}</option>
</c:forEach>
</select>
</div>
... ...
... ... @@ -90,7 +90,7 @@
<span class="input-group-addon">范围选择：</span>
<select class="form-control" id="choosenCloud">
<option value="qcloud">腾讯云</option>
<option value="aws">AWS</option>
<%--<option value="aws">AWS</option>--%>
</select>
</div>
<button class="btn btn-primary" style="margin-left: 18px;" onclick="compareAll()">对比</button>
... ...
... ... @@ -89,9 +89,9 @@
<div class="input-group" style="float: left;">
<span class="input-group-addon">服务器：</span>
<select id="cloudType" name="cloudType" class="form-control">
<option value="zookeeper_aws">aws</option>
<option value="zookeeper_qq">qCloud</option>
<option value="gray_qq">gray</option>
<c:forEach items="${zkList}" var="zk">
<option value="${zk.typeName}">${zk.typeName}</option>
</c:forEach>
</select>
</div>
<div class="input-group" style="float: left;">
... ...
... ... @@ -89,10 +89,9 @@
<div class="input-group" style="float: left;">
<span class="input-group-addon">服务器：</span>
<select id="serverType" name="serverType" class="form-control">
<!-- <option value="all">全部</option> -->
<option value="zookeeper_aws">aws</option>
<option value="zookeeper_qq">qCloud</option>
<option value="gray_qq">gray</option>
<c:forEach items="${zkList}" var="zk">
<option value="${zk.typeName}">${zk.typeName}</option>
</c:forEach>
</select>
</div>
... ...