Skip to content

fix：185 #190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 27, 2023
Merged

fix：185 #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
828188a
fix: project background image
limingoo Sep 26, 2023
37c6f60
fix:fix
limingoo Sep 26, 2023
c776131
fix: update image interface
limingoo Sep 27, 2023
472d1e0
Merge branch 'CloudOrc:dev' into dev
limingoo Sep 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions ...ui-entrance/src/main/java/com/cloudorc/solidui/entrance/controller/ProjectController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,26 +80,23 @@ public Result createProject(HttpServletRequest req,
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "project_id", dataTypeClass = int.class, example = "123456"),
@ApiImplicitParam(name = "projectName", value = "project_name", dataTypeClass = String.class),
@ApiImplicitParam(name = "backgroundImage", value = "backgroundImage", dataTypeClass = String.class),
@ApiImplicitParam(name = "description", value = "project_desc", dataTypeClass = String.class)
})
@ResponseStatus(HttpStatus.OK)
@ApiException(UPDATE_PROJECT_ERROR)
@RequestMapping(path = "/{id}", method = RequestMethod.PUT)
public Result updateProject(HttpServletRequest req,
@PathVariable("id") Integer projectId,
@RequestParam("projectName") String projectName,
@RequestParam(value = "projectName", required = false) String projectName,
@RequestParam(value = "backgroundImage", required = false) String backgroundImage,
@RequestParam(value = "description", required = false) String description) {

if(StringUtils.isBlank(projectName)) {
return error(Status.UPDATE_PROJECT_ERROR.getCode(),
Status.UPDATE_PROJECT_ERROR.getMsg());
}

if(projectId == null) {
return error(Status.UPDATE_PROJECT_ERROR.getCode(),
Status.UPDATE_PROJECT_ERROR.getMsg());
}
return projectService.updateProject(projectId, projectName, description);
return projectService.updateProject(projectId, projectName, backgroundImage, description);
}


Expand Down
2 changes: 1 addition & 1 deletion solidui-entrance/src/main/java/com/cloudorc/solidui/entrance/service/ProjectService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public interface ProjectService {

Result createProject(String loginUser, String name, String desc);

Result updateProject(Integer projectId, String name, String desc);
Result updateProject(Integer projectId, String name, String image, String desc);

Result queryProjectListPaging(String searchName, Integer pageNo, Integer pageSize);

Expand Down
13 changes: 10 additions & 3 deletions ...entrance/src/main/java/com/cloudorc/solidui/entrance/service/impl/ProjectServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,15 +71,22 @@ public Result createProject(String loginUser, String name, String desc) {
}

@Override
public Result updateProject(Integer projectId, String name, String desc) {
public Result updateProject(Integer projectId, String name, String image, String desc) {
Project newProject = projectMapper.selectById(projectId);
Result result = new Result();
if (newProject == null) {
putMsg(result, Status.PROJECT_NOT_EXISTS_ERROR);
return result;
}
newProject.setProjectName(name);
newProject.setDescription(desc);
if (name != null){
newProject.setProjectName(name);
}
if (image != null){
newProject.setImage(image);
}
if (desc != null){
newProject.setDescription(desc);
}
newProject.setUpdateTime(new Date());
newProject.setStatus(0);
if(projectMapper.updateById(newProject) > 0){
Expand Down