增加评论相关接口

src/main/java/org/rcisoft/business/bchapter/controller/BChapterController.java

@@ -113,15 +113,14 @@ public class BChapterController extends PaginationController<BChapter> {
                 MessageConstant.MESSAGE_ALERT_ERROR,
                 map);
     }
-    @ApiOperation(value = "查询章节带进度", notes = "根据lessonId查询章节带进度")
+    @ApiOperation(value = "205 查询章节带进度", notes = "根据lessonId查询章节带进度")
     @GetMapping(value = "/queryBChaptersWithProgress")
     public Result queryBChaptersWithProgress(CurUser curUser,@Valid QueryChapterListDTO param,BindingResult br) {
         Map<String, Object> map = new HashedMap();
-        map.put("chapterList", bChapterService.queryBChaptersWithProgress(param));
         return Result.builder(new PersistModel(1),
                 MessageConstant.MESSAGE_ALERT_SUCCESS,
                 MessageConstant.MESSAGE_ALERT_ERROR,
-                map);
+                bChapterService.queryBChaptersWithProgress(param));
     }
 //
 //    @ApiOperation(value = "更改章节状态", notes = "根据章节ID更改章节状态")

src/main/java/org/rcisoft/business/bchapter/service/BChapterService.java

@@ -8,6 +8,7 @@ import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.core.model.PersistModel;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by gwf on 2017-7-21 15:08:47.
@@ -47,7 +48,7 @@ public interface BChapterService{
     * @param model
     * @return
     */
-    List<QueryChapterListResDTO> queryBChaptersWithProgress(QueryChapterListDTO model);
+    Map queryBChaptersWithProgress(QueryChapterListDTO model);
 
     /**
     * 插入

src/main/java/org/rcisoft/business/bchapter/service/impl/BChapterServiceImpl.java

@@ -84,7 +84,7 @@ public class BChapterServiceImpl implements BChapterService {
         return queryChapterListResDTO(model);
     }
     @Override
-    public List<QueryChapterListResDTO> queryBChaptersWithProgress(QueryChapterListDTO model) {
+    public Map queryBChaptersWithProgress(QueryChapterListDTO model) {
         List<QueryChapterListResDTO> queryChapterListResDTOS =  queryChapterListResDTO(model);
         queryChapterListResDTOS.stream().forEach(queryChapterListResDTO -> {
             queryChapterListResDTO.getChildList().stream().forEach(childList -> {
@@ -94,7 +94,10 @@ public class BChapterServiceImpl implements BChapterService {
                 }
             });
         });
-        return queryChapterListResDTOS;
+        Map map = new HashMap();
+        map.put("chapterList",queryChapterListResDTOS);
+        map.put("lessonInfo",bLessonRepository.selectByPrimaryKey(model.getLessonId()));
+        return map;
     }
 
     /**

src/main/java/org/rcisoft/business/bdiscuss/controller/BDiscussController.java

@@ -36,8 +36,12 @@ public class BDiscussController extends PaginationController<BDiscuss> {
     private BDiscussService bDiscussServiceImpl;
 
 
-    @ApiOperation(value="添加", notes="添加")
-    //@ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = false, dataType = "varchar")})
+    @ApiOperation(value="801  添加", notes="添加")
+    @ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "课程id 修改章节时传入", required = true, dataType = "varchar"),
+            @ApiImplicitParam(name = "lessonId", value = "课程ID", required = true, dataType = "varchar"),
+            @ApiImplicitParam(name = "content", value = "评论内容", required = true, dataType = "varchar"),
+            @ApiImplicitParam(name = "pid", value = "上一级（评论别人的评论需要）", required = true, dataType = "varchar"),
+            @ApiImplicitParam(name = "studentId", value = "评论人id", required = true, dataType = "varchar")})
     @PostMapping(value = "/add")
     public Result add(@Valid BDiscuss bDiscuss, BindingResult bindingResult) {
 //        bDiscuss.setToken(getToken());
@@ -48,6 +52,15 @@ public class BDiscussController extends PaginationController<BDiscuss> {
         bDiscuss);
     }
 
+    @ApiOperation(value="802 根据课程id查询评论集合", notes="根据课程id查询评论")
+    @GetMapping("{lessonId:\\w+}")
+    public Result getDiscussByLessonId(@PathVariable String lessonId) {
+        return Result.builder(new PersistModel(1),
+                MessageConstant.MESSAGE_ALERT_SUCCESS,
+                MessageConstant.MESSAGE_ALERT_ERROR,
+                bDiscussServiceImpl.getDiscussByLessonId(lessonId));
+    }
+
     @ApiOperation(value="逻辑删除", notes="逻辑删除")
     @ApiImplicitParams({@ApiImplicitParam(name = "id", value = "id", required = false, dataType = "varchar")})
     @DeleteMapping("/delete/{id:\\w+}")
@@ -83,11 +96,5 @@ public class BDiscussController extends PaginationController<BDiscuss> {
         bDiscussServiceImpl.findById(id));
     }
 
-    @ApiOperation(value="查看  集合", notes="查看  集合")
-    @GetMapping(value = "/queryBDiscussByPagination")
-    public GridModel listByPagination(BDiscuss bDiscuss) {
-//        bDiscuss.setCreateBy(UserUtil.getUserInfoProp(getToken(),UserUtil.USER_ID));
-        bDiscussServiceImpl.findAllByPagination(getPaginationUtility(), bDiscuss);
-        return getGridModelResponse();
-    }
+
 }

src/main/java/org/rcisoft/business/bdiscuss/dao/BDiscussRepository.java

 package org.rcisoft.business.bdiscuss.dao;
 
+import org.apache.ibatis.annotations.Param;
+import org.rcisoft.business.bdiscuss.dto.BDiscussDto;
 import org.rcisoft.core.base.BaseMapper;
 import org.rcisoft.business.bdiscuss.entity.BDiscuss;
 import org.apache.ibatis.annotations.ResultMap;
@@ -25,5 +27,24 @@ public interface BDiscussRepository extends BaseMapper<BDiscuss> {
             + "</script>")
     @ResultMap(value = "BaseResultMap" )
     List<BDiscuss> queryBDiscusss(BDiscuss bDiscuss);
+
+    @Select("<script> SELECT " +
+            " bd.*, " +
+            " su.NAME AS studentName  " +
+            "FROM " +
+            " b_discuss bd " +
+            " LEFT JOIN s_user su ON su.business_id = bd.student_id  " +
+            "WHERE " +
+            " 1 = 1  " +
+            " AND bd.del_flag = '0'  " +
+            " AND bd.flag = '1' "
+            + "<if test=\"lessonId !=null and lessonId != '' \">and bd.lesson_id = #{lessonId} </if> "
+            + "<if test=\"pid !=null and pid != '' \">and bd.pid = #{pid} </if> "
+            + "<if test=\"pid ==null or pid == '' \">and bd.pid = '-1' </if> "
+
+
+            + "</script>")
+    @ResultMap(value = "BaseResultMapDto" )
+    List<BDiscussDto> getDiscussByLessonId(@Param("lessonId") String lessonId, @Param("pid") String pid);
 }
 

src/main/java/org/rcisoft/business/bdiscuss/dto/BDiscussDto.java

+package org.rcisoft.business.bdiscuss.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.rcisoft.business.bdiscuss.entity.BDiscuss;
+import org.rcisoft.core.entity.IdEntity;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.util.List;
+
+/**
+* Created with  on 2019-9-25 9:03:08.
+*/
+@Data
+public class BDiscussDto extends BDiscuss {
+
+     private List<BDiscussDto> bDiscussChildList;
+
+     private String studentName;
+
+}
+

src/main/java/org/rcisoft/business/bdiscuss/entity/BDiscuss.java

@@ -21,7 +21,6 @@ import java.util.List;
 public class BDiscuss  extends IdEntity<BDiscuss> {
 
 
-
      private String lessonId;
 
      private String pid;
@@ -30,6 +29,8 @@ public class BDiscuss  extends IdEntity<BDiscuss> {
 
      private String level;
 
+     private String studentId;
+
 
 }
 

src/main/java/org/rcisoft/business/bdiscuss/service/BDiscussService.java

 package org.rcisoft.business.bdiscuss.service;
 
+import org.rcisoft.business.bdiscuss.dto.BDiscussDto;
 import org.rcisoft.business.bdiscuss.entity.BDiscuss;
 import org.rcisoft.core.model.PersistModel;
 import org.rcisoft.core.aop.PageUtil;
@@ -48,6 +49,8 @@ public interface BDiscussService {
                                        BDiscuss bDiscuss);
 
 
+    List<BDiscussDto> getDiscussByLessonId(String lessonId);
+
 
 
 }

src/main/java/org/rcisoft/business/bdiscuss/service/impl/BDiscussServiceImpl.java

 package org.rcisoft.business.bdiscuss.service.impl;
 
+import org.rcisoft.business.bdiscuss.dto.BDiscussDto;
 import org.rcisoft.core.util.UserUtil;
 import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.core.model.PersistModel;
@@ -46,6 +47,7 @@ public class BDiscussServiceImpl implements BDiscussService {
         return new PersistModel(line);
     }
 
+
     /**
     * 逻辑删除
     * @param bDiscuss
@@ -98,4 +100,13 @@ public class BDiscussServiceImpl implements BDiscussService {
         return bDiscussRepository.queryBDiscusss(bDiscuss);
     }
 
+    @Override
+    public List<BDiscussDto> getDiscussByLessonId(String lessonId) {
+        List<BDiscussDto> bDiscussList = bDiscussRepository.getDiscussByLessonId(lessonId,"");
+        bDiscussList.stream().forEach(bDiscuss -> {
+            bDiscuss.setBDiscussChildList(bDiscussRepository.getDiscussByLessonId(lessonId,bDiscuss.getBusinessId()));
+        });
+        return bDiscussList;
+    }
+
 }

src/main/java/org/rcisoft/sys/role/controller/SysRoleController.java

@@ -42,10 +42,15 @@ public class SysRoleController extends PaginationController<SysRole> {
 
     @ApiOperation(value="查询全部角色", notes="查询全部角色")
     @GetMapping(value = "/queryRolesAll")
-    public GridModel queryRolesAll(CurUser curUser, @Valid FindRolePaginDTO findRolePaginDTO, BindingResult bindingResult){
+    public Result queryRolesAll(CurUser curUser, @Valid FindRolePaginDTO findRolePaginDTO, BindingResult bindingResult){
         sysRoleServiceImpl.queryRolesAll(findRolePaginDTO);
         GridModel gridModel = getGridModelResponse();
-        return  gridModel;
+        //        return  gridModel;
+        return Result.builder(new PersistModel(1),
+                MessageConstant.MESSAGE_ALERT_SUCCESS,
+                MessageConstant.MESSAGE_ALERT_ERROR,
+                sysRoleServiceImpl.queryRolesAll(findRolePaginDTO));
+
     }
 
     @ApiOperation(value="增加/修改角色", notes="增加/修改角色")

src/main/resources/mapper/business/bdiscuss/mapper/BDiscussMapper.xml

@@ -14,7 +14,24 @@
             <result column="pid" jdbcType="VARCHAR" property="pid"/>
             <result column="content" jdbcType="LONGVARCHAR" property="content"/>
             <result column="level" jdbcType="VARCHAR" property="level"/>
+            <result column="student_id" jdbcType="VARCHAR" property="studentId"/>
     </resultMap>
 
+        <resultMap id="BaseResultMapDto" type="org.rcisoft.business.bdiscuss.dto.BDiscussDto">
+                <id column="business_id" jdbcType="VARCHAR" property="businessId"/>
+                <result column="create_by" jdbcType="VARCHAR" property="createBy"/>
+                <result column="create_date" jdbcType="TIMESTAMP" property="createDate"/>
+                <result column="update_by" jdbcType="VARCHAR" property="updateBy"/>
+                <result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/>
+                <result column="del_flag" jdbcType="VARCHAR" property="delFlag"/>
+                <result column="flag" jdbcType="VARCHAR" property="flag"/>
+                <result column="remarks" jdbcType="VARCHAR" property="remarks"/>
+                <result column="lesson_id" jdbcType="VARCHAR" property="lessonId"/>
+                <result column="pid" jdbcType="VARCHAR" property="pid"/>
+                <result column="content" jdbcType="LONGVARCHAR" property="content"/>
+                <result column="level" jdbcType="VARCHAR" property="level"/>
+                <result column="student_id" jdbcType="VARCHAR" property="studentId"/>
+        </resultMap>
+
     <!--<cache type="${corePackag!}.util.RedisCache"/>-->
 </mapper>
\ No newline at end of file