From afb2bc8e77e086ebeb358915e12fad41dac78a6a Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 23 十月 2025 14:41:34 +0800
Subject: [PATCH] 1020更新
---
ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/feignClient/StudyClient.java | 52 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 44 insertions(+), 8 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 c3fb930..f1a4f75 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
@@ -14,14 +14,18 @@
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
+import javax.validation.Valid;
import java.util.List;
@FeignClient(contextId = "studyClient", value = ServiceNameConstants.STUDY_SERVICE, fallbackFactory = StudyFallbackFactory.class)
public interface StudyClient {
-
+ @PostMapping("/base/study/recordManagement/{id}")
+ R<StudyRecordResultVO> recordManagement(@PathVariable("id")Integer id);
@PostMapping("/base/user/getUserById/{id}")
R<TUser> getUserById(@PathVariable("id") Integer id);
+ @PostMapping("/base/user/listAll")
+ R<List<TUser>> listAll(@RequestBody OrderQuery query);
@PostMapping("/base/user/vipBack/{id}")
R vipBack(@PathVariable("id") Integer id);
@@ -175,14 +179,12 @@
@PostMapping("/base/tStory/updateState/{id}/{state}")
R updateState1(@PathVariable("id") Integer id, @PathVariable("state") Integer state);
- /**
- * 获取用户信息
- *
- * @return 用户信息
- */
@GetMapping("/base/user/userInfo")
- @ApiOperation(value = "用户详情", tags = {"用户详情"})
- R<TUser> userInfo();
+ @ApiOperation(value = "用户详情", tags = {"学习端-用户详情"})
+ R<UserPersonalCenterVO> userInfo();
+ @GetMapping("/base/user/userInfoParent")
+ @ApiOperation(value = "用户详情", tags = {"家长端-用户详情"})
+ R<TUser> userInfoParent();
/**
* 生成积分明细-用于远程调用
@@ -193,6 +195,8 @@
*/
@GetMapping("/base/study/addIntegralDetail")
R<Boolean> addIntegralDetail(@RequestParam("integral") String integral, @RequestParam("method") String method);
+ @GetMapping("/base/study/addIntegralDetailParent")
+ R<Boolean> addIntegralDetailParent(@RequestParam("integral") String integral, @RequestParam("method") String method);
/**
* 用户积分变动(增加或减少)-用于远程调用
@@ -204,5 +208,37 @@
@GetMapping("/base/study/exchangeIntegral")
@ApiOperation(value = "用户积分变动", tags = {"用户积分变动"})
R<Boolean> exchangeIntegral(@RequestParam("integral") Integer integral, @RequestParam("method") String method);
+ @GetMapping("/base/study/exchangeIntegralParent")
+ @ApiOperation(value = "用户积分变动", tags = {"用户积分变动"})
+ R<Boolean> exchangeIntegralParent(@RequestParam("integral") Integer integral, @RequestParam("method") String method);
+ /**
+ * 生成积分明细-用于远程调用
+ *
+ * @param integral 积分变动信息
+ * @param method 变动源
+ * @return 操作结果
+ */
+ @GetMapping("/base/study/addIntegralDetail1")
+ R<Boolean> addIntegralDetail1(@RequestParam("integral") String integral, @RequestParam("method") String method);
+
+ /**
+ * 用户积分变动(增加或减少)-用于远程调用
+ *
+ * @param integral 积分变动信息
+ * @param method 变动源
+ * @return 操作结果
+ */
+ @GetMapping("/base/study/exchangeIntegral1")
+ @ApiOperation(value = "用户积分变动", tags = {"用户积分变动"})
+ R<Boolean> exchangeIntegral1(@RequestParam("integral") Integer integral, @RequestParam("method") String method);
+
+
+ @GetMapping("/base/study/lookVideo")
+ @ApiOperation(value = "家长重置观看操作视频", tags = {"家长重置观看操作视频"})
+ R<Boolean> resetLookVideo();
+
+
+ @PostMapping("/base/study/setStudyType")
+ R<Object> setStudyType(@RequestBody SetStudyTypeDto dto);
}
--
Gitblit v1.7.1