接口开发

efunbox-base/efunbox-base-api/src/main/java/cn/efunbox/manage/base/repository/ProductRepository.java

@@ -11,4 +11,6 @@ public interface ProductRepository extends BasicRepository<Product> {
 
     List<Product> findByStatusOrderBySortDesc(BaseStatusEnum status);
 
+    Product findById(String id);
+
 }

efunbox-base/efunbox-base-api/src/main/java/cn/efunbox/manage/base/repository/ProjectRepository.java

@@ -11,4 +11,6 @@ public interface ProjectRepository extends BasicRepository<Project> {
 
 
     List<Project> findByStatusOrderBySortDesc(BaseStatusEnum status);
+
+    Project findById(String id);
 }

efunbox-base/efunbox-base-api/src/main/java/cn/efunbox/manage/base/service/DepartmentService.java

@@ -14,4 +14,6 @@ public interface DepartmentService {
     ApiResult update(Department department);
 
     ApiResult getDeptChild(Long deptId);
+
+    ApiResult getDeptById(Long deptId);
 }

efunbox-base/efunbox-base-api/src/main/java/cn/efunbox/manage/base/service/ProductService.java

@@ -10,4 +10,6 @@ public interface ProductService {
     ApiResult save(Product product);
 
     ApiResult update(Product product);
+
+    ApiResult getProductById(String productId);
 }

efunbox-base/efunbox-base-api/src/main/java/cn/efunbox/manage/base/service/ProjectService.java

@@ -10,4 +10,6 @@ public interface ProjectService {
     ApiResult save(Project project);
 
     ApiResult update(Project project);
+
+    ApiResult getProjectById(String projectId);
 }

efunbox-base/efunbox-base-api/src/main/java/cn/efunbox/manage/base/service/impl/DepartmentServiceImpl.java

@@ -7,6 +7,7 @@ import cn.efunbox.manage.base.service.DepartmentService;
 import cn.efunbox.manage.base.vo.DeptTreeVO;
 import cn.efunbox.manage.common.result.ApiCode;
 import cn.efunbox.manage.common.result.ApiResult;
