PC学员错题和收藏查询修改

jpcj-admin/src/main/java/com/miaxis/pc/controller/question/PcQuestionCollectionController.java

@@ -45,7 +45,7 @@ public class PcQuestionCollectionController extends BaseController {
     public Response<Integer> add(@RequestBody QuestionCollectionDTO questionCollectionDTO) {
         //查询该用户已收藏的题目列表
         QuestionCollectionListDTO dto = new QuestionCollectionListDTO();
-        dto.setUserId(SecurityUtils.getLoginUser().getStudent().getId());
+        dto.setUserId(SecurityUtils.getLoginUser().getUser().getUserId());
         List<QuestionCollection> list = questionCollectionService.selectQuestionCollectionList(dto);
         long count = list.stream().filter(o -> questionCollectionDTO.getQuestionId().equals(o.getQuestionId()) && questionCollectionDTO.getKm().equals(o.getKm())).count();
         if (count > 0) {
@@ -64,7 +64,7 @@ public class PcQuestionCollectionController extends BaseController {
     public Response<Integer> collections(@RequestBody QuestionCollectionYunDTO col) {
         //查询该用户已收藏的题目列表
         QuestionCollectionListDTO dto = new QuestionCollectionListDTO();
-        dto.setUserId(SecurityUtils.getLoginUser().getStudent().getId());
+        dto.setUserId(SecurityUtils.getLoginUser().getUser().getUserId());
         List<QuestionCollection> dblist = questionCollectionService.selectQuestionCollectionList(dto);
         List<String> questionIdsStr = dblist.stream().map(o -> (o.getQuestionId()+","+o.getKm())).collect(Collectors.toList());
 
@@ -94,7 +94,7 @@ public class PcQuestionCollectionController extends BaseController {
     @ApiOperation("备份本机收藏到云端")
     public Response bakCollections(@RequestBody QuestionCollectionYunDTO col) {
         //首先删除云端数据
-        Long userId = SecurityUtils.getLoginUser().getStudent().getId();
+        Long userId = SecurityUtils.getLoginUser().getUser().getUserId();
         QueryWrapper<QuestionCollection> queryWrapper = new QueryWrapper<QuestionCollection>();
         queryWrapper.eq("user_id",userId);
         queryWrapper.eq("km",col.getKm());
@@ -126,7 +126,7 @@ public class PcQuestionCollectionController extends BaseController {
             @ApiParam(name = "questionId", value = "题目id", required = true)
             @PathVariable String questionId
     ) {
-        Long userId = SecurityUtils.getLoginUser().getStudent().getId();
+        Long userId = SecurityUtils.getLoginUser().getUser().getUserId();
         QueryWrapper<QuestionCollection> queryWrapper = new QueryWrapper<QuestionCollection>();
         queryWrapper.eq("user_id", userId);
         queryWrapper.eq("question_id", questionId);
@@ -139,7 +139,7 @@ public class PcQuestionCollectionController extends BaseController {
     @DeleteMapping("/cancelAll")
     @ApiOperation("清空收藏")
     public  Response<Integer> removeAll(@RequestBody QuestionCollectionDelDTO questionCollectionDelDTO){
-        Long userId = SecurityUtils.getLoginUser().getStudent().getId();
+        Long userId = SecurityUtils.getLoginUser().getUser().getUserId();
         QueryWrapper<QuestionCollection> queryWrapper = new QueryWrapper<QuestionCollection>();
         queryWrapper.eq("user_id",userId);
         queryWrapper.eq("km",questionCollectionDelDTO.getKm());
@@ -153,7 +153,7 @@ public class PcQuestionCollectionController extends BaseController {
     @GetMapping("/collectionByUser")
     @ApiOperation("恢复云端收藏到本机（根据用户获取收藏题）")
     public Response<List<QuestionColIdDateVo>> appCollectionByUser(@ModelAttribute QuestionCollectionListDTO dto){
-        dto.setUserId(SecurityUtils.getLoginUser().getStudent().getId());
+        dto.setUserId(SecurityUtils.getLoginUser().getUser().getUserId());
         dto.setDeviceType(2);
         List<QuestionColIdDateVo> list = questionCollectionService.selectCollectionIdByUserId(dto);
         return Response.success(list);
@@ -162,7 +162,7 @@ public class PcQuestionCollectionController extends BaseController {
     @GetMapping("/collectionCountByUser")
     @ApiOperation("根据用户获取收藏题数")
     public Response<Integer> collectionCountByUser(@ModelAttribute QuestionCollectionListDTO dto){
-        dto.setUserId(SecurityUtils.getLoginUser().getStudent().getId());
+        dto.setUserId(SecurityUtils.getLoginUser().getUser().getUserId());
         dto.setDeviceType(2);
         Integer count = questionCollectionService.selectCollectionCountByUserId(dto);
         return Response.success(count);

jpcj-admin/src/main/java/com/miaxis/pc/controller/question/PcQuestionWrongController.java

@@ -43,7 +43,7 @@ public class PcQuestionWrongController extends BaseController {
     public Response<Integer> add(@RequestBody QuestionWrongDTO questionWrongDTO) {
         //查询该用户已收藏的题目列表
         QuestionWrongListDTO dto = new QuestionWrongListDTO();
-        dto.setUserId(SecurityUtils.getLoginUser().getStudent().getId());
+        dto.setUserId(SecurityUtils.getLoginUser().getUser().getUserId());
         List<QuestionWrong> list = questionWrongService.selectQuestionWrongList(dto);
         long count = list.stream().filter(o -> questionWrongDTO.getQuestionId().equals(o.getQuestionId()) && questionWrongDTO.getKm().equals(o.getKm())).count();
         if (count > 0) {
@@ -63,7 +63,7 @@ public class PcQuestionWrongController extends BaseController {
     public Response<Integer> wrongs(@RequestBody QuestionWrongYunDTO wrong) {
         //查询该用户已收藏的题目列表
         QuestionWrongListDTO dto = new QuestionWrongListDTO();
-        dto.setUserId(SecurityUtils.getLoginUser().getStudent().getId());
+        dto.setUserId(SecurityUtils.getLoginUser().getUser().getUserId());
         List<QuestionWrong> dblist = questionWrongService.selectQuestionWrongList(dto);
         List<String> questionIdsStr = dblist.stream().map(o -> o.getQuestionId() + "," + o.getKm()).collect(Collectors.toList());
 
@@ -93,7 +93,7 @@ public class PcQuestionWrongController extends BaseController {
     @ApiOperation("备份本机错题到云端")
     public Response bakWrongs(@RequestBody QuestionWrongYunDTO wrong) {
         //首先删除云端数据
-        Long userId = SecurityUtils.getLoginUser().getStudent().getId();
+        Long userId = SecurityUtils.getLoginUser().getUser().getUserId();
         QueryWrapper<QuestionWrong> queryWrapper = new QueryWrapper<QuestionWrong>();
         queryWrapper.eq("user_id", userId);
         queryWrapper.eq("km", wrong.getKm());
@@ -125,7 +125,7 @@ public class PcQuestionWrongController extends BaseController {
             @ApiParam(name = "questionId", value = "问题id", required = true)
             @PathVariable Long questionId
     ) {
-        Long userId = SecurityUtils.getLoginUser().getStudent().getId();
+        Long userId = SecurityUtils.getLoginUser().getUser().getUserId();
         QueryWrapper<QuestionWrong> queryWrapper = new QueryWrapper<QuestionWrong>();
         queryWrapper.eq("user_id", userId);
         queryWrapper.eq("question_id", questionId);
@@ -138,7 +138,7 @@ public class PcQuestionWrongController extends BaseController {
     @DeleteMapping("/cancelAll")
     @ApiOperation("清空错题")
     public Response<Integer> removeAll(@RequestBody QuestionWrongDelDTO questionWrongDelDTO) {
-        Long userId = SecurityUtils.getLoginUser().getStudent().getId();
+        Long userId = SecurityUtils.getLoginUser().getUser().getUserId();
         QueryWrapper<QuestionWrong> queryWrapper = new QueryWrapper<QuestionWrong>();
         queryWrapper.eq("user_id", userId);
         queryWrapper.eq("km", questionWrongDelDTO.getKm());
@@ -151,7 +151,7 @@ public class PcQuestionWrongController extends BaseController {
     @GetMapping("/wrongByUser")
     @ApiOperation("恢复云端错题到本机（根据用户获取错题）")
     public Response<List<QuestionWrongIdDateVo>> appWrongByUser(@ModelAttribute QuestionWrongListDTO dto) {
-        dto.setUserId(SecurityUtils.getLoginUser().getStudent().getId());
+        dto.setUserId(SecurityUtils.getLoginUser().getUser().getUserId());
         dto.setDeviceType(2);
         List<QuestionWrongIdDateVo> list = questionWrongService.selectWrongIdByUserId(dto);
         return Response.success(list);
@@ -161,7 +161,7 @@ public class PcQuestionWrongController extends BaseController {
     @GetMapping("/wrongCountByUser")
     @ApiOperation("根据用户获取错题数")
     public Response<Integer> wrongCountByUser(@ModelAttribute QuestionWrongListDTO dto) {
-        dto.setUserId(SecurityUtils.getLoginUser().getStudent().getId());
+        dto.setUserId(SecurityUtils.getLoginUser().getUser().getUserId());
         dto.setDeviceType(2);
         Integer count = questionWrongService.selectWrongCountByUserId(dto);
         return Response.success(count);