add paper ownerName to paper list

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/logic/impl/PaperLogicImpl.java

@@ -2,7 +2,9 @@ package cn.iselab.mooctest.site.web.logic.impl;
 
 import cn.iselab.mooctest.site.models.Paper;
 import cn.iselab.mooctest.site.models.Task2Case;
+import cn.iselab.mooctest.site.models.User;
 import cn.iselab.mooctest.site.service.PaperService;
+import cn.iselab.mooctest.site.service.UserService;
 import cn.iselab.mooctest.site.web.data.CaseBlockVO;
 import cn.iselab.mooctest.site.web.data.PaperVO;
 import cn.iselab.mooctest.site.web.data.wrapper.PaperVOWrapper;
@@ -29,6 +31,9 @@ public class PaperLogicImpl extends BaseLogic implements PaperLogic {
     @Autowired
     PaperVOWrapper paperVOWrapper;
 
+    @Autowired
+    UserService userService;
+
 
     @Override
     public PaperVO getPaperById(long paperId,Long examId) {
@@ -87,25 +92,13 @@ public class PaperLogicImpl extends BaseLogic implements PaperLogic {
 
     public Page<PaperVO> getPaperList(String keyword, Pageable pageable) {
         Page<Paper> papers=paperService.findAll(pageable, keyword);
-        Page<PaperVO> paperVOS = papers.map(new org.springframework.core.convert.converter.Converter<Paper, PaperVO>() {
-            @Override
-            public PaperVO convert(Paper paper) {
-                return Converter.convert(PaperVO.class,paper);
-            }
-        });
-        return paperVOS;
+        return wrapPaperList(papers);
     }
 
     @Override
     public Page<PaperVO> getPaperListByUserId(long ownerId, String keyword, Pageable pageable) {
         Page<Paper> papers=paperService.findAllByOwnerId(ownerId, keyword, pageable);
-        Page<PaperVO> paperVOS = papers.map(new org.springframework.core.convert.converter.Converter<Paper, PaperVO>() {
-            @Override
-            public PaperVO convert(Paper paper) {
-                return Converter.convert(PaperVO.class,paper);
-            }
-        });
-        return paperVOS;
+        return wrapPaperList(papers);
     }
 
     @Override
@@ -117,4 +110,17 @@ public class PaperLogicImpl extends BaseLogic implements PaperLogic {
         PaperVO paperVO = paperVOWrapper.wrap(paper);
         return paperVO;
     }
+
+    private Page<PaperVO> wrapPaperList(Page<Paper> papers){
+        Page<PaperVO> paperVOS = papers.map(new org.springframework.core.convert.converter.Converter<Paper, PaperVO>() {
+            @Override
+            public PaperVO convert(Paper paper) {
+                PaperVO paperVO = Converter.convert(PaperVO.class,paper);
+                User user = userService.findByUserId(paper.getOwnerId());
+                paperVO.setOwnerName(user.getName());
+                return paperVO;
+            }
+        });
+        return paperVOS;
+    }
 }