docker发布

@@ -28,4 +28,6 @@ public class DockerProjectModel {
     private String port;
     private String autodeployflag="0";//1-支持自动发布，0-默认不支持自动发布
 
+    private String projectType;
+
 }

@@ -22,6 +22,7 @@ public interface DockerProjectMapper {
     List<DockerProjectModel>  selectByIdList(@Param("idList") List<Integer> idList);
 
     List<DockerProjectModel>  selectByProjectJobType(@Param("projectJobType") String projectJobType);
+    List<DockerProjectModel>  selectByProjectType(@Param("projectType") String projectType);
     int selectCountByCodition(PageBean req);
 
     List<DockerProjectModel> selectDockerInfosByCodition(PageBean page);

@@ -16,10 +16,15 @@
         <result column="dockeronlineimagestore" property="dockerOnlineImageStore" jdbcType="VARCHAR" />
         <result column="port" property="port" jdbcType="VARCHAR" />
         <result column="autodeployflag" property="autodeployflag" jdbcType="VARCHAR" />
-
+        <result column="projecttype" property="projectType" jdbcType="VARCHAR" />
     </resultMap>
 
 
+    <sql id="Base_Column_List" >
+        id, projectname,projectgitgroup,projectjobtype,dockerprojectname,dockergrayclusterid,dockergraynamespace,
+        dockergrayimagestore,dockeronlineclusterid,dockeronlinenamespace,dockeronlineimagestore,port,autodeployflag,projecttype
+    </sql>
+
     <select id="selectByProjectName"   resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List" />
@@ -28,11 +33,6 @@
         projectname = #{projectName}
     </select>
 
-    <sql id="Base_Column_List" >
-        id, projectname,projectgitgroup,projectjobtype,dockerprojectname,dockergrayclusterid,dockergraynamespace,
-        dockergrayimagestore,dockeronlineclusterid,dockeronlinenamespace,dockeronlineimagestore,port,autodeployflag
-    </sql>
-
     <select id="selectCount"  resultType="java.lang.Integer">
         select
         count(1)
@@ -74,6 +74,21 @@
         </choose>
     </select>
 
+    <select id="selectByProjectType"   resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List" />
+        from docker_project
+        where 1=1
+        <choose>
+            <when test="projectType != null &amp;&amp; projectType !='' " >
+                and  projecttype = #{projectType}
+            </when>
+            <otherwise>
+                and 1=2
+            </otherwise>
+        </choose>
+    </select>
+
     <select id="selectByIdList"   resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List" />
@@ -128,11 +143,11 @@
     <insert id="insertInfo" parameterType="com.model.DockerProjectModel" >
         insert into docker_project
         (projectname,projectgitgroup,projectjobtype,dockerprojectname,dockergrayclusterid,dockergraynamespace,
-        dockergrayimagestore,dockeronlineclusterid,dockeronlinenamespace,dockeronlineimagestore,port,autodeployflag)
+        dockergrayimagestore,dockeronlineclusterid,dockeronlinenamespace,dockeronlineimagestore,port,autodeployflag,projecttype)
         values (#{projectName,jdbcType=VARCHAR}, #{projectGitGroup,jdbcType=VARCHAR}, #{projectJobType,jdbcType=VARCHAR},
               #{dockerProjectName,jdbcType=VARCHAR}, #{dockerGrayClusterId,jdbcType=VARCHAR}, #{dockerGrayNameSpace,jdbcType=VARCHAR},
               #{dockerGrayImageStore,jdbcType=VARCHAR},#{dockerOnlineClusterId,jdbcType=VARCHAR},#{dockerOnlineNameSpace,jdbcType=VARCHAR},
-              #{dockerOnlineImageStore,jdbcType=VARCHAR},#{port,jdbcType=INTEGER},#{autodeployflag,jdbcType=VARCHAR})
+              #{dockerOnlineImageStore,jdbcType=VARCHAR},#{port,jdbcType=INTEGER},#{autodeployflag,jdbcType=VARCHAR},#{projectType,jdbcType=VARCHAR})
     </insert>
     <update id="updateById" parameterType="com.model.DockerProjectModel" >
         update docker_project
@@ -148,7 +163,8 @@
             dockeronlinenamespace = #{dockerOnlineNameSpace,jdbcType=VARCHAR},
             dockeronlineimagestore = #{dockerOnlineImageStore,jdbcType=VARCHAR},
             port = #{port,jdbcType=INTEGER},
-            autodeployflag= #{autodeployflag,jdbcType=VARCHAR}
+            autodeployflag= #{autodeployflag,jdbcType=VARCHAR},
+            projecttype= #{projectType,jdbcType=VARCHAR},
         where id = #{id,jdbcType=INTEGER}
     </update>
 

@@ -19,14 +19,11 @@ public enum DockerJobEnum {
         this.item = item;
     }
 
-    public static List<Map<String,String>> getAll(){
+    public static List<String> getAll(){
         DockerJobEnum[] values = DockerJobEnum.values();
-        List<Map<String,String>> list = Lists.newArrayListWithCapacity(values.length);
-        for(DockerJobEnum val : values){//前端 select的数据格式
-            Map<String,String> map = new HashMap<>();
-            map.put("value",val.item);
-            map.put("text",val.item);
-            list.add(map);
+        List<String> list = Lists.newArrayListWithCapacity(values.length);
+        for(DockerJobEnum val : values){
+            list.add(val.item);
         }
         return list;
 

@@ -13,6 +13,7 @@ import com.monitor.model.response.BaseResponse;
 import com.monitor.model.response.PageResponse;
 import com.monitor.mysql.mapper.DockerProjectMapper;
 import com.monitor.other.maliciousip.ctrl.MaliciousIpController;
+import com.monitor.other.worksystem.contants.DockerJobEnum;
 import com.monitor.other.worksystem.dock.qq.DockerServerDeployService;
 import com.monitor.other.worksystem.model.WebHooksReleaseBO;
 import com.monitor.other.worksystem.service.DockerProjectService;
@@ -64,6 +65,17 @@ public class DockerProjectCtrl {
     private GetUsersInfoUtil getUsersInfoUtil;
 
     /**
+     * 查询docker job type
+     */
+    @RequestMapping("/getDockerProjectJobType")
+    @ResponseBody
+    public BaseResponse<List<String>> getDockerProjectJobType() {
+        BaseResponse<List<String>> rtn =new BaseResponse<List<String>>();
+        rtn.setData(DockerJobEnum.getAll());
+        return rtn;
+    }
+
+    /**
      * 查询docker项目
      */
     @RequestMapping("/getDockerProjectByJobType")
@@ -75,6 +87,15 @@ public class DockerProjectCtrl {
     /**
      * 查询docker项目
      */
+    @RequestMapping("/getDockerProjectByProjectType")
+    @ResponseBody
+    public BaseResponse<List<DockerProjectModel>> getDockerProjectByProjectType(String projectType) {
+        return new BaseResponse<>(dockerProjectService.getDockerProjectByProjectType(projectType));
+    }
+
+    /**
+     * 查询docker项目
+     */
     @RequestMapping("/getDockerProjectByIds")
     @ResponseBody
     public BaseResponse<List<DockerProjectModel>> getDockerProjectByIds(String ids) {

@@ -19,6 +19,8 @@ public interface DockerProjectService {
 
     List<DockerProjectModel> selectByProjectJobType(String projectJobType);
 
+    List<DockerProjectModel> getDockerProjectByProjectType(String projectType);
+
     String jenkinsBuild(DockerJenkinsReq dockerJenkinsReq);
 
     void jenkinsStatusUpdate(String ticketID,String jobID,String status);

@@ -49,6 +49,13 @@ public class DockerProjectServiceImpl implements DockerProjectService {
         return dockerProjectMapper.selectByProjectJobType(projectJobType);
     }
 
+    public List<DockerProjectModel> getDockerProjectByProjectType(String projectType){
+        if(StringUtils.isBlank(projectType)){
+            return new ArrayList<>();
+        }
+        return dockerProjectMapper.selectByProjectType(projectType);
+    }
+
     @Override
     public String jenkinsBuild(DockerJenkinsReq dockerJenkinsReq){
         String deployName=dockerJenkinsReq.getDeployName();