小程序:添加日志

src/main/java/com/cirle/scientific/service/impl/CourseAppServiceImpl.java

@@ -87,14 +87,14 @@ public class CourseAppServiceImpl implements CourseAppService {
     public QkjStudyRecordApp saveStudyRecord(String memCard, Long objId, Integer studyAccomplish, Integer objType) {
         QkjStudyRecordApp studyRecordApp = qkjStudyRecordAppDao.findByMemCardAndTypeAndId(memCard, objType, objId);
 
-        if(Objects.isNull(studyRecordApp)){
+        if (Objects.isNull(studyRecordApp)) {
             QkjStudyRecordApp qkjStudyRecordApp = new QkjStudyRecordApp();
             qkjStudyRecordApp.setMemCard(memCard);
             qkjStudyRecordApp.setObjType(objType);
             qkjStudyRecordApp.setObjId(objId);
             qkjStudyRecordApp.setStudyAccomplish(0);
             studyRecordApp = qkjStudyRecordAppDao.save(qkjStudyRecordApp);
-        }else {
+        } else {
             studyRecordApp.setStudyAccomplish(studyAccomplish);
             qkjStudyRecordAppDao.save(studyRecordApp);
         }
@@ -105,7 +105,7 @@ public class CourseAppServiceImpl implements CourseAppService {
     public QkjStudyRecordApp saveRecordProgress(String memCard, Long objId, Integer objType, Integer duration, Integer currentTime) {
         QkjStudyRecordApp studyRecordApp = qkjStudyRecordAppDao.findByMemCardAndTypeAndId(memCard, objType, objId);
 
-        if(Objects.isNull(studyRecordApp)){
+        if (Objects.isNull(studyRecordApp)) {
             QkjStudyRecordApp qkjStudyRecordApp = new QkjStudyRecordApp();
             qkjStudyRecordApp.setMemCard(memCard);
             qkjStudyRecordApp.setObjType(objType);
@@ -114,8 +114,10 @@ public class CourseAppServiceImpl implements CourseAppService {
             qkjStudyRecordApp.setPresentTime(currentTime);
             qkjStudyRecordApp.setStudyAccomplish(0);
             studyRecordApp = qkjStudyRecordAppDao.save(qkjStudyRecordApp);
-        }else {
-            studyRecordApp.setDuration(duration);
+        } else {
+            if(Objects.nonNull(duration) && Objects.equals(duration, 0)){
+                studyRecordApp.setDuration(duration);
+            }
             studyRecordApp.setPresentTime(currentTime);
             qkjStudyRecordAppDao.save(studyRecordApp);
         }
@@ -125,7 +127,7 @@ public class CourseAppServiceImpl implements CourseAppService {
     @Override
     public QkjStudyRecordApp initStudyRecord(String memCard, Long objId, Integer objType) {
         QkjStudyRecordApp studyRecordApp = qkjStudyRecordAppDao.findByMemCardAndTypeAndId(memCard, objType, objId);
-        if(Objects.isNull(studyRecordApp)){
+        if (Objects.isNull(studyRecordApp)) {
             QkjStudyRecordApp qkjStudyRecordApp = new QkjStudyRecordApp();
             qkjStudyRecordApp.setMemCard(memCard);
             qkjStudyRecordApp.setObjType(objType);
@@ -146,14 +148,14 @@ public class CourseAppServiceImpl implements CourseAppService {
         if (byMemCard != null) {
             qkjTqcourseComments.setCommentMemHear(byMemCard.getMemHeadimg());
             String nickName = byMemCard.getMemNickname();
-            if(StringUtils.isBlank(nickName)){
+            if (StringUtils.isBlank(nickName)) {
                 nickName = byMemCard.getMemMobile();
             }
             qkjTqcourseComments.setCommentMemName(nickName);
         }
         try {
             qkjTqcourseCommentsAppDao.save(qkjTqcourseComments);
-        }catch (Exception e){
+        } catch (Exception e) {
             log.error("saveCommonApp e:{}", e);
             return Result.failed(BizCodeEnum.SAVE_COMMONAPP_ERR);
         }
@@ -161,10 +163,10 @@ public class CourseAppServiceImpl implements CourseAppService {
     }
 
     @Override
-    public Map<Integer ,List<QkjQuestionDetailAppDTO>> getRandomQuestion(String memCard) {
+    public Map<Integer, List<QkjQuestionDetailAppDTO>> getRandomQuestion(String memCard) {
         //获取四套试题
         List<Integer> exIds = qkjExaminationAppDao.getByType(1).stream().map(QkjExaminationApp::getId).collect(Collectors.toList());
-        if(CollectionUtil.isEmpty(exIds)){
+        if (CollectionUtil.isEmpty(exIds)) {
             return Collections.emptyMap();
         }
         Random random = new Random();
@@ -174,10 +176,10 @@ public class CourseAppServiceImpl implements CourseAppService {
         //查询这套题是否是刚做过 如果是换一套
         Integer objId = null;
         List<QkjQuestionAnswerApp> answerApps = questionAnswerAppService.findQuestionAnswer(memCard, 2);
-        if(CollectionUtil.isNotEmpty(answerApps)){
+        if (CollectionUtil.isNotEmpty(answerApps)) {
             objId = answerApps.get(0).getObjId();
         }
-        if(Objects.equals(exId, objId)){
+        if (Objects.equals(exId, objId)) {
             getRandomQuestion(memCard);
         }
         return questionnaireService.findQuestionszByExId(exId);