From 25743ef4cfb9da0be8d3e488c93f5429ffd02f8a Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 21 五月 2024 14:21:25 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/DolphinEnglish
---
ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/feignClient/StudyClient.java | 69 +++++++++++++++++++++++++++++-----
1 files changed, 58 insertions(+), 11 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/feignClient/StudyClient.java b/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/feignClient/StudyClient.java
index bfe4919..e73edc1 100644
--- a/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/feignClient/StudyClient.java
+++ b/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/feignClient/StudyClient.java
@@ -2,8 +2,8 @@
import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
+import com.ruoyi.study.api.domain.TUser;
import com.ruoyi.study.api.dto.*;
import com.ruoyi.study.api.factory.StudyFallbackFactory;
import com.ruoyi.study.api.model.TStory;
@@ -12,10 +12,7 @@
import com.ruoyi.study.api.vo.*;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -24,48 +21,64 @@
@PostMapping("/base/user/vipBack/{id}")
R vipBack(@PathVariable("id") Integer id);
+
@PostMapping("/base/user/userList")
R<PageInfo<AppUserVO>> couponReceive(@RequestBody AppUserQuery query);
+
@PostMapping("/base/user/getUserInfo")
- R<UserInfoVO> getUserInfo(@RequestBody UserInfoQuery dto);
+ R<UserInfoVO> getUserInfo(@RequestBody UserInfoQuery dto);
+
@PostMapping("/base/user/freeze/{id}")
- R freeze(@PathVariable("id") Integer id);
+ R freeze(@PathVariable("id") Integer id);
+
@PostMapping("/base/user/vipOrderList")
- R<PageInfo<VipOrderVO>> vipOrderList(@RequestBody AppUserQuery query);
+ R<PageInfo<VipOrderVO>> vipOrderList(@RequestBody AppUserQuery query);
+
/**
* 选择故事列表查询
+ *
* @param query
* @return
*/
@PostMapping("/base/study/storyList")
R<PageInfo<TStory>> storyList(@RequestBody ChoiceStory query);
+
/**
* 选择题目列表查询
+ *
* @param query
* @return
*/
@PostMapping("/base/study/subjectList")
R<PageInfo<TSubject>> subjectList(@RequestBody ChoiceSubject query);
+
/**
* 新增/修改学习类型配置
+ *
* @return
*/
@PostMapping("/base/study/addStudySet")
- R<Object> addStudySet(@RequestBody AddStudySetDTO dto);
+ R<Object> addStudySet(@RequestBody AddStudySetDTO dto);
+
/**
* 通过类型、周目、day查询学习配置
+ *
* @return
*/
@PostMapping("/base/study/getStudySet")
R<StudyVO> getStudySet(@RequestBody StudyDTO dto);
+
/**
* 学习类型列表查询
+ *
* @return
*/
@PostMapping("/base/study/getStudyList")
R<List<StudyListVO>> getStudyList();
+
/**
* 添加周目
+ *
* @return
*/
@PostMapping("/base/study/addWeek")
@@ -73,19 +86,24 @@
/**
* 题目管理列表查询
+ *
* @param query
* @return
*/
@PostMapping("/base/tSubject/subjectList")
R<PageInfo<SubjectVO>> subjectList(@RequestBody SubjectQuery query);
+
/**
* 题目管理添加
+ *
* @return
*/
@PostMapping("/base/tSubject/add")
- R add(@RequestBody SubjectDTO dto) ;
+ R add(@RequestBody SubjectDTO dto);
+
/**
* 题目管理编辑
+ *
* @return
*/
@PostMapping("/base/tSubject/update")
@@ -93,13 +111,16 @@
/**
* 查看详情
+ *
* @param id
* @return
*/
@PostMapping("/base/tSubject/getInfo")
R<SubjectDTO> getInfo(@RequestParam("id") Integer id);
+
/**
* 修改题目状态
+ *
* @param id
* @return
*/
@@ -108,6 +129,7 @@
/**
* 故事管理列表查询
+ *
* @param query
* @return
*/
@@ -116,20 +138,25 @@
/**
* 故事管理添加
+ *
* @param dto
* @return
*/
@PostMapping("/base/tStory/add")
R add(@RequestBody StoryDTO dto);
+
/**
* 故事管理编辑
+ *
* @param dto
* @return
*/
@PostMapping("/base/tStory/update")
R update(@RequestBody StoryDTO dto);
+
/**
* 故事管理查看详情
+ *
* @return
*/
@PostMapping("/base/tStory/getInfo")
@@ -137,10 +164,30 @@
/**
* 故事管理修改状态
+ *
* @param id
* @param state
* @return
*/
@PostMapping("/base/tStory/updateState/{id}/{state}")
- R updateState1(@PathVariable("id") Integer id,@PathVariable("state")Integer state);
+ R updateState1(@PathVariable("id") Integer id, @PathVariable("state") Integer state);
+
+ /**
+ * 获取用户信息
+ *
+ * @return 用户信息
+ */
+ @GetMapping("/base/user/userInfo")
+ @ApiOperation(value = "用户详情", tags = {"用户详情"})
+ R<TUser> userInfo();
+
+ /**
+ * 生成积分明细-用于远程调用
+ *
+ * @param integral 积分变动信息
+ * @param method 变动源
+ */
+ @GetMapping("/base/study/addIntegralDetail")
+ R<Boolean> addIntegralDetail(@RequestParam("integral") String integral, @RequestParam("method") String method);
+
}
--
Gitblit v1.7.1