Browse Source

fix lesson api cms

huodongdong 7 years ago
parent
commit
fc7f9598dd

+ 5 - 4
rankin-cms-web/src/main/java/cn/rankin/cmsweb/controller/product/LessonController.java

@@ -6,6 +6,7 @@ import cn.rankin.common.utils.api.page.Page;
 import cn.rankin.data.api.product.dto.LessonDTO;
 import cn.rankin.common.utils.dto.search.SearchDTO;
 import cn.rankin.common.utils.util.BeanUtil;
+import cn.rankin.data.api.product.entity.Lesson;
 import cn.rankin.data.api.product.vo.LessonVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -20,22 +21,22 @@ public class LessonController {
     private LessonService lessonService;
 
     @RequestMapping(value = "/list", method = RequestMethod.GET)
-    public APIResult<Page<LessonVo>> getLessonList(SearchDTO searchDTO) {
+    public APIResult<Page<Lesson>> getLessonList(SearchDTO searchDTO) {
         return lessonService.search(BeanUtil.convertToMap(searchDTO));
     }
 
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)
-    public APIResult<LessonVo> getLesson(@PathVariable("id") String id) {
+    public APIResult<Lesson> getLesson(@PathVariable("id") String id) {
         return lessonService.getLesson(id);
     }
 
     @RequestMapping(method = RequestMethod.POST)
-    public APIResult<LessonVo> create(@Valid @RequestBody LessonDTO lessonDTO) {
+    public APIResult<Lesson> create(@Valid @RequestBody LessonDTO lessonDTO) {
         return lessonService.create(lessonDTO);
     }
 
     @RequestMapping(method = RequestMethod.PUT)
-    public APIResult<LessonVo> update(@Valid @RequestBody LessonDTO lessonDTO) {
+    public APIResult<Lesson> update(@Valid @RequestBody LessonDTO lessonDTO) {
         return lessonService.update(lessonDTO);
     }
 

+ 5 - 5
rankin-cms-web/src/main/java/cn/rankin/cmsweb/service/product/LessonService.java

@@ -3,7 +3,7 @@ package cn.rankin.cmsweb.service.product;
 import cn.rankin.common.utils.api.model.APIResult;
 import cn.rankin.common.utils.api.page.Page;
 import cn.rankin.data.api.product.dto.LessonDTO;
-import cn.rankin.data.api.product.vo.LessonVo;
+import cn.rankin.data.api.product.entity.Lesson;
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
@@ -13,16 +13,16 @@ import java.util.Map;
 public interface LessonService {
 
     @RequestMapping(value = "/lesson/list", method = RequestMethod.GET)
-    APIResult<Page<LessonVo>> search(@RequestParam Map<String, Object> searchDTO);
+    APIResult<Page<Lesson>> search(@RequestParam Map<String, Object> searchDTO);
 
     @RequestMapping(value = "/lesson/{id}", method = RequestMethod.GET)
-    APIResult<LessonVo> getLesson(@PathVariable("id") String id);
+    APIResult<Lesson> getLesson(@PathVariable("id") String id);
 
     @RequestMapping(value = "/lesson", method = RequestMethod.POST)
-    APIResult<LessonVo> create(@RequestBody LessonDTO lessonDTO);
+    APIResult<Lesson> create(@RequestBody LessonDTO lessonDTO);
 
     @RequestMapping(value = "/lesson", method = RequestMethod.PUT)
-    APIResult<LessonVo> update(@RequestBody LessonDTO lessonDTO);
+    APIResult<Lesson> update(@RequestBody LessonDTO lessonDTO);
 
     @RequestMapping(value = "/lesson/{id}", method = RequestMethod.DELETE)
     APIResult delete(@PathVariable("id") String id);