Merge pull request CloudOrc#190 from limingoo/dev

fix：185
dlimeng · Sep 27, 2023 · 5e4f316 · 5e4f316
2 parents a60d71c + 472d1e0
commit 5e4f316
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/...ui-entrance/src/main/java/com/cloudorc/solidui/entrance/controller/ProjectController.java b/...ui-entrance/src/main/java/com/cloudorc/solidui/entrance/controller/ProjectController.java
@@ -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);
     }
 
 

diff --git a/solidui-entrance/src/main/java/com/cloudorc/solidui/entrance/service/ProjectService.java b/solidui-entrance/src/main/java/com/cloudorc/solidui/entrance/service/ProjectService.java
@@ -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);
 

diff --git a/...entrance/src/main/java/com/cloudorc/solidui/entrance/service/impl/ProjectServiceImpl.java b/...entrance/src/main/java/com/cloudorc/solidui/entrance/service/impl/ProjectServiceImpl.java
@@ -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){