ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/dto/AddStudySetDTO.java
@@ -11,14 +11,24 @@ public class AddStudySetDTO { @ApiModelProperty("听音选图") private List<StudyListenDTO> studyListen; @ApiModelProperty("听音选图通关率") private String listenRate; @ApiModelProperty("看图选音") private List<StudyLookDTO> studyLook; @ApiModelProperty("看图选音通关率") private String lookRate; @ApiModelProperty("归纳判断") private List<StudyInductionDTO> studyInduction; @ApiModelProperty("归纳判断通关率") private String inductionRate; @ApiModelProperty("有问有答") private List<StudyAnswerDTO> studyAnswer; @ApiModelProperty("有问有答通关率") private String answerRate; @ApiModelProperty("音图相配") private List<StudyPairDTO> studyPair; @ApiModelProperty("音图相配通关率") private String pairRate; @ApiModelProperty("自主游戏") private GameDTO game; @ApiModelProperty("听故事") @@ -35,5 +45,7 @@ private String title; @ApiModelProperty("所属季度") private Integer quarter; @ApiModelProperty("季度通关率") private String quarterRate; } ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/vo/StudyVO.java
@@ -19,17 +19,30 @@ private Integer quarter; @ApiModelProperty(value = "听音选图") private List<StudyListenVO> listen; @ApiModelProperty("听音选图通关率") private String listenRate; @ApiModelProperty(value = "归纳排除") private List<StudyInductionVO> induction; @ApiModelProperty("归纳判断通关率") private String inductionRate; @ApiModelProperty(value = "有问有答") private List<StudyAnswerVO> answer; @ApiModelProperty("有问有答通关率") private String answerRate; @ApiModelProperty(value = "看图选音") private List<StudyLookVO> look; @ApiModelProperty("看图选音通关率") private String lookRate; @ApiModelProperty(value = "音图相配") private List<StudyPairVO> pair; @ApiModelProperty("音图相配通关率") private String pairRate; @ApiModelProperty(value = "自主游戏") private List<GameVO> game; @ApiModelProperty(value = "听故事") private List<StoryVO> story; @ApiModelProperty("季度通关率") private String quarterRate; } ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/config/DatasourceModel.java
@@ -13,20 +13,20 @@ @Data @Component public class DatasourceModel { private String url = "jdbc:mysql://127.0.0.1:10633/dolphin_study?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai"; private String username = "root"; private String password = "HaiTun@2024!"; private String driverClassName = "com.mysql.cj.jdbc.Driver"; private Integer maxActive =20; private Long maxWait = 60000L; private Integer minIdle =5; private Integer initialSize =2; // private String url = "jdbc:mysql://127.0.0.1:3306/dolphin_study?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai"; // private String url = "jdbc:mysql://127.0.0.1:10633/dolphin_study?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai"; // private String username = "root"; // private String password = "root"; // private String password = "HaiTun@2024!"; // private String driverClassName = "com.mysql.cj.jdbc.Driver"; // private Integer maxActive =20; // private Long maxWait = 60000L; // private Integer minIdle =5; // private Integer initialSize =2; private String url = "jdbc:mysql://127.0.0.1:3306/dolphin_study?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai"; private String username = "root"; private String password = "root"; private String driverClassName = "com.mysql.cj.jdbc.Driver"; private Integer maxActive =20; private Long maxWait = 60000L; private Integer minIdle =5; private Integer initialSize =2; } ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java
@@ -1,11 +1,13 @@ package com.ruoyi.study.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.constant.Constants; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.exception.GlobalException; import com.ruoyi.common.core.web.domain.BaseModel; import com.ruoyi.common.core.web.page.PageInfo; import com.ruoyi.common.security.service.TokenService; import com.ruoyi.goods.api.feignClient.GoodsClient; @@ -33,6 +35,8 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; import java.math.BigDecimal; import java.math.RoundingMode; import java.net.MalformedURLException; import java.net.URL; import java.text.SimpleDateFormat; @@ -102,14 +106,12 @@ subjectRecordDetailService.save(tSubjectRecordDetail); return R.ok(); } @Autowired private ICategoryService categoryService; @PostMapping("/storyList") // @ApiOperation(value = "配置学习类型选择故事", tags = {"题目管理"}) public R<PageInfo<TStory>> storyList(@RequestBody ChoiceStory query) { @@ -118,18 +120,18 @@ if (StringUtils.hasLength(query.getName())) { wrapper.like("name", query.getName()); } if (StringUtils.hasLength(query.getCategoryName())){ if (StringUtils.hasLength(query.getCategoryName())) { // 查询分类id包含的 List<Integer> collect = categoryService.lambdaQuery().eq(TCategory::getState, 2) .eq(TCategory::getType,1) .eq(TCategory::getType, 1) .like(TCategory::getName, query.getCategoryName()).list() .stream().map(TCategory::getId).collect(Collectors.toList());// 查询分类id包含的 List<Integer> collect2 = categoryService.lambdaQuery().eq(TCategory::getState, 2) .eq(TCategory::getType,2) .eq(TCategory::getType, 2) .like(TCategory::getName, query.getCategoryName()).list() .stream().map(TCategory::getParentId).collect(Collectors.toList()); collect.addAll(collect2); if (collect.isEmpty()){ if (collect.isEmpty()) { collect.add(-1); } wrapper.in("firstCategory", collect); @@ -150,8 +152,8 @@ TCategory first = categoryService.getById(tSubject.getFirstCategory()); TCategory second = categoryService.getById(tSubject.getSecondCategory()); if (first!=null&& second!=null){ tSubject.setCategoryName(first.getName()+"-"+second.getName()); if (first != null && second != null) { tSubject.setCategoryName(first.getName() + "-" + second.getName()); } } res.setRecords(list); @@ -164,8 +166,8 @@ for (TStory tStory : list1) { TCategory first = categoryService.getById(tStory.getFirstCategory()); TCategory second = categoryService.getById(tStory.getSecondCategory()); if (first!=null&& second!=null){ tStory.setCategoryName(first.getName()+"-"+second.getName()); if (first != null && second != null) { tStory.setCategoryName(first.getName() + "-" + second.getName()); } } res.setRecords(list1); @@ -187,18 +189,18 @@ if (StringUtils.hasLength(query.getName())) { wrapper.like("name", query.getName()); } if (StringUtils.hasLength(query.getCategoryName())){ if (StringUtils.hasLength(query.getCategoryName())) { // 查询分类id包含的 List<Integer> collect = categoryService.lambdaQuery().eq(TCategory::getState, 1) .eq(TCategory::getType,1) .eq(TCategory::getType, 1) .like(TCategory::getName, query.getCategoryName()).list() .stream().map(TCategory::getId).collect(Collectors.toList());// 查询分类id包含的 List<Integer> collect2 = categoryService.lambdaQuery().eq(TCategory::getState, 1) .eq(TCategory::getType,2) .eq(TCategory::getType, 2) .like(TCategory::getName, query.getCategoryName()).list() .stream().map(TCategory::getParentId).collect(Collectors.toList()); collect.addAll(collect2); if (collect.isEmpty()){ if (collect.isEmpty()) { collect.add(-1); } wrapper.in("firstCategory", collect); @@ -218,8 +220,8 @@ TCategory second = categoryService.getById(tSubject.getSecondCategory()); if (first!=null&&second!=null){ tSubject.setCategoryName(first.getName()+"-"+second.getName()); if (first != null && second != null) { tSubject.setCategoryName(first.getName() + "-" + second.getName()); } } res.setRecords(list); @@ -235,8 +237,8 @@ TCategory second = categoryService.getById(tSubject.getSecondCategory()); if (first!=null&&second!=null){ tSubject.setCategoryName(first.getName()+"-"+second.getName()); if (first != null && second != null) { tSubject.setCategoryName(first.getName() + "-" + second.getName()); } if (!tSubject.getError().isEmpty()) { tSubjects.add(tSubject); @@ -251,8 +253,8 @@ TCategory first = categoryService.getById(tSubject.getFirstCategory()); TCategory second = categoryService.getById(tSubject.getSecondCategory()); if (first!=null&&second!=null){ tSubject.setCategoryName(first.getName()+"-"+second.getName()); if (first != null && second != null) { tSubject.setCategoryName(first.getName() + "-" + second.getName()); } } res.setRecords(list2); @@ -267,8 +269,8 @@ TCategory first = categoryService.getById(tSubject.getFirstCategory()); TCategory second = categoryService.getById(tSubject.getSecondCategory()); if (first!=null&&second!=null){ tSubject.setCategoryName(first.getName()+"-"+second.getName()); if (first != null && second != null) { tSubject.setCategoryName(first.getName() + "-" + second.getName()); } if (!tSubject.getError().isEmpty()) { tSubjects3.add(tSubject); @@ -283,8 +285,8 @@ TCategory first = categoryService.getById(tSubject.getFirstCategory()); TCategory second = categoryService.getById(tSubject.getSecondCategory()); if (first!=null&&second!=null){ tSubject.setCategoryName(first.getName()+"-"+second.getName()); if (first != null && second != null) { tSubject.setCategoryName(first.getName() + "-" + second.getName()); } } res.setRecords(list4); @@ -312,6 +314,7 @@ .eq("week", week) .eq("type", type)); one.setQuarter(dto.getQuarter()); one.setQuarterRate(dto.getQuarterRate()); one.setTitle(dto.getTitle()); studyService.updateById(one); GameDTO game = dto.getGame(); @@ -430,6 +433,7 @@ tStudyListen.setIntegral(studyListenDTO.getIntegral()); tStudyListen.setWeek(week); tStudyListen.setIsVip(studyListenDTO.getIsVip()); tStudyListen.setRate(dto.getListenRate()); studyListenService.save(tStudyListen); } studyLookService.remove(new QueryWrapper<TStudyLook>() @@ -446,6 +450,8 @@ tStudyLook.setIntegral(studyLookDTO.getIntegral()); tStudyLook.setWeek(week); tStudyLook.setIsVip(studyLookDTO.getIsVip()); tStudyLook.setRate(dto.getLookRate()); studyLookService.save(tStudyLook); } studyInductionService.remove(new QueryWrapper<TStudyInduction>() @@ -460,6 +466,8 @@ tStudyInduction.setSubject(studyInductionDTO.getSubject()); tStudyInduction.setIntegral(studyInductionDTO.getIntegral()); tStudyInduction.setWeek(week); tStudyInduction.setRate(dto.getInductionRate()); tStudyInduction.setIsVip(studyInductionDTO.getIsVip()); studyInductionService.save(tStudyInduction); } @@ -477,6 +485,8 @@ tStudyAnswer.setAnswerSubject(studyAnswerDTO.getAnswerSubject()); tStudyAnswer.setIntegral(studyAnswerDTO.getIntegral()); tStudyAnswer.setWeek(week); tStudyAnswer.setRate(dto.getAnswerRate()); tStudyAnswer.setIsVip(studyAnswerDTO.getIsVip()); studyAnswerService.save(tStudyAnswer); } @@ -492,6 +502,7 @@ tStudyPair.setSubject(studyPairDTO.getSubject()); tStudyPair.setIntegral(studyPairDTO.getIntegral()); tStudyPair.setWeek(week); tStudyPair.setRate(dto.getPairRate()); tStudyPair.setIsVip(studyPairDTO.getIsVip()); studyPairService.save(tStudyPair); } @@ -500,9 +511,10 @@ } public static void main(String[] args) throws Exception { double temp =1.687; System.err.println((int)temp); double temp = 1.687; System.err.println((int) temp); } /** * 添加周目 * @@ -526,7 +538,7 @@ studyService.saveOrUpdate(tStudy); } // 每次添加周目后需要根据季度来重新排序周目 if (dto.getType() == 1){ if (dto.getType() == 1) { List<TStudy> list1 = studyService.lambdaQuery() .eq(TStudy::getType, 1) .orderByAsc(TStudy::getQuarter) @@ -544,7 +556,7 @@ System.err.println("进入修改"); tStudy.setWeek(i); // 将对应的题目配置修改week List<TGame> games1 = games.stream().filter(e->e.getWeek().equals(tStudy.getWeek())).collect(Collectors.toList()); List<TGame> games1 = games.stream().filter(e -> e.getWeek().equals(tStudy.getWeek())).collect(Collectors.toList()); for (TGame tGame : games1) { tGame.setWeek(i); tGame.setStudyId(tStudy.getId()); @@ -553,7 +565,7 @@ } // 听故事 List<TStoryListen> storyListens1 = storyListens.stream().filter(e->e.getWeek().equals(tStudy.getWeek())).collect(Collectors.toList()); List<TStoryListen> storyListens1 = storyListens.stream().filter(e -> e.getWeek().equals(tStudy.getWeek())).collect(Collectors.toList()); for (TStoryListen tStoryListen : storyListens1) { tStoryListen.setWeek(i); tStoryListen.setStudyId(tStudy.getId()); @@ -561,36 +573,36 @@ } // 听音选图 List<TStudyListen> studyListens1 = studyListens.stream().filter(e->e.getWeek().equals(tStudy.getWeek())).collect(Collectors.toList()); List<TStudyListen> studyListens1 = studyListens.stream().filter(e -> e.getWeek().equals(tStudy.getWeek())).collect(Collectors.toList()); for (TStudyListen tStudyListen : studyListens1) { tStudyListen.setWeek(i); tStudyListen.setStudyId(tStudy.getId()); studyListenService.updateById(tStudyListen); } // 看图选音 List<TStudyLook>studyLooks1 = studyLooks.stream().filter(e->e.getWeek().equals(tStudy.getWeek())).collect(Collectors.toList()); List<TStudyLook> studyLooks1 = studyLooks.stream().filter(e -> e.getWeek().equals(tStudy.getWeek())).collect(Collectors.toList()); for (TStudyLook tStudyLook : studyLooks1) { tStudyLook.setWeek(i); tStudyLook.setStudyId(tStudy.getId()); studyLookService.updateById(tStudyLook); } // 归纳判断 List<TStudyInduction> studyInductions1 = studyInductions.stream().filter(e->e.getWeek().equals(tStudy.getWeek())).collect(Collectors.toList()); List<TStudyInduction> studyInductions1 = studyInductions.stream().filter(e -> e.getWeek().equals(tStudy.getWeek())).collect(Collectors.toList()); for (TStudyInduction tStudyInduction : studyInductions1) { tStudyInduction.setWeek(i); tStudyInduction.setStudyId(tStudy.getId()); System.err.println("归纳判断"+tStudy.getId()); System.err.println("归纳判断" + tStudy.getId()); studyInductionService.updateById(tStudyInduction); } List<TStudyAnswer> studyAnswers1 = studyAnswers.stream().filter(e->e.getWeek().equals(tStudy.getWeek())).collect(Collectors.toList()); List<TStudyAnswer> studyAnswers1 = studyAnswers.stream().filter(e -> e.getWeek().equals(tStudy.getWeek())).collect(Collectors.toList()); for (TStudyAnswer tStudyAnswer : studyAnswers1) { tStudyAnswer.setStudyId(tStudy.getId()); tStudyAnswer.setWeek(i); studyAnswerService.updateById(tStudyAnswer); } List<TStudyPair> studyPairs1 = studyPairs.stream().filter(e->e.getWeek().equals(tStudy.getWeek())).collect(Collectors.toList()); List<TStudyPair> studyPairs1 = studyPairs.stream().filter(e -> e.getWeek().equals(tStudy.getWeek())).collect(Collectors.toList()); for (TStudyPair tStudyPair : studyPairs1) { tStudyPair.setWeek(i); tStudyPair.setStudyId(tStudy.getId()); @@ -678,6 +690,7 @@ if (!list8.isEmpty()) { res.setQuarter(list8.get(0).getQuarter()); res.setTitle(list8.get(0).getTitle()); res.setQuarterRate(list8.get(0).getQuarterRate()); } List<StudyListenVO> listenVOS = new ArrayList<>(); List<GameVO> gameVOS = new ArrayList<>(); @@ -702,7 +715,7 @@ if (StringUtils.hasLength(tStudyListen.getSubject())) { for (String s : tStudyListen.getSubject().split(",")) { TSubject byId = list9.stream().filter(e -> e.getId().equals(Integer.valueOf(s))).findFirst().orElse(null); if (byId!=null){ if (byId != null) { temp.append(byId.getName()).append(","); } } @@ -713,6 +726,7 @@ studyListenVO.setIsVip(tStudyListen.getIsVip()); listenVOS.add(studyListenVO); } res.setListenRate(tStudyListen.getRate()); } // 看音选图 @@ -728,7 +742,7 @@ if (StringUtils.hasLength(tStudyLook.getSubject())) { for (String s : tStudyLook.getSubject().split(",")) { TSubject byId = list9.stream().filter(e -> e.getId().equals(Integer.valueOf(s))).findFirst().orElse(null); if (byId!=null){ if (byId != null) { names.append(byId.getName()).append(","); } String[] split = tStudyLook.getSort().split(","); @@ -745,6 +759,7 @@ studyLookVO1.setIsVip(tStudyLook.getIsVip()); lookVOS.add(studyLookVO1); } res.setLookRate(tStudyLook.getRate()); } // 归纳排除 @@ -759,7 +774,7 @@ for (String s : tStudyInduction.getSubject().split(",")) { String replace = s.replace("-", ""); TSubject byId = list9.stream().filter(e -> e.getId().equals(Integer.valueOf(replace))).findFirst().orElse(null); if (byId!=null){ if (byId != null) { names.append(byId.getName()).append(","); } } @@ -770,6 +785,7 @@ studyInductionVO.setIsVip(tStudyInduction.getIsVip()); inductionVOS.add(studyInductionVO); } res.setInductionRate(tStudyInduction.getRate()); } // 有问有答 @@ -784,27 +800,27 @@ if (tStudyAnswer.getSubject() != null) { TSubject byId = list9.stream().filter(e -> e.getId().equals(tStudyAnswer.getSubject())).findFirst().orElse(null); if (byId!=null){ if (byId != null) { names.append(byId.getName()).append(","); } } if (tStudyAnswer.getAnswerSubject() != null) { TSubject byId1 = list9.stream().filter(e -> e.getId().equals(tStudyAnswer.getAnswerSubject())).findFirst().orElse(null); if (byId1!=null){ if (byId1 != null) { names.append(byId1.getName()).append(","); } } } else { if (tStudyAnswer.getSubject() != null) { TSubject byId = list9.stream().filter(e -> e.getId().equals(tStudyAnswer.getSubject())).findFirst().orElse(null); if (byId!=null){ if (byId != null) { names.append(byId.getName()).append(","); } } if (tStudyAnswer.getAnswerSubject() != null) { TSubject byId1 = list9.stream().filter(e -> e.getId().equals(tStudyAnswer.getAnswerSubject())).findFirst().orElse(null); if (byId1!=null){ if (byId1 != null) { names.append(byId1.getName()).append(","); } } @@ -818,6 +834,8 @@ studyAnswerVO.setIsAnswer(tStudyAnswer.getIsAnswer()); studyAnswerVO.setSubject(tStudyAnswer.getSubject() + "," + tStudyAnswer.getAnswerSubject()); answerVOS.add(studyAnswerVO); res.setAnswerRate(tStudyAnswer.getRate()); } } @@ -833,7 +851,7 @@ for (String s : tStudyPair.getSubject().split(",")) { TSubject byId = list9.stream().filter(e -> e.getId().equals(Integer.valueOf(s))).findFirst().orElse(null); if (byId!=null){ if (byId != null) { names.append(byId.getName()).append(","); } } @@ -844,6 +862,8 @@ studyPairVO.setIsVip(tStudyPair.getIsVip()); pairVOS.add(studyPairVO); } res.setPairRate(tStudyPair.getRate()); } List<TGame> list5 = gameService.list(new QueryWrapper<TGame>() .eq("week", week)); @@ -875,7 +895,7 @@ if (StringUtils.hasLength(tStory.getStory())) { for (String s : tStory.getStory().split(",")) { TStory byId = list10.stream().filter(e -> e.getId().equals(Integer.valueOf(s))).findFirst().orElse(null); if (byId!=null){ if (byId != null) { names.append(byId.getName()).append(","); } } @@ -884,7 +904,7 @@ for (String s : tStory.getLookStory().split(",")) { TStory byId = list10.stream().filter(e -> e.getId().equals(Integer.valueOf(s))).findFirst().orElse(null); if (byId!=null){ if (byId != null) { names1.append(byId.getName()).append(","); } } @@ -971,7 +991,7 @@ @GetMapping("/studySchedule") @ApiOperation(value = "获取用户学习进度", tags = {"学习端-首页"}) @ApiImplicitParams({ @ApiImplicitParam(value = "周目", name = "week", dataType = "Integer", required = true) @ApiImplicitParam(value = "周目", name = "week", dataType = "Integer", required = true), }) public R<TUserStudy> studySchedule(@RequestParam Integer week) { LoginUserParent loginStudy = tokenService.getLoginUserStudy(); @@ -1020,6 +1040,58 @@ if (listen != 100 && listen != -1) { studyRecord.setListen(100 - listen); } // // 自主学习答题记录 查询通关率 // List<TSubjectRecordDetail> list = subjectRecordDetailService.lambdaQuery().eq(TSubjectRecordDetail::getUserId, userid) // .eq(TSubjectRecordDetail::getWeek, week).ne(BaseModel::getDisabled, 0).list(); // List<TSubjectRecordDetail> listenList = list.stream().filter(e -> e.getType() == 1).collect(Collectors.toList()); // int listenPass = (int) listenList.stream().filter(e -> e.getStatus() == 2).count(); // List<TSubjectRecordDetail> lookList = list.stream().filter(e -> e.getType() == 2).collect(Collectors.toList()); // int lookPass = (int) lookList.stream().filter(e -> e.getStatus() == 2).count(); // List<TSubjectRecordDetail> inductionList = list.stream().filter(e -> e.getType() == 3).collect(Collectors.toList()); // int inductionPass = (int) inductionList.stream().filter(e -> e.getStatus() == 2).count(); // List<TSubjectRecordDetail> answerList = list.stream().filter(e -> e.getType() == 4).collect(Collectors.toList()); // int answerPass = (int) answerList.stream().filter(e -> e.getStatus() == 2).count(); // List<TSubjectRecordDetail> pairList = list.stream().filter(e -> e.getType() == 5).collect(Collectors.toList()); // int pairPass = (int) pairList.stream().filter(e -> e.getStatus() == 2).count(); // int listenSize = listenList.size(); // if (listenSize!=0){ // double listenRate = (double) listenPass /listenSize; // studyRecord.setListen((int)listenRate); // }else{ // studyRecord.setListen(-1); // } // int lookSize = lookList.size(); // if (lookSize!=0) { // double lookRate = (double) lookPass / lookSize; // studyRecord.setLook((int) lookRate); // }else{ // studyRecord.setLook(-1); // } // int inductionSize = inductionList.size(); // // if (inductionSize!=0) { // double inductionRate = (double) inductionPass /inductionSize; // studyRecord.setInduction((int)inductionRate); // }else{ // studyRecord.setInduction(-1); // } // // int answerSize = answerList.size(); // if (answerSize!=0) { // double answerRate = (double) answerPass /answerSize; // studyRecord.setAnswer((int)answerRate); // }else{ // studyRecord.setAnswer(-1); // } // // int pairSize = pairList.size(); // if (pairSize!=0) { // double pairRate = (double) pairPass /pairSize; // studyRecord.setPair((int)pairRate); // }else{ // studyRecord.setPair(-1); // } } return R.ok(studyRecord); } @@ -1044,6 +1116,7 @@ List<StudyWeekDTO> result = studyService.weekList(type, quarter, loginUserStudy.getUserid()); return R.ok(result); } /** * 获取在线时间赠送积分信息 @@ -1314,7 +1387,6 @@ @RequestParam Integer day) { // 判断当前登录用户是否为 会员 Boolean isVip = userService.isVip(); // 非会员只能查看非会员题目，会员可以查看所有题目 List<TStudyListen> studyListens = studyListenService.listenSelectPicture(quarter, week, day); for (TStudyListen studyListen : studyListens) { @@ -1326,7 +1398,7 @@ } } } return R.ok(studyService.listenSelectPicture(week, day, studyListens,tokenService.getLoginUserStudy().getUserid())); return R.ok(studyService.listenSelectPicture(week, day, studyListens, tokenService.getLoginUserStudy().getUserid())); } /** @@ -1357,7 +1429,7 @@ } } } return R.ok(studyService.pictureSelectVoice(week, day, lookList,tokenService.getLoginUserStudy().getUserid())); return studyService.pictureSelectVoice(week, day, lookList, tokenService.getLoginUserStudy().getUserid()); } /** @@ -1388,7 +1460,7 @@ } } } return R.ok(studyService.induceExclude(week, day, inductionList,tokenService.getLoginUserStudy().getUserid())); return studyService.induceExclude(week, day, inductionList, tokenService.getLoginUserStudy().getUserid()); } /** @@ -1419,7 +1491,7 @@ } } } return R.ok(studyService.questionsAndAnswers(week, day, answerList,tokenService.getLoginUserStudy().getUserid())); return studyService.questionsAndAnswers(week, day, answerList, tokenService.getLoginUserStudy().getUserid()); } /** @@ -1450,12 +1522,11 @@ } } } return R.ok(studyService.pictureMateVoice(week, day, pairList,tokenService.getLoginUserStudy().getUserid())); return studyService.pictureMateVoice(week, day, pairList, tokenService.getLoginUserStudy().getUserid()); } /** * 2.0新增-记录答题状态 * */ @PostMapping("/answerQuestion") @ApiOperation(value = "2.0新增-记录答题状态", tags = {"学习端-听-自主学习"}) @@ -1470,9 +1541,9 @@ subjectRecordDetailService.updateById(byId); return R.ok(); } /** * 2.0新增-重新开始 * */ @PostMapping("/restart") @ApiOperation(value = "2.0新增-重新开始", tags = {"学习端-听-自主学习"}) @@ -1597,6 +1668,23 @@ if (null == userStudy) { return R.tokenError("登录失效！"); } List<TSubjectRecordDetail> subjectRecordDetails = subjectRecordDetailService.lambdaQuery().eq(TSubjectRecordDetail::getUserId, userStudy.getUserid()) .eq(TSubjectRecordDetail::getWeek, week).ne(BaseModel::getDisabled, 0).list(); List<TSubjectRecordDetail> listenList = subjectRecordDetails.stream().filter(e -> e.getType() == 5).collect(Collectors.toList()); int listenPass = (int) listenList.stream().filter(e -> e.getStatus() == 2).count(); int listenSize = listenList.size(); if (listenSize!=0){ // 先计算上一天的通关率 设置为两位小数 double listenRate = (double) listenPass /listenSize; BigDecimal divide = new BigDecimal(listenPass).divide(new BigDecimal(listenSize), 2, RoundingMode.HALF_UP); TStudyPair one = studyPairService.lambdaQuery().eq(TStudyPair::getWeek, week) .eq(TStudyPair::getDay, 5).last("limit 1").one(); if (one!=null){ if (listenRate<(Double.parseDouble(one.getRate())/100)){ return R.fail("音图相配未达到通关率"+one.getRate()+"%,"+"当前通关率:"+divide+"%"); } } } Integer[] array = {0, 1, 2}; if (!Arrays.stream(array).collect(Collectors.toList()).contains(difficulty)) { throw new GlobalException("请选择符合规则的游戏难度！"); @@ -1643,6 +1731,23 @@ if (null == userStudy) { return R.tokenError("登录失效！"); } List<TSubjectRecordDetail> subjectRecordDetails = subjectRecordDetailService.lambdaQuery().eq(TSubjectRecordDetail::getUserId, userStudy.getUserid()) .eq(TSubjectRecordDetail::getWeek, week).ne(BaseModel::getDisabled, 0).list(); List<TSubjectRecordDetail> listenList = subjectRecordDetails.stream().filter(e -> e.getType() == 5).collect(Collectors.toList()); int listenPass = (int) listenList.stream().filter(e -> e.getStatus() == 2).count(); int listenSize = listenList.size(); if (listenSize!=0){ // 先计算上一天的通关率 设置为两位小数 double listenRate = (double) listenPass /listenSize; BigDecimal divide = new BigDecimal(listenPass).divide(new BigDecimal(listenSize), 2, RoundingMode.HALF_UP); TStudyPair one = studyPairService.lambdaQuery().eq(TStudyPair::getWeek, week) .eq(TStudyPair::getDay, 5).last("limit 1").one(); if (one!=null){ if (listenRate<(Double.parseDouble(one.getRate())/100)){ return R.fail("音图相配未达到通关率"+one.getRate()+"%,"+"当前通关率:"+divide+"%"); } } } TGame game = gameService.gameHearing(quarter, week); if (null == game) { throw new GlobalException("当前季度该周目暂无配置游戏数据！"); ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TStudy.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.ruoyi.common.core.web.domain.BaseModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -43,4 +44,6 @@ * 1一季度2二季度3三季度4四季度 */ private Integer quarter; @ApiModelProperty("季度通关率") private String quarterRate; } ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TStudyAnswer.java
@@ -65,5 +65,7 @@ */ @ApiModelProperty("非会员是否查看 0否1是") private Integer isVip; @ApiModelProperty("通关率") private String rate; } ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TStudyInduction.java
@@ -56,4 +56,6 @@ */ @ApiModelProperty("非会员是否查看 0否1是") private Integer isVip; @ApiModelProperty("通关率") private String rate; } ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TStudyListen.java
@@ -57,5 +57,7 @@ */ @ApiModelProperty("非会员是否查看 0否1是") private Integer isVip; @ApiModelProperty("通关率") private String rate; } ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TStudyLook.java
@@ -61,4 +61,6 @@ */ @ApiModelProperty("非会员是否查看 0否1是") private Integer isVip; @ApiModelProperty("通关率") private String rate; } ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TStudyPair.java
@@ -56,4 +56,6 @@ */ @ApiModelProperty("非会员是否查看 0否1是") private Integer isVip; @ApiModelProperty("通关率") private String rate; } ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TUserStudy.java
@@ -74,32 +74,38 @@ */ @ApiModelProperty(value = "听音选图学习进度(100为已完成)") private Integer listen; /** * 看图选音 */ @ApiModelProperty(value = "看图选音学习进度(100为已完成)") private Integer look; /** * 归纳排除 */ @ApiModelProperty(value = "归纳排除学习进度(100为已完成)") private Integer induction; /** * 有问有答 */ @ApiModelProperty(value = "有问有答学习进度(100为已完成)") private Integer answer; /** * 音图相配 */ @ApiModelProperty(value = "音图相配学习进度(100为已完成)") private Integer pair; /** * 游戏日当前应进行的游戏难度 */ @ApiModelProperty(value = "游戏日应进行的游戏难度(0入门、1中级、2高级)") private Integer gameDifficulty; /** * 当前week学习进度 */ ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/dto/AddStudySetDTO.java
@@ -11,14 +11,24 @@ public class AddStudySetDTO { @ApiModelProperty("听音选图") private List<StudyListenDTO> studyListen; @ApiModelProperty("听音选图通关率") private String listenRate; @ApiModelProperty("看图选音") private List<StudyLookDTO> studyLook; @ApiModelProperty("看图选音通关率") private String lookRate; @ApiModelProperty("归纳判断") private List<StudyInductionDTO> studyInduction; @ApiModelProperty("归纳判断通关率") private String inductionRate; @ApiModelProperty("有问有答") private List<StudyAnswerDTO> studyAnswer; @ApiModelProperty("有问有答通关率") private String answerRate; @ApiModelProperty("音图相配") private List<StudyPairDTO> studyPair; @ApiModelProperty("音图相配通关率") private String pairRate; @ApiModelProperty("自主游戏") private GameDTO game; @ApiModelProperty("听故事") @@ -35,5 +45,7 @@ private String title; @ApiModelProperty("所属季度") private Integer quarter; @ApiModelProperty("季度通关率") private String quarterRate; } ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/ITStudyService.java
@@ -1,6 +1,7 @@ package com.ruoyi.study.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.common.core.domain.R; import com.ruoyi.study.domain.*; import com.ruoyi.study.dto.StudyWeekDTO; import com.ruoyi.study.vo.*; @@ -64,7 +65,7 @@ * @param lookList 数据集合 * @return 单个题组下所包含的所有图片及语音 */ StudyLookResultVO pictureSelectVoice(Integer week, Integer day, List<TStudyLook> lookList,Integer userId); R<StudyLookResultVO> pictureSelectVoice(Integer week, Integer day, List<TStudyLook> lookList, Integer userId); /** * 自主学习3-归纳排除 @@ -74,7 +75,7 @@ * @param inductionList 归纳排除 * @return 题目信息 */ StudyInductionResultVO induceExclude(Integer week, Integer day, List<TStudyInduction> inductionList,Integer userId); R<StudyInductionResultVO> induceExclude(Integer week, Integer day, List<TStudyInduction> inductionList,Integer userId); /** * 自主学习4-有问有答 @@ -84,7 +85,7 @@ * @param answerList 有问有答 * @return 题目信息 */ StudyAnswerResultVO questionsAndAnswers(Integer week, Integer day, List<TStudyAnswer> answerList,Integer userId); R<StudyAnswerResultVO> questionsAndAnswers(Integer week, Integer day, List<TStudyAnswer> answerList,Integer userId); /** * 自主学习5-音图相配 @@ -94,7 +95,7 @@ * @param pair 音图相配 * @return 题目信息 */ StudyPairResultVO pictureMateVoice(Integer week, Integer day, List<TStudyPair> pair,Integer userId); R<StudyPairResultVO> pictureMateVoice(Integer week, Integer day, List<TStudyPair> pair,Integer userId); /** * 计算用户当前week的学习进度 ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TStudyServiceImpl.java
@@ -1,8 +1,11 @@ package com.ruoyi.study.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.core.constant.Constants; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.exception.GlobalException; import com.ruoyi.common.core.web.domain.BaseModel; import com.ruoyi.study.domain.*; import com.ruoyi.study.dto.StudyWeekDTO; import com.ruoyi.study.mapper.TStudyMapper; @@ -442,7 +445,28 @@ List<List<TSubject>> subjectList = new ArrayList<>(); StudyListenResultVO studyListenResultVO = new StudyListenResultVO(learnStudy, subjectList); List<TSubjectRecordDetail> subjectRecordDetails = subjectRecordDetailService.lambdaQuery().eq(TSubjectRecordDetail::getUserId, userid) .eq(TSubjectRecordDetail::getWeek, week).ne(BaseModel::getDisabled, 0).list(); List<TSubjectRecordDetail> listenList = subjectRecordDetails.stream().filter(e -> e.getType() == 1).collect(Collectors.toList()); int listenPass = (int) listenList.stream().filter(e -> e.getStatus() == 2).count(); int listenSize = listenList.size(); if (listenSize!=0){ // 计算当前通关率 double listenRate = (double) listenPass /listenSize; TStudyListen one = studyListenService.lambdaQuery().eq(TStudyListen::getWeek, week) .eq(TStudyListen::getDay, 1).last("limit 1").one(); if (one!=null){ if (listenRate<(Double.parseDouble(one.getRate())/100)){ // 清空答题记录 subjectRecordDetailService.remove(new LambdaQueryWrapper<TSubjectRecordDetail>() .eq(TSubjectRecordDetail::getUserId, userid) .eq(TSubjectRecordDetail::getWeek, week) .eq(TSubjectRecordDetail::getDay,day) .eq(TSubjectRecordDetail::getType ,1)); } } } List<TSubjectRecordDetail> list = subjectRecordDetailService.lambdaQuery().eq(TSubjectRecordDetail::getUserId, userid) .eq(TSubjectRecordDetail::getWeek, week) .eq(TSubjectRecordDetail::getDay, day) @@ -515,7 +539,7 @@ } @Override public StudyLookResultVO pictureSelectVoice(Integer week, Integer day, List<TStudyLook> lookList, Integer userid) { public R<StudyLookResultVO> pictureSelectVoice(Integer week, Integer day, List<TStudyLook> lookList, Integer userid) { if (lookList.isEmpty()) { throw new GlobalException("当前学习周目题目数量不足！"); } @@ -535,7 +559,44 @@ List<List<TSubject>> subjectList = new ArrayList<>(); StudyLookResultVO studyListenResultVO = new StudyLookResultVO(learnStudy, subjectList); List<TSubjectRecordDetail> subjectRecordDetails = subjectRecordDetailService.lambdaQuery().eq(TSubjectRecordDetail::getUserId, userid) .eq(TSubjectRecordDetail::getWeek, week).ne(BaseModel::getDisabled, 0).list(); List<TSubjectRecordDetail> listenList = subjectRecordDetails.stream().filter(e -> e.getType() == 1).collect(Collectors.toList()); int listenPass = (int) listenList.stream().filter(e -> e.getStatus() == 2).count(); int listenSize = listenList.size(); if (listenSize!=0){ // 先计算上一天的通关率 设置为两位小数 double listenRate = (double) listenPass /listenSize; BigDecimal divide = new BigDecimal(listenPass).divide(new BigDecimal(listenSize), 2, RoundingMode.HALF_UP); TStudyListen one = studyListenService.lambdaQuery().eq(TStudyListen::getWeek, week) .eq(TStudyListen::getDay, 1).last("limit 1").one(); if (one!=null){ if (listenRate<(Double.parseDouble(one.getRate())/100)){ return R.fail("听音选图未达到通关率"+one.getRate()+"%,"+"当前通关率:"+divide+"%"); } } } List<TSubjectRecordDetail> lookList1 = subjectRecordDetails.stream().filter(e -> e.getType() == 2).collect(Collectors.toList()); int lookPass = (int) lookList1.stream().filter(e -> e.getStatus() == 2).count(); int lookSize = lookList1.size(); if (lookSize!=0){ // 计算当前通关率 double listenRate = (double) lookPass /lookSize; TStudyLook one = studyLookService.lambdaQuery().eq(TStudyLook::getWeek, week) .eq(TStudyLook::getDay, 2).last("limit 1").one(); if (one!=null){ // 通关率未达标 if (listenRate<(Double.parseDouble(one.getRate())/100)){ // 清空答题记录 subjectRecordDetailService.remove(new LambdaQueryWrapper<TSubjectRecordDetail>() .eq(TSubjectRecordDetail::getUserId, userid) .eq(TSubjectRecordDetail::getWeek, week) .eq(TSubjectRecordDetail::getDay,day) .eq(TSubjectRecordDetail::getType ,2)); } } } List<TSubjectRecordDetail> list = subjectRecordDetailService.lambdaQuery().eq(TSubjectRecordDetail::getUserId, userid) .eq(TSubjectRecordDetail::getWeek, week) .eq(TSubjectRecordDetail::getDay, day) @@ -613,11 +674,11 @@ studyListenResultVO.setList(tSubjectRecordDetails); studyListenResultVO.setSubjectList(subjectList); } return studyListenResultVO; return R.ok(studyListenResultVO); } @Override public StudyInductionResultVO induceExclude(Integer week, Integer day, List<TStudyInduction> inductionList, Integer userid) { public R<StudyInductionResultVO> induceExclude(Integer week, Integer day, List<TStudyInduction> inductionList, Integer userid) { if (inductionList.isEmpty()) { throw new GlobalException("当前学习周目题目数量不足！"); } @@ -642,6 +703,44 @@ .eq(TSubjectRecordDetail::getWeek, week) .eq(TSubjectRecordDetail::getDay, day) .eq(TSubjectRecordDetail::getType, 3).list(); List<TSubjectRecordDetail> subjectRecordDetails = subjectRecordDetailService.lambdaQuery().eq(TSubjectRecordDetail::getUserId, userid) .eq(TSubjectRecordDetail::getWeek, week).ne(BaseModel::getDisabled, 0).list(); List<TSubjectRecordDetail> listenList = subjectRecordDetails.stream().filter(e -> e.getType() == 2).collect(Collectors.toList()); int listenPass = (int) listenList.stream().filter(e -> e.getStatus() == 2).count(); int listenSize = listenList.size(); if (listenSize!=0){ // 先计算上一天的通关率 设置为两位小数 double listenRate = (double) listenPass /listenSize; BigDecimal divide = new BigDecimal(listenPass).divide(new BigDecimal(listenSize), 2, RoundingMode.HALF_UP); TStudyLook one = studyLookService.lambdaQuery().eq(TStudyLook::getWeek, week) .eq(TStudyLook::getDay, 2).last("limit 1").one(); if (one!=null){ if (listenRate<(Double.parseDouble(one.getRate())/100)){ return R.fail("看图选音未达到通关率"+one.getRate()+"%,"+"当前通关率:"+divide+"%"); } } } List<TSubjectRecordDetail> lookList1 = subjectRecordDetails.stream().filter(e -> e.getType() == 3).collect(Collectors.toList()); int lookPass = (int) lookList1.stream().filter(e -> e.getStatus() == 2).count(); int lookSize = lookList1.size(); if (lookSize!=0){ // 计算当前通关率 double listenRate = (double) lookPass /lookSize; TStudyInduction one = studyInductionService.lambdaQuery().eq(TStudyInduction::getWeek, week) .eq(TStudyInduction::getDay, 3).last("limit 1").one(); if (one!=null){ // 通关率未达标 if (listenRate<(Double.parseDouble(one.getRate())/100)){ // 清空答题记录 subjectRecordDetailService.remove(new LambdaQueryWrapper<TSubjectRecordDetail>() .eq(TSubjectRecordDetail::getUserId, userid) .eq(TSubjectRecordDetail::getWeek, week) .eq(TSubjectRecordDetail::getDay,day) .eq(TSubjectRecordDetail::getType ,3)); } } } if (list.isEmpty()) { List<TSubjectRecordDetail> tSubjectRecordDetails = new ArrayList<>(); for (TStudyInduction data : inductionList) { @@ -752,11 +851,11 @@ .divide(new BigDecimal(tSubjectRecordDetails.size()), 2, RoundingMode.HALF_UP)); } studyListenResultVO.setSubjectList(subjectList); return studyListenResultVO; return R.ok(studyListenResultVO); } @Override public StudyAnswerResultVO questionsAndAnswers(Integer week, Integer day, List<TStudyAnswer> answerList, Integer userid) { public R<StudyAnswerResultVO> questionsAndAnswers(Integer week, Integer day, List<TStudyAnswer> answerList, Integer userid) { if (answerList.isEmpty()) { throw new GlobalException("当前学习周目题目数量不足！"); } @@ -781,6 +880,44 @@ .eq(TSubjectRecordDetail::getWeek, week) .eq(TSubjectRecordDetail::getDay, day) .eq(TSubjectRecordDetail::getType, 4).list(); List<TSubjectRecordDetail> subjectRecordDetails = subjectRecordDetailService.lambdaQuery().eq(TSubjectRecordDetail::getUserId, userid) .eq(TSubjectRecordDetail::getWeek, week).ne(BaseModel::getDisabled, 0).list(); List<TSubjectRecordDetail> listenList = subjectRecordDetails.stream().filter(e -> e.getType() == 3).collect(Collectors.toList()); int listenPass = (int) listenList.stream().filter(e -> e.getStatus() == 2).count(); int listenSize = listenList.size(); if (listenSize!=0){ // 先计算上一天的通关率 设置为两位小数 double listenRate = (double) listenPass /listenSize; BigDecimal divide = new BigDecimal(listenPass).divide(new BigDecimal(listenSize), 2, RoundingMode.HALF_UP); TStudyInduction one = studyInductionService.lambdaQuery().eq(TStudyInduction::getWeek, week) .eq(TStudyInduction::getDay, 3).last("limit 1").one(); if (one!=null){ if (listenRate<(Double.parseDouble(one.getRate())/100)){ return R.fail("归纳排除未达到通关率"+one.getRate()+"%,"+"当前通关率:"+divide+"%"); } } } List<TSubjectRecordDetail> lookList1 = subjectRecordDetails.stream().filter(e -> e.getType() == 4).collect(Collectors.toList()); int lookPass = (int) lookList1.stream().filter(e -> e.getStatus() == 2).count(); int lookSize = lookList1.size(); if (lookSize!=0){ // 计算当前通关率 double listenRate = (double) lookPass /lookSize; TStudyAnswer one = studyAnswerService.lambdaQuery().eq(TStudyAnswer::getWeek, week) .eq(TStudyAnswer::getDay, 4).last("limit 1").one(); if (one!=null){ // 通关率未达标 if (listenRate<(Double.parseDouble(one.getRate())/100)){ // 清空答题记录 subjectRecordDetailService.remove(new LambdaQueryWrapper<TSubjectRecordDetail>() .eq(TSubjectRecordDetail::getUserId, userid) .eq(TSubjectRecordDetail::getWeek, week) .eq(TSubjectRecordDetail::getDay,day) .eq(TSubjectRecordDetail::getType ,4)); } } } if (list.isEmpty()) { List<TSubjectRecordDetail> tSubjectRecordDetails = new ArrayList<>(); for (int i = 0; i < answerList.size(); i += Constants.TWO) { @@ -861,7 +998,7 @@ .divide(new BigDecimal(tSubjectRecordDetails.size()), 2, RoundingMode.HALF_UP)); } studyListenResultVO.setSubjectList(subjectList); return studyListenResultVO; return R.ok(studyListenResultVO); } private void voAdd(List<QuestionsAnswersSubjectVO> voList, TStudyAnswer one) { @@ -903,7 +1040,7 @@ } @Override public StudyPairResultVO pictureMateVoice(Integer week, Integer day, List<TStudyPair> pair, Integer userid) { public R<StudyPairResultVO> pictureMateVoice(Integer week, Integer day, List<TStudyPair> pair, Integer userid) { if (pair.isEmpty()) { throw new GlobalException("当前学习周目题目数量不足！"); } @@ -928,6 +1065,44 @@ .eq(TSubjectRecordDetail::getWeek, week) .eq(TSubjectRecordDetail::getDay, day) .eq(TSubjectRecordDetail::getType, 5).list(); List<TSubjectRecordDetail> subjectRecordDetails = subjectRecordDetailService.lambdaQuery().eq(TSubjectRecordDetail::getUserId, userid) .eq(TSubjectRecordDetail::getWeek, week).ne(BaseModel::getDisabled, 0).list(); List<TSubjectRecordDetail> listenList = subjectRecordDetails.stream().filter(e -> e.getType() == 4).collect(Collectors.toList()); int listenPass = (int) listenList.stream().filter(e -> e.getStatus() == 2).count(); int listenSize = listenList.size(); if (listenSize!=0){ // 先计算上一天的通关率 设置为两位小数 double listenRate = (double) listenPass /listenSize; BigDecimal divide = new BigDecimal(listenPass).divide(new BigDecimal(listenSize), 2, RoundingMode.HALF_UP); TStudyAnswer one = studyAnswerService.lambdaQuery().eq(TStudyAnswer::getWeek, week) .eq(TStudyAnswer::getDay, 4).last("limit 1").one(); if (one!=null){ if (listenRate<(Double.parseDouble(one.getRate())/100)){ return R.fail("归纳排除未达到通关率"+one.getRate()+"%,"+"当前通关率:"+divide+"%"); } } } List<TSubjectRecordDetail> lookList1 = subjectRecordDetails.stream().filter(e -> e.getType() == 5).collect(Collectors.toList()); int lookPass = (int) lookList1.stream().filter(e -> e.getStatus() == 2).count(); int lookSize = lookList1.size(); if (lookSize!=0){ // 计算当前通关率 double listenRate = (double) lookPass /lookSize; TStudyPair one = studyPairService.lambdaQuery().eq(TStudyPair::getWeek, week) .eq(TStudyPair::getDay, 5).last("limit 1").one(); if (one!=null){ // 通关率未达标 if (listenRate<(Double.parseDouble(one.getRate())/100)){ // 清空答题记录 subjectRecordDetailService.remove(new LambdaQueryWrapper<TSubjectRecordDetail>() .eq(TSubjectRecordDetail::getUserId, userid) .eq(TSubjectRecordDetail::getWeek, week) .eq(TSubjectRecordDetail::getDay,day) .eq(TSubjectRecordDetail::getType ,5)); } } } if (list.isEmpty()) { List<TSubjectRecordDetail> tSubjectRecordDetails = new ArrayList<>(); for (TStudyPair data : pair) { @@ -991,7 +1166,7 @@ studyListenResultVO.setAccuracy(new BigDecimal(tSubjectRecordDetails.stream().filter(tSubjectRecordDetail -> tSubjectRecordDetail.getStatus().equals(2)).count()) .divide(new BigDecimal(tSubjectRecordDetails.size()), 2, RoundingMode.HALF_UP)); } return studyListenResultVO; return R.ok(studyListenResultVO); } @Override ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/StudyVO.java
@@ -19,17 +19,30 @@ private Integer quarter; @ApiModelProperty(value = "听音选图") private List<StudyListenVO> listen; @ApiModelProperty("听音选图通关率") private String listenRate; @ApiModelProperty(value = "归纳排除") private List<StudyInductionVO> induction; @ApiModelProperty("归纳判断通关率") private String inductionRate; @ApiModelProperty(value = "有问有答") private List<StudyAnswerVO> answer; @ApiModelProperty("有问有答通关率") private String answerRate; @ApiModelProperty(value = "看图选音") private List<StudyLookVO> look; @ApiModelProperty("看图选音通关率") private String lookRate; @ApiModelProperty(value = "音图相配") private List<StudyPairVO> pair; @ApiModelProperty("音图相配通关率") private String pairRate; @ApiModelProperty(value = "自主游戏") private List<GameVO> game; @ApiModelProperty(value = "听故事") private List<StoryVO> story; @ApiModelProperty("季度通关率") private String quarterRate; }