+import cn.efunbox.manage.common.utils.SnowflakeIdUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -40,6 +41,10 @@ public class DepartmentServiceImpl implements DepartmentService {
 
     @Override
     public ApiResult save(Department department) {
+        if(department ==null){
+            return ApiResult.error(ApiCode.PARAMETER_ERROR);
+        }
+        department.setId(SnowflakeIdUtil.getSnowflakeIdUtil().nextId());
         department = departmentRepository.save(department);
         if(Objects.nonNull(department)){
             return ApiResult.ok(department);
@@ -49,6 +54,9 @@ public class DepartmentServiceImpl implements DepartmentService {
 
     @Override
     public ApiResult update(Department department) {
+        if(department ==null){
+            return ApiResult.error(ApiCode.PARAMETER_ERROR);
+        }
         department = departmentRepository.update(department);
         if(Objects.nonNull(department)){
             return ApiResult.ok(department);
@@ -65,6 +73,18 @@ public class DepartmentServiceImpl implements DepartmentService {
         return ApiResult.ok(departments);
     }
 
+    @Override
+    public ApiResult getDeptById(Long deptId) {
+        if(Objects.isNull(deptId)){
+            return ApiResult.error(ApiCode.PARAMETER_ERROR);
+        }
+        Department department = departmentRepository.find(deptId);
+        if(department ==null){
+            return ApiResult.error(ApiCode.NOT_FOUND);
+        }
+        return ApiResult.ok(department);
+    }
+
     private DeptTreeVO recursiveTree(Long cid) {
         Department department = departmentRepository.find(cid);
         DeptTreeVO node = new DeptTreeVO();

efunbox-base/efunbox-base-api/src/main/java/cn/efunbox/manage/base/service/impl/ProductServiceImpl.java

@@ -33,6 +33,9 @@ public class ProductServiceImpl implements ProductService {
 
     @Override
     public ApiResult save(Product product) {
+        if(product ==null){
+            return ApiResult.error(ApiCode.PARAMETER_ERROR);
+        }
         product = productRepository.save(product);
         if(Objects.nonNull(product)){
             return ApiResult.ok(product);
@@ -42,10 +45,25 @@ public class ProductServiceImpl implements ProductService {
 
     @Override
     public ApiResult update(Product product) {
+        if(product ==null){
+            return ApiResult.error(ApiCode.PARAMETER_ERROR);
+        }
         product = productRepository.update(product);
         if(Objects.nonNull(product)){
             return ApiResult.ok(product);
         }
         return ApiResult.error(ApiCode.UNKNOWN_ERROR);
     }
+
+    @Override
+    public ApiResult getProductById(String productId) {
+        if(Objects.isNull(productId)){
+            return ApiResult.error(ApiCode.PARAMETER_ERROR);
+        }
+        Product product = productRepository.findById(productId);
+        if(product ==null){
+            return ApiResult.error(ApiCode.NOT_FOUND);
+        }
+        return ApiResult.ok(product);
+    }
 }

efunbox-base/efunbox-base-api/src/main/java/cn/efunbox/manage/base/service/impl/ProjectServiceImpl.java

@@ -24,7 +24,7 @@ public class ProjectServiceImpl implements ProjectService {
 
     @Override
     public ApiResult list(Project project) {
-        List<Project> projects = projectRepository.findByStatusOrderBySortDesc(BaseStatusEnum.NORMAL);
+        List<Project> projects = projectRepository.find(project);
         if(Objects.nonNull(projects)){
             return ApiResult.ok(projects);
         }
@@ -48,4 +48,16 @@ public class ProjectServiceImpl implements ProjectService {
         }
         return ApiResult.error(ApiCode.UNKNOWN_ERROR);
     }
+
+    @Override
+    public ApiResult getProjectById(String projectId) {
+        if(Objects.isNull(projectId)){
+            return ApiResult.error(ApiCode.PARAMETER_ERROR);
+        }
+        Project project = projectRepository.findById(projectId);
+        if(project ==null){
+            return ApiResult.error(ApiCode.NOT_FOUND);
+        }
+        return ApiResult.ok(project);
+    }
 }

efunbox-base/efunbox-base-web/src/main/java/cn/efunbox/manage/base/controller/DepartmentController.java

@@ -1,11 +1,10 @@
 package cn.efunbox.manage.base.controller;
 
+import cn.efunbox.manage.base.entity.Department;
 import cn.efunbox.manage.base.service.DepartmentService;
 import cn.efunbox.manage.common.result.ApiResult;
 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 org.springframework.web.bind.annotation.*;
 
 /**
  * DepartmentController
@@ -27,4 +26,19 @@ public class DepartmentController {
     public ApiResult child(Long deptId){
         return departmentService.getDeptChild(deptId);
     }
+
+    @GetMapping("/{id}")
+    public ApiResult findById(@PathVariable(name = "id") Long deptId){
+        return departmentService.getDeptById(deptId);
+    }
+
+    @PostMapping
+    public ApiResult save(Department department){
+        return departmentService.save(department);
+    }
+
+    @PutMapping
+    public ApiResult update(Department department){
+        return departmentService.update(department);
+    }
 }

efunbox-base/efunbox-base-web/src/main/java/cn/efunbox/manage/base/controller/ProductController.java

@@ -0,0 +1,41 @@
+package cn.efunbox.manage.base.controller;
+
+import cn.efunbox.manage.base.entity.Product;
+import cn.efunbox.manage.base.service.ProductService;
+import cn.efunbox.manage.common.result.ApiResult;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * ProductController
+ * Created by wangys on 2019/03/12
+ */
+@RestController
+@RequestMapping("/product")
+public class ProductController {
+
+    @Autowired
+    ProductService productService;
+
+    @PostMapping
+    public ApiResult save(Product product){
+        return productService.save(product);
+    }
+
+    @PutMapping
+    public ApiResult update(Product product){
+        return productService.update(product);
+    }
+
+    @GetMapping
+    public ApiResult list(Product product){
+        return productService.list(product);
+    }
+
+
+    @GetMapping("/{id}")
+    public ApiResult findById(@PathVariable(name = "id") String productId){
+        return productService.getProductById(productId);
+    }
+
+}

efunbox-base/efunbox-base-web/src/main/java/cn/efunbox/manage/base/controller/ProjectController.java

@@ -0,0 +1,40 @@
+package cn.efunbox.manage.base.controller;
+
+import cn.efunbox.manage.base.entity.Project;
+import cn.efunbox.manage.base.service.ProjectService;
+import cn.efunbox.manage.common.result.ApiResult;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * ProjectController
+ * Created by wangys on 2019/03/12
+ */
+@RestController
+@RequestMapping("/project")
+public class ProjectController {
+
+    @Autowired
+    ProjectService projectService;
+
+    @PostMapping
+    public ApiResult save(Project project){
+        return projectService.save(project);
+    }
+
+    @PutMapping
+    public ApiResult update(Project project){
+        return projectService.update(project);
+    }
+
+    @GetMapping
+    public ApiResult list(Project project){
+        return projectService.list(project);
+    }
+
+
+    @GetMapping("/{id}")
+    public ApiResult findById(@PathVariable(name = "id") String projectId){
+        return projectService.getProjectById(projectId);
+    }
+}