更新课程学习总进度

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

@@ -53,6 +53,15 @@ public interface BChapterService{
     */
     Map queryBChaptersWithProgress(String lessonId, CurUser curUser);
 
+
+    /**
+     *
+     * @param model
+     * @param corpId
+     * @return
+     */
+    List<QueryChapterListResDTO> queryChapterListResDTO(QueryChapterListDTO model, String corpId);
+
     /**
     * 插入
     * @param chapterDTO

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

@@ -118,8 +118,8 @@ public class BChapterServiceImpl implements BChapterService {
         model.setLessonId(lessonId);
         model.setStudentId(curUser.getUserId());
         List<QueryChapterListResDTO> queryChapterListResDTOS = queryChapterListResDTO(model, curUser.getCorpId());
-        int i = 0;
-        int percent = 0;
+//        int i = 0;
+//        int percent = 0;
         for (QueryChapterListResDTO queryChapterListResDTO : queryChapterListResDTOS) {
             for (QueryChapterListResDTO childList : queryChapterListResDTO.getChildList()) {
                 // 遍历学生章节中间表 查询学生观看章节进度
@@ -127,15 +127,21 @@ public class BChapterServiceImpl implements BChapterService {
                 if (null != brStudentChapterList && brStudentChapterList.size() > 0) {
                     childList.setProgress(brStudentChapterList.get(0).getProgress() * 100 + "%");
                     childList.setCurrentLocation(brStudentChapterList.get(0).getCurrentLocation());
-                    percent += brStudentChapterList.get(0).getProgress();
+//                    percent += brStudentChapterList.get(0).getProgress();
                 }
-                i++;
+//                i++;
             }
         }
         Map map = new HashMap();
         DecimalFormat df = new DecimalFormat("0.00");//设置保留位数
         map.put("chapterList", queryChapterListResDTOS);
-        map.put("totalProgress", i == 0 ? "0%" : df.format((float) percent / i) + "%");
+        BLessonPerson bLessonPerson = bLessonPersonRepository.getAppointInTraining(lessonId, curUser.getUserId());
+        if (null != bLessonPerson) {
+            map.put("totalProgress", bLessonPerson.getLearnProgress());
+        }else {
+            map.put("totalProgress", "0%");
+        }
+//        map.put("totalProgress", i == 0 ? "0%" : df.format((float) percent / i) + "%");
         BLesson bLesson = bLessonRepository.selectByPrimaryKey(lessonId);
         if (bLesson == null){
             throw new ServiceException(ResultServiceEnums.LESSON_NOT_EXISTA);
@@ -170,6 +176,7 @@ public class BChapterServiceImpl implements BChapterService {
      * @param model
      * @return
      */
+    @Override
     public List<QueryChapterListResDTO> queryChapterListResDTO(QueryChapterListDTO model, String corpId) {
         Map param = new HashMap<String, Object>();
         if (model.getLessonId() != null && !"".equals(model.getLessonId())) {

src/main/java/org/rcisoft/business/brstudentchapter/controller/BRStudentChapterController.java

@@ -44,7 +44,7 @@ public class BRStudentChapterController extends PaginationController<BRStudentCh
     @PostMapping(value = "/add")
     public Result addOrUpdate(CurUser curUser, @Valid BRStudentChapterDto brStudentChapterDto, BindingResult bindingResult) {
         brStudentChapterDto.setStudentId(curUser.getUserId());
-        PersistModel data = bRStudentChapterServiceImpl.save(brStudentChapterDto);
+        PersistModel data = bRStudentChapterServiceImpl.save(brStudentChapterDto, curUser);
         return Result.builder(data,
             MessageConstant.MESSAGE_ALERT_SUCCESS,
             MessageConstant.MESSAGE_ALERT_ERROR,

src/main/java/org/rcisoft/business/brstudentchapter/service/BRStudentChapterService.java

@@ -4,6 +4,7 @@ import org.rcisoft.business.brstudentchapter.dto.BRStudentChapterDto;
 import org.rcisoft.business.brstudentchapter.entity.BRStudentChapter;
 import org.rcisoft.core.model.PersistModel;
 import org.rcisoft.core.aop.PageUtil;
+import org.rcisoft.sys.user.bean.CurUser;
 
 import java.util.List;
 
@@ -17,7 +18,7 @@ public interface BRStudentChapterService {
     * @param bRStudentChapter
     * @return
     */
-    PersistModel save(BRStudentChapterDto bRStudentChapter);
+    PersistModel save(BRStudentChapterDto bRStudentChapter, CurUser curUser);
 
     /**
     * 根据id查询 

src/main/java/org/rcisoft/business/brstudentchapter/service/impl/BRStudentChapterServiceImpl.java

 package org.rcisoft.business.brstudentchapter.service.impl;
 
 import cn.hutool.core.util.StrUtil;
+import com.netflix.discovery.converters.Auto;
 import org.apache.commons.lang3.StringUtils;
 import org.rcisoft.business.bchapter.dao.BChapterRepository;
+import org.rcisoft.business.bchapter.dto.QueryChapterListDTO;
+import org.rcisoft.business.bchapter.dto.QueryChapterListResDTO;
 import org.rcisoft.business.bchapter.entity.BChapter;
+import org.rcisoft.business.bchapter.service.BChapterService;
 import org.rcisoft.business.blesson.dao.BLessonPersonRepository;
 import org.rcisoft.business.blesson.dto.AddMyLearnLessonDTO;
 import org.rcisoft.business.blesson.entity.BLesson;
@@ -18,6 +22,7 @@ import org.rcisoft.business.brstudentchapter.entity.BRStudentChapter;
 import org.rcisoft.business.brstudentchapter.service.BRStudentChapterService;
 
 
+import org.rcisoft.sys.user.bean.CurUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Isolation;
@@ -45,6 +50,10 @@ public class BRStudentChapterServiceImpl implements BRStudentChapterService {
     private BLessonPersonRepository bLessonPersonRepository;
     @Autowired
     private BChapterRepository bChapterRepository;
+    @Autowired
+    private BChapterService bChapterServiceImpl;
+    @Autowired
+    BRStudentChapterRepository brStudentChapterRepository;
 
     /**
     *
@@ -53,16 +62,43 @@ public class BRStudentChapterServiceImpl implements BRStudentChapterService {
     */
     @Transactional(propagation = Propagation.REQUIRED,isolation = Isolation.DEFAULT)
     @Override
-    public PersistModel save(BRStudentChapterDto brStudentChapterDto){
+    public PersistModel save(BRStudentChapterDto brStudentChapterDto, CurUser curUser){
         int line = 0;
+        DecimalFormat df=new DecimalFormat("0.00");//设置保留位数
         AddMyLearnLessonDTO addMy = new AddMyLearnLessonDTO();
         addMy.setUserId(brStudentChapterDto.getStudentId());
         addMy.setLessonId(brStudentChapterDto.getLessonId());
         List<BLessonPerson>  bLessonPersonList = bLessonPersonRepository.selectByPersonAndLesson(addMy);
+        // 将课程总进度存进数据库
+        QueryChapterListDTO model = new QueryChapterListDTO();
+        model.setLessonId(brStudentChapterDto.getLessonId());
+        model.setStudentId(brStudentChapterDto.getStudentId());
+        List<QueryChapterListResDTO> queryChapterListResDTOS = bChapterServiceImpl.queryChapterListResDTO(model, curUser.getCorpId());
+        int i = 0;
+        int percent = 0;
+        for (QueryChapterListResDTO queryChapterListResDTO : queryChapterListResDTOS) {
+            for (QueryChapterListResDTO childList : queryChapterListResDTO.getChildList()) {
+                // 遍历学生章节中间表 查询学生观看章节进度
+                List<BRStudentChapter> brStudentChapters = brStudentChapterRepository.queryByStuIdAndChapter(childList.getBusinessId(), curUser.getUserId());
+                if (null != brStudentChapters && brStudentChapters.size() > 0) {
+                    childList.setProgress(brStudentChapters.get(0).getProgress() * 100 + "%");
+                    childList.setCurrentLocation(brStudentChapters.get(0).getCurrentLocation());
+                    percent += brStudentChapters.get(0).getProgress();
+                }
+                i++;
+            }
+        }
+        String totalProgress = "";
+        if (i==0){
+            totalProgress = "0%";
+        }else {
+            totalProgress = df.format((float) percent / i) + "%";
+        };
         // 判斷是否已經開始觀看此課程
         if (null != bLessonPersonList && bLessonPersonList.size() >0){
             BLessonPerson bLessonPerson = bLessonPersonList.get(0);
             bLessonPerson.setChapterId(brStudentChapterDto.getChapterId());
+            bLessonPerson.setLearnProgress(totalProgress);  // 保存课程学习进度
             bLessonPersonRepository.updateByPrimaryKeySelective(bLessonPerson);
         }else {
             BLessonPerson bLessonPerson = new BLessonPerson();
@@ -70,11 +106,11 @@ public class BRStudentChapterServiceImpl implements BRStudentChapterService {
             bLessonPerson.setChapterId(brStudentChapterDto.getChapterId());
             bLessonPerson.setPersonId(brStudentChapterDto.getStudentId());
             bLessonPerson.setLessonId(brStudentChapterDto.getLessonId());
+            bLessonPerson.setLearnProgress(totalProgress); // 保存课程学习进度
             bLessonPersonRepository.insertSelective(bLessonPerson);
         }
         // 查詢是否已經開始觀看此章節
         List<BRStudentChapter> brStudentChapterList = bRStudentChapterRepository.queryByStuIdAndChapter(brStudentChapterDto.getChapterId(),brStudentChapterDto.getStudentId());
-        DecimalFormat df=new DecimalFormat("0.00");//设置保留位数
         // 沒有開始看-新增信息
         if (null != brStudentChapterList && brStudentChapterList.size() >0){
             BRStudentChapter brStudentChapter = brStudentChapterList.get(0);
@@ -98,22 +134,19 @@ public class BRStudentChapterServiceImpl implements BRStudentChapterService {
             brStudentChapter.setCurrentLocation(brStudentChapterDto.getCurrent());  // 保存當前學習進度
             if (brStudentChapterDto.getCurrent() == brStudentChapterDto.getDuration()){  // 判断是否已经完成
                 brStudentChapter.setIsComplete("1");
-//                brStudentChapter.setAutomatic("1");
                 brStudentChapter.setProgress(1);
             }else {
                 brStudentChapter.setIsComplete("0");
-//                brStudentChapter.setAutomatic("0");
                 brStudentChapter.setProgress(new BigDecimal((float)brStudentChapterDto.getCurrent()/brStudentChapterDto.getDuration()).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
             }
             line = bRStudentChapterRepository.insertSelective(brStudentChapter);
         }
-        // 更新章节总进度
+        // 获取章节总进度 存库
         BChapter bChapter = bChapterRepository.selectByPrimaryKey(brStudentChapterDto.getChapterId());
         if (null!=bChapter && StringUtils.isNotBlank(bChapter.getBusinessId())){
             bChapter.setCourseTime(brStudentChapterDto.getDuration().toString());
             bChapterRepository.updateByPrimaryKeySelective(bChapter);
         }
-        //增加操作
         return new PersistModel(line);
     }
 

src/main/java/org/rcisoft/common/util/outClient/MTCotactApiRequestClient.java

@@ -14,6 +14,8 @@ import org.rcisoft.common.util.feignDto.*;
 import org.rcisoft.core.exception.ServiceException;
 import org.rcisoft.core.result.ResultServiceEnums;
 import org.rcisoft.core.result.Ret;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.rcisoft.core.util.UserUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -32,7 +34,6 @@ import java.util.*;
 @Component
 public class MTCotactApiRequestClient {
 
-
     public static String zxClientType = "app";
 
     public static Long zxAccountId = (long)1;
@@ -540,8 +541,8 @@ public class MTCotactApiRequestClient {
 
     public void login() {
         Map<String, String> queries = new HashMap<>(1);
-        queries.put("username", "15202226641");
-        queries.put("password", "whh111222");
+        queries.put("username", "18622227181");
+        queries.put("password", "zx111222");
         Map<String, String> headerParams = new HashMap<>(2);
         headerParams.put("clientType", "app");
         String json = okHttpUtil.get(api + "app/login", queries, headerParams);