添加课程总数

src/main/java/org/rcisoft/business/bbanner/common/BannerExceptMessage.java

+package org.rcisoft.business.bbanner.common;
+
+public class BannerExceptMessage {
+
+    public static final String NO_DATA = "该数据不存在";
+
+    public static final String MUST_NOT_FILLED = "必填未填写";
+}

src/main/java/org/rcisoft/business/bbanner/service/impl/BBannerServiceImpl.java

 package org.rcisoft.business.bbanner.service.impl;
 
 import org.apache.commons.lang3.StringUtils;
+import org.rcisoft.business.bbanner.common.BannerExceptMessage;
 import org.rcisoft.business.bbanner.dto.AddOrUpdateDTO;
 import org.rcisoft.business.bbanner.dto.BannerInfoRspDTO;
 import org.rcisoft.business.bbanner.dto.FindBannerPaginDTO;
@@ -42,13 +43,13 @@ public class BBannerServiceImpl implements BBannerService {
         int line = 0;
         //外部链接但外部URL为空或长度为0 抛异常
         if ("1".equals(model.getIsExternalLink()) && StringUtils.isEmpty(model.getExternalUrl()))
-            throw new ServiceException("必填项未填写");
+            throw new ServiceException(BannerExceptMessage.MUST_NOT_FILLED);
         //内部链接但类型或课程ID为空或长度为0 抛异常
         if ("0".equals(model.getIsExternalLink()) && (StringUtils.isEmpty(model.getLineType()) || StringUtils.isEmpty(model.getCourseId())))
-            throw new ServiceException("必填项未填写");
+            throw new ServiceException(BannerExceptMessage.MUST_NOT_FILLED);
         if (model.getBusinessId() != null) {
             if (bBannerRepository.selectCountById(model.getBusinessId()) == 0){
-                throw new ServiceException("该数据不存在");
+                throw new ServiceException(BannerExceptMessage.NO_DATA);
             }
             UserUtil.setCurrentMergeOperation(model);
             line = bBannerRepository.updateById(model);
@@ -65,7 +66,7 @@ public class BBannerServiceImpl implements BBannerService {
     @Override
     public PersistModel removeBanner(String id) {
         if (bBannerRepository.selectCountById(id) == 0){
-            throw new ServiceException("该数据不存在");
+            throw new ServiceException(BannerExceptMessage.NO_DATA);
         }
 
         return new PersistModel(1,bBannerRepository.deleteBanner(id));

src/main/java/org/rcisoft/business/blesson/controller/BLessonController.java

@@ -7,11 +7,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.rcisoft.business.bcourse.dto.AllCourseDTO;
 import org.rcisoft.business.bcourse.service.BCourseService;
-import org.rcisoft.business.blesson.dto.AddLessonDTO;
-import org.rcisoft.business.blesson.dto.FindAllLessonDTO;
-import org.rcisoft.business.blesson.dto.FirstPageQueryDTO;
-import org.rcisoft.business.blesson.dto.LessonTrainDTO;
+import org.rcisoft.business.blesson.dto.*;
 import org.rcisoft.business.blesson.entity.BLesson;
+import org.rcisoft.business.blesson.service.BLessonPersonService;
 import org.rcisoft.business.blesson.service.BLessonService;
 import org.rcisoft.common.component.Global;
 import org.rcisoft.common.controller.PaginationController;
@@ -47,6 +45,9 @@ public class BLessonController extends PaginationController<BLesson> {
     @Autowired
     private BCourseService bCourseService;
 
+    @Autowired
+    private BLessonPersonService bLessonPersonService;
+
     @Autowired
     private Global global;
 
@@ -99,6 +100,9 @@ public class BLessonController extends PaginationController<BLesson> {
                 MessageConstant.MESSAGE_ALERT_ERROR,
                 gridModel);
     }
+
+
+
     @ApiOperation(value="605 根据条件分页查询全部课程", notes="根据条件分页查询全部课程")
     @GetMapping(value = "/queryAllBLessonsByPagination")
     public Result queryBLessonsByPagination(CurUser curUser, @Valid FindAllLessonDTO findAllLessonDTO, BindingResult bindingResult) {
@@ -193,4 +197,50 @@ public class BLessonController extends PaginationController<BLesson> {
                 MessageConstant.MESSAGE_ALERT_ERROR,
                 gridModel);
     }
+
+    @ApiOperation(value="613 我发布的课程总数", notes="我发布的课程总数")
+    @GetMapping(value = "/iPublishCount")
+    public Result iPublishCount(CurUser curUser) {
+        String userId = curUser.getUserId();
+        return Result.builder(new PersistModel(1),
+                MessageConstant.MESSAGE_ALERT_SUCCESS,
+                MessageConstant.MESSAGE_ALERT_ERROR,
+                bLessonService.iPublishCount(userId));
+    }
+
+
+
+
+    @ApiOperation(value="614 退出课程", notes="根据ID停用一条记录")
+    @ApiImplicitParam(name = "businessId", value = "退出课程的选课id", required = true, dataType = "varchar")
+    @PostMapping(value = "/quit")
+    public Result quit(CurUser curUser, String businessId, BindingResult bindingResult) {
+        PersistModel data = bLessonPersonService.quit(businessId);
+        return Result.builder(data,
+                MessageConstant.MESSAGE_ALERT_SUCCESS,
+                MessageConstant.MESSAGE_ALERT_ERROR,
+                businessId);
+    }
+
+    @ApiOperation(value="615 分页查询我学习", notes="分页查询我学习")
+    @GetMapping(value = "/queryLearnBLessonsByPagination")
+    public Result queryLearnBLessonsByPagination(CurUser curUser, @Valid ILearnLessonDTO param, BindingResult bindingResult) {
+        String userId = curUser.getUserId();
+        bLessonPersonService.queryLearnBLessonsByPagination(getPaginationUtility(),param,userId);
+        GridModel gridModel = getGridModelResponse();
+        return Result.builder(new PersistModel(1),
+                MessageConstant.MESSAGE_ALERT_SUCCESS,
+                MessageConstant.MESSAGE_ALERT_ERROR,
+                gridModel);
+    }
+
+    @ApiOperation(value="616 我学习的课程总数", notes="我学习的课程总数")
+    @GetMapping(value = "/iLearnLessonCount")
+    public Result iLearnLessonCount(CurUser curUser) {
+        String userId = curUser.getUserId();
+        return Result.builder(new PersistModel(1),
+                MessageConstant.MESSAGE_ALERT_SUCCESS,
+                MessageConstant.MESSAGE_ALERT_ERROR,
+                bLessonPersonService.iLearnLessonCount(userId));
+    }
 }

src/main/java/org/rcisoft/business/blessonperson/controller/BLessonPersonController.java → src/main/java/org/rcisoft/business/blesson/controller/BLessonPersonController.java

-package org.rcisoft.business.blessonperson.controller;
+package org.rcisoft.business.blesson.controller;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.rcisoft.business.blesson.dto.BLessonIPublishDTO;
 import org.rcisoft.business.blesson.entity.BLesson;
-import org.rcisoft.business.blessonperson.dto.ILearnLessonDTO;
-import org.rcisoft.business.blessonperson.entity.BLessonPerson;
-import org.rcisoft.business.blessonperson.service.BLessonPersonService;
+import org.rcisoft.business.blesson.dto.ILearnLessonDTO;
+import org.rcisoft.business.blesson.service.BLessonPersonService;
 import org.rcisoft.common.controller.PaginationController;
 import org.rcisoft.common.model.GridModel;
 import org.rcisoft.core.constant.MessageConstant;
@@ -31,30 +28,6 @@ import javax.validation.Valid;
 @Slf4j
 public class BLessonPersonController extends PaginationController<BLesson> {
 
-    @Autowired
-    private BLessonPersonService bLessonPersonService;
 
-    @ApiOperation(value="901 退出课程", notes="根据ID停用一条记录")
-    @ApiImplicitParam(name = "businessId", value = "退出课程的选课id", required = true, dataType = "varchar")
-    @PostMapping(value = "/quit")
-    public Result remove(CurUser curUser, String businessId, BindingResult bindingResult) {
-        PersistModel data = bLessonPersonService.quit(businessId);
-        return Result.builder(data,
-                MessageConstant.MESSAGE_ALERT_SUCCESS,
-                MessageConstant.MESSAGE_ALERT_ERROR,
-                businessId);
-    }
-
-    @ApiOperation(value="902 分页查询我学习", notes="分页查询我学习")
-    @GetMapping(value = "/queryLearnBLessonsByPagination")
-    public Result queryLearnBLessonsByPagination(CurUser curUser, @Valid ILearnLessonDTO param, BindingResult bindingResult) {
-        String userId = curUser.getUserId();
-        bLessonPersonService.queryLearnBLessonsByPagination(getPaginationUtility(),param,userId);
-        GridModel gridModel = getGridModelResponse();
-        return Result.builder(new PersistModel(1),
-                MessageConstant.MESSAGE_ALERT_SUCCESS,
-                MessageConstant.MESSAGE_ALERT_ERROR,
-                gridModel);
-    }
 
 }

src/main/java/org/rcisoft/business/blessonperson/dao/BLessonPersonRepository.java → src/main/java/org/rcisoft/business/blesson/dao/BLessonPersonRepository.java

-package org.rcisoft.business.blessonperson.dao;
+package org.rcisoft.business.blesson.dao;
 
 import org.apache.ibatis.annotations.*;
 import org.rcisoft.business.blabel.entity.BLabel;
+import org.rcisoft.business.blesson.dto.ILearnCountDTO;
 import org.rcisoft.business.blesson.entity.BLesson;
-import org.rcisoft.business.blessonperson.dto.ILearnLessonDTO;
-import org.rcisoft.business.blessonperson.entity.BLessonPerson;
+import org.rcisoft.business.blesson.dto.ILearnLessonDTO;
 import org.rcisoft.core.base.BaseMapper;
 import org.springframework.stereotype.Repository;
 
@@ -39,4 +39,11 @@ public interface BLessonPersonRepository extends BaseMapper<BLabel> {
     @Update("update b_lesson_label set flag = 0 where business_id = #{id}")
     int quit(String id);
 
+    @Select({"<script>",
+            " select (select COUNT(1)  from b_lesson_person where person_id = #{userId} ) learnAllCount, " +
+                    "(select COUNT(1)  from b_lesson_person where person_id = #{userId} and is_finish = '1') finishCount, " +
+                    "(select COUNT(1)  from b_lesson_person where person_id = #{userId} and is_finish = '0') notFinishCount, " +
+                    "</script>"})
+    ILearnCountDTO iLearnLessonCount(String userId);
+
 }

src/main/java/org/rcisoft/business/blesson/dao/BLessonRepository.java

@@ -6,6 +6,7 @@ import org.rcisoft.business.blabel.entity.BLabel;
 import org.rcisoft.business.blesson.dto.BLessonIPublishDTO;
 import org.rcisoft.business.blesson.dto.FindAllLessonDTO;
 import org.rcisoft.business.blesson.dto.FirstPageQueryDTO;
+import org.rcisoft.business.blesson.dto.IPublishCountDTO;
 import org.rcisoft.business.blesson.entity.BLesson;
 import org.rcisoft.business.blesson.entity.BLessonLabel;
 import org.rcisoft.core.base.BaseMapper;
@@ -249,5 +250,14 @@ public interface BLessonRepository extends BaseMapper<BLesson> {
             "</script>"})
     int closeLesson(BLesson model);
 
+
+    @Select({"<script>",
+            " select (select COUNT(1)  from b_lesson where lecturer_id = #{userId} ) publishAllCount, " +
+                    "(select COUNT(1)  from b_lesson where lecturer_id = #{userId} and release_state = '0') notPublishCount, " +
+                    "(select COUNT(1)  from b_lesson where lecturer_id = #{userId} and release_state = '2') publishedCount, " +
+                    "(select COUNT(1)  from b_lesson where lecturer_id = #{userId} and release_state = '4') closedCount "+
+            "</script>"})
+    IPublishCountDTO iPublishCount(String userId);
+
 }
 

src/main/java/org/rcisoft/business/blesson/dto/ILearnCountDTO.java

+package org.rcisoft.business.blesson.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class ILearnCountDTO {
+
+    @ApiModelProperty(value = "我学习全部课程数量")
+    private String learnAllCount;
+
+    @ApiModelProperty(value = "我学完课程数量")
+    private String finishCount;
+
+    @ApiModelProperty(value = "我未学完课程数量")
+    private String notFinishCount;
+
+}

src/main/java/org/rcisoft/business/blessonperson/dto/ILearnLessonDTO.java → src/main/java/org/rcisoft/business/blesson/dto/ILearnLessonDTO.java

-package org.rcisoft.business.blessonperson.dto;
+package org.rcisoft.business.blesson.dto;
 
 
 import io.swagger.annotations.ApiModelProperty;

src/main/java/org/rcisoft/business/blessonperson/dto/ILearnLessonRspDTO.java → src/main/java/org/rcisoft/business/blesson/dto/ILearnLessonRspDTO.java

-package org.rcisoft.business.blessonperson.dto;
+package org.rcisoft.business.blesson.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

src/main/java/org/rcisoft/business/blesson/dto/IPublishCountDTO.java

+package org.rcisoft.business.blesson.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class IPublishCountDTO {
+
+    @ApiModelProperty(value = "我发布全部课程数量")
+    private String publishAllCount;
+
+    @ApiModelProperty(value = "我发布未发布课程数量")
+    private String notPublishCount;
+
+    @ApiModelProperty(value = "我发布已发布课程数量")
+    private String publishedCount;
+
+    @ApiModelProperty(value = "我发布已关闭课程数量")
+    private String closedCount;
+}

src/main/java/org/rcisoft/business/blessonperson/entity/BLessonPerson.java → src/main/java/org/rcisoft/business/blesson/entity/BLessonPerson.java

-package org.rcisoft.business.blessonperson.entity;
+package org.rcisoft.business.blesson.entity;
 
 
 import io.swagger.annotations.ApiModelProperty;

src/main/java/org/rcisoft/business/blessonperson/service/BLessonPersonService.java → src/main/java/org/rcisoft/business/blesson/service/BLessonPersonService.java

-package org.rcisoft.business.blessonperson.service;
+package org.rcisoft.business.blesson.service;
 
+import org.rcisoft.business.blesson.dto.ILearnCountDTO;
 import org.rcisoft.business.blesson.entity.BLesson;
-import org.rcisoft.business.blessonperson.dto.ILearnLessonDTO;
+import org.rcisoft.business.blesson.dto.ILearnLessonDTO;
 import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.core.model.PersistModel;
 
@@ -25,4 +26,11 @@ public interface BLessonPersonService {
      * @return
      */
     List<BLesson> queryLearnBLessonsByPagination(PageUtil pageUtil, ILearnLessonDTO model, String userId);
+
+    /**
+     * 我学习的课程总数
+     * @param userId
+     * @return
+     */
+    ILearnCountDTO iLearnLessonCount(String userId);
 }

src/main/java/org/rcisoft/business/blesson/service/BLessonService.java

@@ -111,4 +111,11 @@ public interface BLessonService{
      */
     List<BLesson> findLessonTrain(PageUtil pageUtil, LessonTrainDTO lessonTrainDTO);
 
+    /**
+     * 我发布的总数
+     * @param userId
+     * @return
+     */
+    IPublishCountDTO iPublishCount(String userId);
+
 }

src/main/java/org/rcisoft/business/blessonperson/service/impl/BLessonPersonServiceImpl.java → src/main/java/org/rcisoft/business/blesson/service/impl/BLessonPersonServiceImpl.java

-package org.rcisoft.business.blessonperson.service.impl;
+package org.rcisoft.business.blesson.service.impl;
 
+import org.rcisoft.business.blesson.dto.ILearnCountDTO;
 import org.rcisoft.business.blesson.entity.BLesson;
-import org.rcisoft.business.blessonperson.dao.BLessonPersonRepository;
-import org.rcisoft.business.blessonperson.dto.ILearnLessonDTO;
-import org.rcisoft.business.blessonperson.service.BLessonPersonService;
+import org.rcisoft.business.blesson.dao.BLessonPersonRepository;
+import org.rcisoft.business.blesson.dto.ILearnLessonDTO;
+import org.rcisoft.business.blesson.service.BLessonPersonService;
 import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.core.model.PersistModel;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,5 +38,10 @@ public class BLessonPersonServiceImpl implements BLessonPersonService {
         return bLessonPersonRepository.queryLearnBLessons(model, userId);
     }
 
+    @Override
+    public ILearnCountDTO iLearnLessonCount(String userId) {
+        return bLessonPersonRepository.iLearnLessonCount(userId);
+    }
+
 
 }

