Commit 3f122eb8 authored by 黎博's avatar 黎博

修改isActive类型

parent bc114421
...@@ -28,7 +28,7 @@ public class DockerProjectController { ...@@ -28,7 +28,7 @@ public class DockerProjectController {
* @return * @return
*/ */
@GetMapping("/list") @GetMapping("/list")
public JsonResult getDockerProjectList(String projectName, String projectType, boolean isActive, public JsonResult getDockerProjectList(String projectName, String projectType, Integer isActive,
@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, pageNum, pageSize);
......
...@@ -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, boolean isActive); IPage<DockerProject> getDockerProjectList(IPage<DockerProject> page, String projectName, String projectType, Integer isActive);
} }
...@@ -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, boolean isActive, Integer pageNum, Integer pageSize); IPage<DockerProject> getDockerProjectList(String projectName, String projectType, Integer isActive, Integer pageNum, Integer pageSize);
} }
...@@ -25,7 +25,7 @@ public class DockerProjectServiceImpl extends ServiceImpl<DockerProjectMapper, D ...@@ -25,7 +25,7 @@ public class DockerProjectServiceImpl extends ServiceImpl<DockerProjectMapper, D
* @return * @return
*/ */
@Override @Override
public IPage<DockerProject> getDockerProjectList(String projectName, String projectType, boolean isActive, Integer pageNum, Integer pageSize) { public IPage<DockerProject> getDockerProjectList(String projectName, String projectType, Integer isActive, 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);
} }
......
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