Browse Source

优化删除部分逻辑

hushuyu 5 tháng trước cách đây
mục cha
commit
2a62dec237

+ 2 - 0
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/repository/CourseProjectRepository.java

@@ -25,4 +25,6 @@ public interface CourseProjectRepository extends JpaRepository<CourseProject, In
      * @return List
      */
     List<CourseProject> findByCourse_IdAndIsPublic(Long course_id, Boolean isPublic);
+
+    CourseProject findCourseProjectsByProjectId(Integer projectId);
 }

+ 11 - 2
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/serviceImpl/ProjectServiceImpl.java

@@ -5,6 +5,7 @@ import cn.seecoder.seecoderportalcommon.vo.UserVO;
 import cn.seecoder.seecoderportalserver.domain.CourseProject;
 import cn.seecoder.seecoderportalserver.mapper.CourseMapper;
 import cn.seecoder.seecoderportalserver.repository.CourseProjectRepository;
+import cn.seecoder.seecoderportalserver.security.DomainUserDetails;
 import cn.seecoder.seecoderportalserver.security.SecurityUtils;
 import cn.seecoder.seecoderportalserver.service.CourseService;
 import cn.seecoder.seecoderportalserver.service.GroupService;
@@ -188,8 +189,16 @@ public class ProjectServiceImpl implements ProjectService {
     @Override
     @Transactional(rollbackFor = RuntimeException.class)
     public JSONObject deleteProject(Integer projectId) {
-        courseProjectRepository.deleteById(projectId);
-        return devcloudService.deleteProject(projectId);
+        JSONObject devcloudResult = devcloudService.deleteProject(projectId);
+        if (devcloudResult != null && devcloudResult.containsKey("code") && devcloudResult.getInteger("code") == 200) {
+            courseProjectRepository.deleteById(projectId);
+            JSONObject result = new JSONObject();
+            result.put("message", "Delete project successfully");
+            return result;
+        }
+        JSONObject errorResult = new JSONObject();
+        errorResult.put("message", "Delete project failed");
+        return errorResult;
     }
 
     @Override

+ 0 - 1
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/web/rest/UserController.java

@@ -57,7 +57,6 @@ public class UserController {
     @GetMapping("/getInfo")
     public OkResponse<UserVO> getUserInfo() {
         DomainUserDetails user = SecurityUtils.getCurrentUser();
-//        return OkResponse.of(userMapper.domainToUserVO(user));
         return OkResponse.of(userService.getInfo(user.getId()));
     }