src/main/java/org/rcisoft/business/blesson/service/impl/BLessonServiceImpl.java

@@ -195,18 +195,9 @@ public class BLessonServiceImpl implements BLessonService {
         return null;
     }
 
-    private Map<String,Object> queryParamHandler(BLesson model){
-        Map param = new HashMap<String, Object>();
-        if(model.getLessonName()!=null)
-            param.put("name","%"+model.getLessonName()+"%");
-        else
-            param.put("name","%%");
-        if(model.getCode()!=null)
-            param.put("code","%"+model.getCode()+"%");
-        else
-            param.put("code","%%");
-        return param;
+    @Override
+    public IPublishCountDTO iPublishCount(String userId) {
+        return bLessonRepository.iPublishCount(userId);
     }
 
-
 }

src/main/resources/application-dev.yml

@@ -14,7 +14,7 @@ server:
 
 druid:
 #  url: jdbc:mysql://127.0.0.1:3306/edu_db0917?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
-  url: jdbc:mysql://127.0.0.1:3306/new_edu_db?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+  url: jdbc:mysql://127.0.0.1:3306/edu_db?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
   #url: jdbc:mysql://120.52.179.75:13318/edu_db?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
   username: root
   password: root

src/main/resources/mapper/business/blessonperson.mapper/BLessonMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.rcisoft.business.blessonperson.dao.BLessonPersonRepository">
+<mapper namespace="org.rcisoft.business.blesson.dao.BLessonPersonRepository">
      <!--<resultMap id="BaseResultMap" type="org.rcisoft.business.blesson.entity.BLesson">-->
           <!--<id column="business_id" jdbcType="VARCHAR" property="businessId"/>-->
           <!--<result column="code" jdbcType="VARCHAR" property="code"/>-->
@@ -19,7 +19,7 @@
           <!--<result column="directionId" jdbcType="VARCHAR" property="directionId"/>-->
      <!--</resultMap>-->
 
-     <resultMap id="BaseResultMap" type="org.rcisoft.business.blessonperson.entity.BLessonPerson">
+     <resultMap id="BaseResultMap" type="org.rcisoft.business.blesson.entity.BLessonPerson">
           <id column="business_id" jdbcType="VARCHAR" property="businessId"/>
           <result column="create_by" jdbcType="VARCHAR" property="createBy"/>
           <result column="create_date" jdbcType="TIMESTAMP" property="createDate"/>