ops / monitor-ui · Commits

Go to a project

Authored by qinchao
Commit 9f380f686d1c7d9e8cd2164873645ca14ca28d39 1 parent d0e82ece

重绘关键切换拓扑图

Inline Side-by-side
Showing 3 changed files with 41 additions and 15 deletions
@@ -77,11 +77,8 @@ public class TopoSwitchCtrl { @@ -77,11 +77,8 @@ public class TopoSwitchCtrl {
77 Map<String, List<Map<String, Object>>> map = response.getData(); 77 Map<String, List<Map<String, Object>>> map = response.getData();
78 List<Map<String, Object>> awsList = map.get("awsList"); 78 List<Map<String, Object>> awsList = map.get("awsList");
79 List<Map<String, Object>> qcloudList = map.get("qcloudList"); 79 List<Map<String, Object>> qcloudList = map.get("qcloudList");
80 - /*List<Host> grayHostLists=(List<Host>)map.get("grayServerHosts").get(0).get("grayServerHosts");  
81 - List<String> grayHostIps=new ArrayList<>();  
82 - for(Host host:grayHostLists){  
83 - grayHostIps.add(host.getIp());  
84 - }*/ 80 + List<String> grayHostIps=(List<String>)(map.get("grayServerHosts").get(0).get("grayServerHosts"));
  81 +
85 String awsApiNginx = "aws"; 82 String awsApiNginx = "aws";
86 String awsGrayNginx = "aws"; 83 String awsGrayNginx = "aws";
87 String qqApiNginx = "qq"; 84 String qqApiNginx = "qq";
@@ -97,11 +94,22 @@ public class TopoSwitchCtrl { @@ -97,11 +94,22 @@ public class TopoSwitchCtrl {
97 94
98 if (StringUtils.equals("grayapigateway", String.valueOf(apiMap.get("name")))) { 95 if (StringUtils.equals("grayapigateway", String.valueOf(apiMap.get("name")))) {
99 List<String> serverList = (List<String>) apiMap.get("server"); 96 List<String> serverList = (List<String>) apiMap.get("server");
100 - if (serverList.get(0).startsWith("10")) {  
101 - awsGrayNginx = "qq";  
102 - logger.error("awsgrayapigateway is === "+serverList.get(0)); 97 + logger.error("awsgrayapigateway is === "+serverList.get(0));
  98 + boolean grayFlag=false;
  99 + for(String grayIp:grayHostIps){
  100 + if(serverList.get(0).startsWith(grayIp)){
  101 + grayFlag=true;
  102 + break;
  103 + }
  104 + }
  105 + if(grayFlag){
  106 + awsGrayNginx = "gray";
103 }else{ 107 }else{
104 - awsGrayNginx="aws"; 108 + if (serverList.get(0).startsWith("10")) {
  109 + awsGrayNginx = "qq";
  110 + }else{
  111 + awsGrayNginx="aws";
  112 + }
105 } 113 }
106 } 114 }
107 } 115 }
@@ -116,10 +124,22 @@ public class TopoSwitchCtrl { @@ -116,10 +124,22 @@ public class TopoSwitchCtrl {
116 124
117 if (StringUtils.equals("grayapigateway", String.valueOf(apiMap.get("name")))) { 125 if (StringUtils.equals("grayapigateway", String.valueOf(apiMap.get("name")))) {
118 List<String> serverList = (List<String>) apiMap.get("server"); 126 List<String> serverList = (List<String>) apiMap.get("server");
119 - if (serverList.get(0).startsWith("172")) {  
120 - qqGrayNginx = "aws"; 127 + logger.error("qqgrayapigateway is === "+serverList.get(0));
  128 + boolean grayFlag=false;
  129 + for(String grayIp:grayHostIps){
  130 + if(serverList.get(0).startsWith(grayIp)){
  131 + grayFlag=true;
  132 + break;
  133 + }
  134 + }
  135 + if(grayFlag){
  136 + qqGrayNginx = "gray";
121 }else{ 137 }else{
122 - logger.error("qqgrayapigateway is === "+serverList.get(0)); 138 + if (serverList.get(0).startsWith("10")) {
  139 + qqGrayNginx = "qq";
  140 + }else{
  141 + qqGrayNginx="aws";
  142 + }
123 } 143 }
124 } 144 }
125 } 145 }
@@ -250,7 +250,7 @@ @@ -250,7 +250,7 @@
250 </div> 250 </div>
251 251
252 <script src="<%=basePath %>script/common/genarate_left_panel.js"></script> 252 <script src="<%=basePath %>script/common/genarate_left_panel.js"></script>
253 -<script src="<%=basePath %>script/switch.js?v=20171025"></script> 253 +<script src="<%=basePath %>script/switch.js?v=20171025-2"></script>
254 254
255 <script type="text/javascript"> 255 <script type="text/javascript">
256 $("#li_switch").addClass("active open"); 256 $("#li_switch").addClass("active open");
@@ -6,7 +6,7 @@ $(document).ready(function () { @@ -6,7 +6,7 @@ $(document).ready(function () {
6 * 展示画布 和 数据 6 * 展示画布 和 数据
7 * @param resp 7 * @param resp
8 */ 8 */
9 -function drawData_bbbbbbbak(resp) { 9 +/*function drawData_bbbbbbbak(resp) {
10 var data = resp.data; 10 var data = resp.data;
11 11
12 var canvas = document.getElementById('canvas'); 12 var canvas = document.getElementById('canvas');
@@ -118,7 +118,7 @@ function drawData_bbbbbbbak(resp) { @@ -118,7 +118,7 @@ function drawData_bbbbbbbak(resp) {
118 118
119 //创建入口切换按钮 119 //创建入口切换按钮
120 createDnsSwitchButton(data.luaType); 120 createDnsSwitchButton(data.luaType);
121 -} 121 +}*/
122 122
123 /** 123 /**
124 * 展示画布 和 数据 124 * 展示画布 和 数据
@@ -205,6 +205,9 @@ function drawData(resp) { @@ -205,6 +205,9 @@ function drawData(resp) {
205 if('aws' == data.awsGrayNginx){//aws nginx gray 指向aws gateway 205 if('aws' == data.awsGrayNginx){//aws nginx gray 指向aws gateway
206 var link = newLink(scene,awsNginx, awsGateway1,"gray"); 206 var link = newLink(scene,awsNginx, awsGateway1,"gray");
207 link.arrowsRadius = 10; 207 link.arrowsRadius = 10;
  208 + }else if('qq' == data.awsGrayNginx){//aws nginx 指向qq gateway
  209 + var link = newLink(scene,awsNginx, qqGateway1,"gray");
  210 + link.arrowsRadius = 10;
208 }else{//aws nginx 指向qq gateway 211 }else{//aws nginx 指向qq gateway
209 var link = newLink(scene,awsNginx, grayGateway,"gray"); 212 var link = newLink(scene,awsNginx, grayGateway,"gray");
210 link.arrowsRadius = 10; 213 link.arrowsRadius = 10;
@@ -221,6 +224,9 @@ function drawData(resp) { @@ -221,6 +224,9 @@ function drawData(resp) {
221 if('aws' == data.qqGrayNginx){//qq nginx gray 指向aws gateway 224 if('aws' == data.qqGrayNginx){//qq nginx gray 指向aws gateway
222 var link = newLink(scene,qqNginx, awsGateway1,"gray"); 225 var link = newLink(scene,qqNginx, awsGateway1,"gray");
223 link.arrowsRadius = 10; 226 link.arrowsRadius = 10;
  227 + }else if('qq' == data.qqGrayNginx){//aws nginx 指向qq gateway
  228 + var link = newLink(scene,qqNginx, qqGateway1,"gray");
  229 + link.arrowsRadius = 10;
224 }else{//aws nginx 指向qq gateway 230 }else{//aws nginx 指向qq gateway
225 var link = newLink(scene,qqNginx, grayGateway,"gray"); 231 var link = newLink(scene,qqNginx, grayGateway,"gray");
226 link.arrowsRadius = 10; 232 link.arrowsRadius = 10;