Merge remote-tracking branch 'origin/fix-issue#54'

src/main/java/cn/meteor/beyondclouds/modules/project/api/ProjectCategoryApi.java

+package cn.meteor.beyondclouds.modules.project.api;
+
+import cn.meteor.beyondclouds.core.annotation.Anonymous;
+import cn.meteor.beyondclouds.core.api.Response;
+import cn.meteor.beyondclouds.modules.blog.service.IBlogCategoryService;
+import cn.meteor.beyondclouds.modules.project.entity.ProjectCategory;
+import cn.meteor.beyondclouds.modules.project.service.IProjectCategoryService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @author gaoTong
+ * @date 2020/2/12 10:29
+ */
+
+@Api(tags = "项目分类API")
+@RestController
+@RequestMapping("/api")
+public class ProjectCategoryApi {
+
+    private IProjectCategoryService projectCategoryService;
+
+    @Autowired
+    public void setProjectCategoryService(IProjectCategoryService projectCategoryService) {
+        this.projectCategoryService = projectCategoryService;
+    }
+
+    @Anonymous
+    @ApiOperation("获取项目分类列表")
+    @GetMapping("/project/categories")
+    public Response<List<ProjectCategory>> getProjectCategory () {
+        return Response.success(projectCategoryService.getProjectCategory());
+    }
+}

src/main/java/cn/meteor/beyondclouds/modules/project/service/IProjectCategoryService.java

 package cn.meteor.beyondclouds.modules.project.service;
 package cn.meteor.beyondclouds.modules.project.service;
 
 
+import cn.meteor.beyondclouds.core.validation.constraints.NullOrNotBlank;
 import cn.meteor.beyondclouds.modules.project.entity.ProjectCategory;
 import cn.meteor.beyondclouds.modules.project.entity.ProjectCategory;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 
+import java.util.List;
+
 /**
 /**
  * <p>
  * <p>
  * 项目类别表 服务类
  * 项目类别表 服务类
@@ -13,4 +16,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
  */
 public interface IProjectCategoryService extends IService<ProjectCategory> {
 public interface IProjectCategoryService extends IService<ProjectCategory> {
 
 
+    /**
+     * 获取项目分类列表
+     * @return
+     */
+    List<ProjectCategory> getProjectCategory();
+
 }
 }

src/main/java/cn/meteor/beyondclouds/modules/project/service/impl/ProjectCategoryServiceImpl.java

@@ -3,9 +3,12 @@ package cn.meteor.beyondclouds.modules.project.service.impl;
 import cn.meteor.beyondclouds.modules.project.entity.ProjectCategory;
 import cn.meteor.beyondclouds.modules.project.entity.ProjectCategory;
 import cn.meteor.beyondclouds.modules.project.mapper.ProjectCategoryMapper;
 import cn.meteor.beyondclouds.modules.project.mapper.ProjectCategoryMapper;
 import cn.meteor.beyondclouds.modules.project.service.IProjectCategoryService;
 import cn.meteor.beyondclouds.modules.project.service.IProjectCategoryService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
+import java.util.List;
+
 /**
 /**
  * <p>
  * <p>
  * 项目类别表 服务实现类
  * 项目类别表 服务实现类
@@ -17,4 +20,11 @@ import org.springframework.stereotype.Service;
 @Service
 @Service
 public class ProjectCategoryServiceImpl extends ServiceImpl<ProjectCategoryMapper, ProjectCategory> implements IProjectCategoryService {
 public class ProjectCategoryServiceImpl extends ServiceImpl<ProjectCategoryMapper, ProjectCategory> implements IProjectCategoryService {
 
 
+    @Override
+    public List<ProjectCategory> getProjectCategory() {
+        QueryWrapper<ProjectCategory> projectCategoryQueryWrapper = new QueryWrapper<>();
+        projectCategoryQueryWrapper.isNull(true, "parent_id");
+        projectCategoryQueryWrapper.orderByAsc("category_id");
+        return list(projectCategoryQueryWrapper);
+    }
 }
 }