Commit a283706a authored by 黎博's avatar 黎博

获取docker项目新增hostName字段

parent 3e48e43c
...@@ -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());
......
...@@ -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);
} }
...@@ -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);
} }
...@@ -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);
} }
} }
...@@ -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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment