Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
H
holmes
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
QA
holmes
Commits
a283706a
Commit
a283706a
authored
Sep 16, 2021
by
黎博
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
获取docker项目新增hostName字段
parent
3e48e43c
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
6 deletions
+9
-6
DockerProjectController.java
.../cn/qg/holmes/controller/k8s/DockerProjectController.java
+2
-2
DockerProjectMapper.java
...ain/java/cn/qg/holmes/mapper/k8s/DockerProjectMapper.java
+1
-1
DockerProjectService.java
...n/java/cn/qg/holmes/service/k8s/DockerProjectService.java
+1
-1
DockerProjectServiceImpl.java
.../qg/holmes/service/k8s/impl/DockerProjectServiceImpl.java
+2
-2
DockerProjectMapper.xml
src/main/resources/mapper/k8s/DockerProjectMapper.xml
+3
-0
No files found.
src/main/java/cn/qg/holmes/controller/k8s/DockerProjectController.java
View file @
a283706a
...
@@ -29,10 +29,10 @@ public class DockerProjectController {
...
@@ -29,10 +29,10 @@ public class DockerProjectController {
* @return
* @return
*/
*/
@GetMapping
(
"/list"
)
@GetMapping
(
"/list"
)
public
JsonResult
getDockerProjectList
(
String
projectName
,
String
projectType
,
Integer
isActive
,
public
JsonResult
getDockerProjectList
(
String
projectName
,
String
projectType
,
Integer
isActive
,
String
hostName
,
@RequestParam
(
defaultValue
=
"1"
)
Integer
pageNum
,
@RequestParam
(
defaultValue
=
"1"
)
Integer
pageNum
,
@RequestParam
(
defaultValue
=
"10"
)
Integer
pageSize
)
{
@RequestParam
(
defaultValue
=
"10"
)
Integer
pageSize
)
{
IPage
projectIPage
=
dockerProjectService
.
getDockerProjectList
(
projectName
,
projectType
,
isActive
,
pageNum
,
pageSize
);
IPage
projectIPage
=
dockerProjectService
.
getDockerProjectList
(
projectName
,
projectType
,
isActive
,
hostName
,
pageNum
,
pageSize
);
Map
<
String
,
Object
>
map
=
new
HashMap
<>();
Map
<
String
,
Object
>
map
=
new
HashMap
<>();
map
.
put
(
"total"
,
projectIPage
.
getTotal
());
map
.
put
(
"total"
,
projectIPage
.
getTotal
());
map
.
put
(
"list"
,
projectIPage
.
getRecords
());
map
.
put
(
"list"
,
projectIPage
.
getRecords
());
...
...
src/main/java/cn/qg/holmes/mapper/k8s/DockerProjectMapper.java
View file @
a283706a
...
@@ -6,5 +6,5 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
...
@@ -6,5 +6,5 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
public
interface
DockerProjectMapper
extends
BaseMapper
<
DockerProject
>
{
public
interface
DockerProjectMapper
extends
BaseMapper
<
DockerProject
>
{
IPage
<
DockerProject
>
getDockerProjectList
(
IPage
<
DockerProject
>
page
,
String
projectName
,
String
projectType
,
Integer
isActive
);
IPage
<
DockerProject
>
getDockerProjectList
(
IPage
<
DockerProject
>
page
,
String
projectName
,
String
projectType
,
Integer
isActive
,
String
hostName
);
}
}
src/main/java/cn/qg/holmes/service/k8s/DockerProjectService.java
View file @
a283706a
...
@@ -5,5 +5,5 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
...
@@ -5,5 +5,5 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.baomidou.mybatisplus.extension.service.IService
;
public
interface
DockerProjectService
extends
IService
<
DockerProject
>
{
public
interface
DockerProjectService
extends
IService
<
DockerProject
>
{
IPage
<
DockerProject
>
getDockerProjectList
(
String
projectName
,
String
projectType
,
Integer
isActive
,
Integer
pageNum
,
Integer
pageSize
);
IPage
<
DockerProject
>
getDockerProjectList
(
String
projectName
,
String
projectType
,
Integer
isActive
,
String
hostName
,
Integer
pageNum
,
Integer
pageSize
);
}
}
src/main/java/cn/qg/holmes/service/k8s/impl/DockerProjectServiceImpl.java
View file @
a283706a
...
@@ -25,8 +25,8 @@ public class DockerProjectServiceImpl extends ServiceImpl<DockerProjectMapper, D
...
@@ -25,8 +25,8 @@ public class DockerProjectServiceImpl extends ServiceImpl<DockerProjectMapper, D
* @return
* @return
*/
*/
@Override
@Override
public
IPage
<
DockerProject
>
getDockerProjectList
(
String
projectName
,
String
projectType
,
Integer
isActive
,
Integer
pageNum
,
Integer
pageSize
)
{
public
IPage
<
DockerProject
>
getDockerProjectList
(
String
projectName
,
String
projectType
,
Integer
isActive
,
String
hostName
,
Integer
pageNum
,
Integer
pageSize
)
{
IPage
<
DockerProject
>
page
=
new
Page
<>(
pageNum
,
pageSize
);
IPage
<
DockerProject
>
page
=
new
Page
<>(
pageNum
,
pageSize
);
return
dockerProjectMapper
.
getDockerProjectList
(
page
,
projectName
,
projectType
,
isActive
);
return
dockerProjectMapper
.
getDockerProjectList
(
page
,
projectName
,
projectType
,
isActive
,
hostName
);
}
}
}
}
src/main/resources/mapper/k8s/DockerProjectMapper.xml
View file @
a283706a
...
@@ -14,6 +14,9 @@
...
@@ -14,6 +14,9 @@
<if
test=
"isActive != null"
>
<if
test=
"isActive != null"
>
AND `is_active` = #{isActive}
AND `is_active` = #{isActive}
</if>
</if>
<if
test=
"hostName != null and hostName !=''"
>
AND `host_name` like CONCAT('%', #{hostName}, '%')
</if>
ORDER BY `id` DESC
ORDER BY `id` DESC
</select>
</select>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment