java/DolphinEnglish.git

			@@ -28,6 +28,7 @@

			import javax.annotation.Resource;
			import java.util.*;
			import java.util.concurrent.TimeUnit;
			import java.util.stream.Collectors;

			/**
			@@ -628,13 +629,16 @@
			if (StringUtils.hasLength(names)){
			storyVO.setName(names.substring(0, names.length() - 1));

			}if (StringUtils.hasLength(sort)){
			}
			if (StringUtils.hasLength(sort)) {
			storyVO.setSort(sort.substring(0, sort.length() - 1));

			}if (StringUtils.hasLength(names1)){
			}
			if (StringUtils.hasLength(names1)) {
			storyVO.setLookName(names1.substring(0, names1.length() - 1));

			}if (StringUtils.hasLength(sort1)){
			}
			if (StringUtils.hasLength(sort1)) {
			storyVO.setLookSort(sort1.substring(0, sort1.length() - 1));
			}
			storyVO.setIntegral(tStory.getIntegral());
			@@ -658,7 +662,7 @@
			* @param quarter 季度
			*/
			@GetMapping("/weekList")
			@ApiOperation(value = "周目列表", tags = {"周目列表"})
			@ApiOperation(value = "根据季度获取周目列表", tags = {"根据季度获取周目列表"})
			@ApiImplicitParams({
			@ApiImplicitParam(value = "所属类型", name = "type", dataType = "Integer", required = true),
			@ApiImplicitParam(value = "季度", name = "quarter", dataType = "Integer", required = true)
			@@ -854,7 +858,7 @@
			* @param completeStudy 完成学习信息
			*/
			@PostMapping("/completeLearning")
			@ApiOperation(value = "完成学习", tags = {"完成学习/其他积分来源(分享...)"})
			@ApiOperation(value = "完成学习", tags = {"完成学习"})
			public R<Boolean> completeLearning(@RequestBody CompleteStudyDTO completeStudy) {
			// 登录用户id
			Integer userId = tokenService.getLoginUserStudy().getUserid();
			@@ -1004,6 +1008,7 @@
			subjectId.addAll(Arrays.asList(subject.split(",")));
			}
			redisService.setCacheList(RedisConstants.HEARING_TREE, subjectId);
			redisService.expire(RedisConstants.HEARING_TREE, RedisConstants.THIRTY, TimeUnit.MINUTES);
			}
			return subjectId;
			}