From b45c2583b4764edb95efe9880c4abfddb8a1ec21 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 22 五月 2024 15:38:29 +0800
Subject: [PATCH] 代码提交
---
ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TSysSetController.java | 4 +-
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java | 51 +++++++++----------------
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/StudyVO.java | 2 +
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java | 21 ++++++++++
ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/vo/StoryVO.java | 5 ++
ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/vo/StudyVO.java | 2 +
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java | 14 ++++++-
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TIntegralRecord.java | 3 +
ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TStudyController.java | 3 +
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/StoryVO.java | 4 ++
10 files changed, 69 insertions(+), 40 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/vo/StoryVO.java b/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/vo/StoryVO.java
index 1421826..a3aae7f 100644
--- a/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/vo/StoryVO.java
+++ b/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/vo/StoryVO.java
@@ -19,6 +19,9 @@
private String lookSort;
@ApiModelProperty(value = "看图配音可获积分")
private Integer lookIntegral;
-
+ @ApiModelProperty(value = "框架记忆故事ids 多个逗号隔开")
+ private String story;
+ @ApiModelProperty(value = "看图配音故事ids 多个逗号隔开")
+ private String lookStory;
}
\ No newline at end of file
diff --git a/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/vo/StudyVO.java b/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/vo/StudyVO.java
index bce45ea..a5443b2 100644
--- a/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/vo/StudyVO.java
+++ b/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/vo/StudyVO.java
@@ -15,6 +15,8 @@
private Integer count;
@ApiModelProperty(value = "已有周目数量 例如5 那么就是第一周到第五周都有")
private Integer weeks;
+ @ApiModelProperty(value = "所属季度")
+ private Integer quarter;
@ApiModelProperty(value = "听音选图")
private List<StudyListenVO> listen;
@ApiModelProperty(value = "归纳排除")
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
index 1add0e0..7f6cd43 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
@@ -105,6 +105,7 @@
return AjaxResult.success(res1);
}
+
@ApiOperation("添加角色")
@PostMapping("/roleAdd")
public AjaxResult roleAdd(@Validated @RequestBody RoleAddDto dto)
@@ -125,7 +126,15 @@
role.setCreateBy(SecurityUtils.getUsername());
role.setCreateTime(new Date());
roleService.insertRole(role);
-
+ ArrayList<SysRoleMenu> sysRoleMenus = new ArrayList<>();
+ List<Long> menuIds = dto.getMenuIds();
+ for (Long menuId : menuIds) {
+ SysRoleMenu sysRoleMenu = new SysRoleMenu();
+ sysRoleMenu.setMenuId(menuId);
+ sysRoleMenu.setRoleId(role.getRoleId());
+ sysRoleMenus.add(sysRoleMenu);
+ }
+ sysRoleMenuMapper.batchRoleMenu(sysRoleMenus);
return AjaxResult.success();
}
@@ -228,10 +237,11 @@
role.setRoleId(dto.getRoleId());
roleService.updateRole(role);
ArrayList<SysRoleMenu> sysRoleMenus = new ArrayList<>();
- List<Long> menuIds = dto.getMenuIds();
+
// 移除原来的权限菜单
sysRoleMenuMapper.delete(new LambdaQueryWrapper<SysRoleMenu>()
.eq(SysRoleMenu::getRoleId,dto.getRoleId()));
+ List<Long> menuIds = dto.getMenuIds();
for (Long menuId : menuIds) {
SysRoleMenu sysRoleMenu = new SysRoleMenu();
sysRoleMenu.setMenuId(menuId);
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TStudyController.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TStudyController.java
index 7032f98..da2da48 100644
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TStudyController.java
+++ b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TStudyController.java
@@ -16,6 +16,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -53,7 +54,7 @@
@ApiOperation(value = "新增或修改学习配置", tags = {"后台-学习"})
@PostMapping(value = "/addStudySet")
@ResponseBody
- public AjaxResult addStudySet(AddStudySetDTO dto) {
+ public AjaxResult addStudySet(@RequestBody AddStudySetDTO dto) {
studyClient.addStudySet(dto);
return AjaxResult.success("保存成功");
}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TSysSetController.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TSysSetController.java
index 0f247da..f40fda8 100644
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TSysSetController.java
+++ b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TSysSetController.java
@@ -170,9 +170,9 @@
}
return AjaxResult.success(new TUseGuide());
}
- @DeleteMapping("/delete{id}")
+ @DeleteMapping("/delete")
@ApiOperation(value = "使用指南-删除", tags = {"使用指南"})
- public AjaxResult updateUseGuide(@PathVariable Integer id) {
+ public AjaxResult updateUseGuide( Integer id) {
// TUseGuide useGuide2 = useGuideService.getById(id);
useGuideService.removeById(id);
return AjaxResult.success("删除成功");
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java
index dc1d7d3..39148fe 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java
@@ -352,8 +352,8 @@
.eq("type", 1));
studyListVO.setWeeks(count.size());
- // todo 补充开始学习人数
- studyListVO.setCount(0);
+ List<TUserStudy> list7 = userStudyService.list(new QueryWrapper<TUserStudy>());
+ studyListVO.setCount(list7.size());
studyListVO.setName("听");
// 查询听类型有多少周目
res.add(studyListVO);
@@ -391,6 +391,7 @@
return R.ok(res);
}
+
/**
* 通过类型、周目、day查询学习配置
*
@@ -399,11 +400,19 @@
@PostMapping("/getStudySet")
public R<StudyVO> getStudySet(@RequestBody StudyDTO dto) {
StudyVO res = new StudyVO();
- // todo 开始学习人数后续补充
- res.setCount(0);
+ List<TUserStudy> list7 = userStudyService.list(new QueryWrapper<TUserStudy>());
+ res.setCount(list7.size());
+ // 查询已有周目数量
int type = studyService.list(new QueryWrapper<TStudy>()
.eq("type", dto.getType())).size();
res.setWeeks(type);
+ List<TStudy> list8 = studyService.list(new QueryWrapper<TStudy>()
+ .eq("type", dto.getType())
+ .eq("week", dto.getWeek()));
+ if (!list8.isEmpty()){
+ res.setQuarter(list8.get(0).getQuarter());
+ res.setTitle(list8.get(0).getTitle());
+ }
List<StudyListenVO> listenVOS = new ArrayList<>();
List<GameVO> gameVOS = new ArrayList<>();
List<StoryVO> storyVOS = new ArrayList<>();
@@ -535,6 +544,8 @@
.eq("week", week));
for (TStoryListen tStory : list6) {
StoryVO storyVO = new StoryVO();
+ storyVO.setStory(tStory.getStory());
+ storyVO.setLookStory(tStory.getLookStory());
StringBuilder names = new StringBuilder();
StringBuilder names1 = new StringBuilder();
StringBuilder sort = new StringBuilder();
@@ -556,38 +567,12 @@
storyVO.setName(names.substring(0, names.length() - 1));
storyVO.setSort(sort.substring(0, sort.length() - 1));
storyVO.setIntegral(tStory.getIntegral());
- storyVO.setLookName(names1.substring(0, names.length() - 1));
- storyVO.setLookSort(sort1.substring(0, sort.length() - 1));
+ storyVO.setLookName(names1.substring(0, names1.length() - 1));
+ storyVO.setLookSort(sort1.substring(0, sort1.length() - 1));
storyVO.setLookIntegral(tStory.getLookIntegral());
storyVOS.add(storyVO);
}
- int temp = 0;
- if (!list.isEmpty()) {
- temp = list.get(0).getStudyId();
- }
- if (!list1.isEmpty()) {
- temp = list1.get(0).getStudyId();
- }
- if (!list2.isEmpty()) {
- temp = list2.get(0).getStudyId();
- }
- if (!list3.isEmpty()) {
- temp = list3.get(0).getStudyId();
- }
- if (!list4.isEmpty()) {
- temp = list4.get(0).getStudyId();
- }
- if (!list5.isEmpty()) {
- temp = list5.get(0).getStudyId();
- }
- if (!list6.isEmpty()) {
- temp = list6.get(0).getStudyId();
- }
- if (temp == 0) {
- res.setTitle("");
- } else {
- res.setTitle(studyService.getById(temp).getTitle());
- }
+
res.setAnswer(answerVOS);
res.setPair(pairVOS);
res.setListen(listenVOS);
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java
index d55f8cb..a9c8f22 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java
@@ -183,8 +183,12 @@
calendar.setTime(new Date());
calendar.add(Calendar.MONTH, time);
Date dateAfterOneMonth = calendar.getTime();
- byId.setTime(dateAfterOneMonth);
+ dateAfterOneMonth.setHours(23);
+ dateAfterOneMonth.setMinutes(59);
+ dateAfterOneMonth.setSeconds(59);
byId1.setVipEndTime(dateAfterOneMonth);
+ byId.setTime(dateAfterOneMonth);
+
} else {
// 不是首次 判断vipEndTime 是否到期 如果没有 加指定月份时间 如果到期了 将会员到期时间从当前增加指定月份
if (byId1.getVipEndTime().getTime() < new Date().getTime()) {
@@ -192,6 +196,9 @@
calendar.setTime(new Date());
calendar.add(Calendar.MONTH, time);
Date dateAfterOneMonth = calendar.getTime();
+ dateAfterOneMonth.setHours(23);
+ dateAfterOneMonth.setMinutes(59);
+ dateAfterOneMonth.setSeconds(59);
byId.setTime(dateAfterOneMonth);
byId1.setVipEndTime(dateAfterOneMonth);
} else {
@@ -199,6 +206,9 @@
calendar.setTime(byId1.getVipEndTime());
calendar.add(Calendar.MONTH, time);
Date dateAfterOneMonth = calendar.getTime();
+ dateAfterOneMonth.setHours(23);
+ dateAfterOneMonth.setMinutes(59);
+ dateAfterOneMonth.setSeconds(59);
byId.setTime(dateAfterOneMonth);
byId1.setVipEndTime(dateAfterOneMonth);
}
@@ -257,6 +267,9 @@
calendar.setTime(new Date());
calendar.add(Calendar.MONTH, time);
Date dateAfterOneMonth = calendar.getTime();
+ dateAfterOneMonth.setHours(23);
+ dateAfterOneMonth.setMinutes(59);
+ dateAfterOneMonth.setSeconds(59);
byId.setTime(dateAfterOneMonth);
byId1.setVipEndTime(dateAfterOneMonth);
} else {
@@ -266,6 +279,9 @@
calendar.setTime(new Date());
calendar.add(Calendar.MONTH, time);
Date dateAfterOneMonth = calendar.getTime();
+ dateAfterOneMonth.setHours(23);
+ dateAfterOneMonth.setMinutes(59);
+ dateAfterOneMonth.setSeconds(59);
byId.setTime(dateAfterOneMonth);
byId1.setVipEndTime(dateAfterOneMonth);
} else {
@@ -273,6 +289,9 @@
calendar.setTime(byId1.getVipEndTime());
calendar.add(Calendar.MONTH, time);
Date dateAfterOneMonth = calendar.getTime();
+ dateAfterOneMonth.setHours(23);
+ dateAfterOneMonth.setMinutes(59);
+ dateAfterOneMonth.setSeconds(59);
byId.setTime(dateAfterOneMonth);
byId1.setVipEndTime(dateAfterOneMonth);
}
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TIntegralRecord.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TIntegralRecord.java
index 42db5a1..c5ee46b 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TIntegralRecord.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TIntegralRecord.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;
/**
@@ -28,10 +29,12 @@
/**
* 积分数量 带有负号为减少
*/
+ @ApiModelProperty(value = "积分数量 带有负号为减少")
private String integral;
/**
* 方式：完成题目 完成游戏 每日学习时长 商城消费
*/
+ @ApiModelProperty(value = "方式：完成题目 完成游戏 每日学习时长 商城消费")
private String method;
/**
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/StoryVO.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/StoryVO.java
index b1b03e2..e56ad32 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/StoryVO.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/StoryVO.java
@@ -19,6 +19,10 @@
private String lookSort;
@ApiModelProperty(value = "看图配音可获积分")
private Integer lookIntegral;
+ @ApiModelProperty(value = "框架记忆故事ids 多个逗号隔开")
+ private String story;
+ @ApiModelProperty(value = "看图配音故事ids 多个逗号隔开")
+ private String lookStory;
}
\ No newline at end of file
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/StudyVO.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/StudyVO.java
index 4e5aff6..afd97d3 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/StudyVO.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/StudyVO.java
@@ -15,6 +15,8 @@
private Integer count;
@ApiModelProperty(value = "已有周目数量 例如5 那么就是第一周到第五周都有")
private Integer weeks;
+ @ApiModelProperty(value = "所属季度")
+ private Integer quarter;
@ApiModelProperty(value = "听音选图")
private List<StudyListenVO> listen;
@ApiModelProperty(value = "归纳排除")
--
Gitblit v1.7.1