ops / monitor-ui · Commits

Go to a project

Authored by qinchao
Commit 51f309ab63f7041ad6f249d64d4e9ed8cc4441dd 1 parent f825b4b8

docker类型重新分类

Inline Side-by-side
Showing 5 changed files with 23 additions and 20 deletions
1 package com.ui.project; 1 package com.ui.project;
2 2
3 -import java.util.HashMap;  
4 -import java.util.HashSet;  
5 -import java.util.Map;  
6 -import java.util.Set; 3 +import java.util.*;
7 4
8 public class ProjectEnvironment { 5 public class ProjectEnvironment {
9 6
10 private static String[] dockerEnvironments = {"yoho-online","yoho-gray"}; 7 private static String[] dockerEnvironments = {"yoho-online","yoho-gray"};
11 - private static String[] dockerProjectTypes = {"node","java","php","ops","other"}; 8 + //private static String[] dockerProjectTypes = {"node","java","php","ops","other"};
12 private static Map<String,String> map = new HashMap<>(); 9 private static Map<String,String> map = new HashMap<>();
  10 + private static Map<String,String> dockerProjectTypeMap=new LinkedHashMap<>();
13 11
14 static{ 12 static{
15 map.put("aws", "http://172.31.16.167:8883/web/"); 13 map.put("aws", "http://172.31.16.167:8883/web/");
16 map.put("qcloud","http://172.31.16.167:8883/web/"); 14 map.put("qcloud","http://172.31.16.167:8883/web/");
17 map.put("qcloud_gray","http://172.31.16.167:8883/web/"); 15 map.put("qcloud_gray","http://172.31.16.167:8883/web/");
18 map.put("aws_gray","http://172.31.16.167:8883/web/"); 16 map.put("aws_gray","http://172.31.16.167:8883/web/");
  17 +
  18 + dockerProjectTypeMap.put("web","web");
  19 + dockerProjectTypeMap.put("media","media");
  20 + dockerProjectTypeMap.put("ci","核心系统ci");
  21 + dockerProjectTypeMap.put("ops","ops");
19 } 22 }
20 23
21 public static Set<String> getEnviroments(){ 24 public static Set<String> getEnviroments(){
@@ -35,8 +38,8 @@ public class ProjectEnvironment { @@ -35,8 +38,8 @@ public class ProjectEnvironment {
35 return dockerEnvironments; 38 return dockerEnvironments;
36 } 39 }
37 40
38 - public static String[] getDockerProjectTypes(){  
39 - return dockerProjectTypes; 41 + public static Map<String,String> getDockerProjectTypeMap(){
  42 + return dockerProjectTypeMap;
40 } 43 }
41 44
42 } 45 }
@@ -40,7 +40,7 @@ public class DockerBuildCtrl { @@ -40,7 +40,7 @@ public class DockerBuildCtrl {
40 40
41 } 41 }
42 model.addAttribute("environments", ProjectEnvironment.getDockerEnvironments()); 42 model.addAttribute("environments", ProjectEnvironment.getDockerEnvironments());
43 - model.addAttribute("projectTypes", ProjectEnvironment.getDockerProjectTypes()); 43 + model.addAttribute("projectTypes", ProjectEnvironment.getDockerProjectTypeMap());
44 return new ModelAndView("project/docker_project"); 44 return new ModelAndView("project/docker_project");
45 } 45 }
46 46
@@ -199,7 +199,7 @@ public class DockerBuildCtrl { @@ -199,7 +199,7 @@ public class DockerBuildCtrl {
199 199
200 @RequestMapping(value = "/toDockerInfoList") 200 @RequestMapping(value = "/toDockerInfoList")
201 public ModelAndView toDockerInfoList(Model model,DockerJenkinsReq dockerJenkinsReq) { 201 public ModelAndView toDockerInfoList(Model model,DockerJenkinsReq dockerJenkinsReq) {
202 - model.addAttribute("projectTypes", ProjectEnvironment.getDockerProjectTypes()); 202 + model.addAttribute("projectTypes", ProjectEnvironment.getDockerProjectTypeMap());
203 model.addAttribute("projectJobTypes", httpRestClient.defaultGet("/dockerProject/getDockerProjectJobType",BaseResponse.class).getData()); 203 model.addAttribute("projectJobTypes", httpRestClient.defaultGet("/dockerProject/getDockerProjectJobType",BaseResponse.class).getData());
204 return new ModelAndView("project/docker_info"); 204 return new ModelAndView("project/docker_info");
205 } 205 }
@@ -220,7 +220,7 @@ public class DockerBuildCtrl { @@ -220,7 +220,7 @@ public class DockerBuildCtrl {
220 220
221 @RequestMapping("/toEditDockerInfo") 221 @RequestMapping("/toEditDockerInfo")
222 public ModelAndView toEditDockerInfos(Model model) { 222 public ModelAndView toEditDockerInfos(Model model) {
223 - model.addAttribute("projectTypes", ProjectEnvironment.getDockerProjectTypes()); 223 + model.addAttribute("projectTypes", ProjectEnvironment.getDockerProjectTypeMap());
224 model.addAttribute("projectJobTypes", httpRestClient.defaultGet("/dockerProject/getDockerProjectJobType",BaseResponse.class).getData()); 224 model.addAttribute("projectJobTypes", httpRestClient.defaultGet("/dockerProject/getDockerProjectJobType",BaseResponse.class).getData());
225 return new ModelAndView("project/editDockerInfo"); 225 return new ModelAndView("project/editDockerInfo");
226 } 226 }
@@ -101,7 +101,7 @@ @@ -101,7 +101,7 @@
101 <select id="projectType_search" class="form-control"> 101 <select id="projectType_search" class="form-control">
102 <option value="" selected="selected">所有类型</option> 102 <option value="" selected="selected">所有类型</option>
103 <c:forEach items="${projectTypes }" var="projType" > 103 <c:forEach items="${projectTypes }" var="projType" >
104 - <option value="${projType }">${projType }</option> 104 + <option value="${projType.key }">${projType.value }</option>
105 </c:forEach> 105 </c:forEach>
106 </select> 106 </select>
107 </div> 107 </div>
@@ -164,14 +164,14 @@ @@ -164,14 +164,14 @@
164 formatter : function(value, rowData, rowIndex) { 164 formatter : function(value, rowData, rowIndex) {
165 return rowIndex + 1; 165 return rowIndex + 1;
166 } 166 }
167 - },{ 167 + }/*,{
168 title : "项目类型", 168 title : "项目类型",
169 field : "projectType", 169 field : "projectType",
170 width : "10%" 170 width : "10%"
171 - },{ 171 + }*/,{
172 title : "项目名称", 172 title : "项目名称",
173 field : "projectName", 173 field : "projectName",
174 - width : "10%" 174 + width : "15%"
175 }, { 175 }, {
176 title : "项目git所属组", 176 title : "项目git所属组",
177 field : "projectGitGroup", 177 field : "projectGitGroup",
@@ -183,7 +183,7 @@ @@ -183,7 +183,7 @@
183 }, { 183 }, {
184 title : "docker项目名称", 184 title : "docker项目名称",
185 field : "dockerProjectName", 185 field : "dockerProjectName",
186 - width : "10%" 186 + width : "15%"
187 },{ 187 },{
188 title : "自动发布", 188 title : "自动发布",
189 field : "autodeployflag", 189 field : "autodeployflag",
@@ -195,12 +195,12 @@ @@ -195,12 +195,12 @@
195 return "否"; 195 return "否";
196 } 196 }
197 } 197 }
198 - },{ 198 + }/*,{
199 title : "灰度集群", 199 title : "灰度集群",
200 field : "dockerGrayClusterId", 200 field : "dockerGrayClusterId",
201 width : "10%", 201 width : "10%",
202 202
203 - },{ 203 + }*/,{
204 title : "线上集群", 204 title : "线上集群",
205 field : "dockerOnlineClusterId", 205 field : "dockerOnlineClusterId",
206 width : "10%", 206 width : "10%",
@@ -83,11 +83,11 @@ @@ -83,11 +83,11 @@
83 <div class="col-sm-8"> 83 <div class="col-sm-8">
84 <c:forEach items="${projectTypes }" var="projType" varStatus="projTypeStatus"> 84 <c:forEach items="${projectTypes }" var="projType" varStatus="projTypeStatus">
85 <div class="rdio rdio-default" style='display: inline'> 85 <div class="rdio rdio-default" style='display: inline'>
86 - <input type="radio" name="projectTypes" id="${projType }" value="${projType }" 86 + <input type="radio" name="projectTypes" id="${projType.key }" value="${projType.key }"
87 onclick="getProjects()" 87 onclick="getProjects()"
88 <c:if test="${projTypeStatus.index==0}">checked="checked"</c:if> 88 <c:if test="${projTypeStatus.index==0}">checked="checked"</c:if>
89 /> 89 />
90 - <label for="${projType }">${projType }</label>&nbsp;&nbsp;&nbsp; 90 + <label for="${projType.key }">${projType.value }</label>&nbsp;&nbsp;&nbsp;
91 </div> 91 </div>
92 </c:forEach> 92 </c:forEach>
93 </div> 93 </div>
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
15 <div class="col-sm-8"> 15 <div class="col-sm-8">
16 <select id="projectType" name="projectType" class="form-control" style = "width:450px;" > 16 <select id="projectType" name="projectType" class="form-control" style = "width:450px;" >
17 <c:forEach items="${projectTypes }" var="projType" > 17 <c:forEach items="${projectTypes }" var="projType" >
18 - <option value="${projType }">${projType }</option> 18 + <option value="${projType.key }">${projType.value }</option>
19 </c:forEach> 19 </c:forEach>
20 </select> 20 </select>
21 </div> 21 </div>