merge

zhongzheng-api/src/main/java/com/zhongzheng/controller/bank/QuestionController.java

@@ -1,26 +1,12 @@
 package com.zhongzheng.controller.bank;
 
-import cn.hutool.core.lang.Validator;
-import com.zhongzheng.common.annotation.Log;
 import com.zhongzheng.common.core.controller.BaseController;
 import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.core.domain.model.LoginUser;
 import com.zhongzheng.common.core.page.TableDataInfo;
-import com.zhongzheng.common.enums.BusinessType;
 import com.zhongzheng.common.utils.ServletUtils;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.framework.web.service.TokenService;
 import com.zhongzheng.framework.web.service.WxTokenService;
-import com.zhongzheng.modules.bank.bo.QuestionAddBo;
-import com.zhongzheng.modules.bank.bo.QuestionBusinessQueryBo;
-import com.zhongzheng.modules.bank.bo.QuestionEditBo;
-import com.zhongzheng.modules.bank.bo.QuestionQueryBo;
-import com.zhongzheng.modules.bank.domain.QuestionBusiness;
 import com.zhongzheng.modules.bank.service.IQuestionBusinessService;
 import com.zhongzheng.modules.bank.service.IQuestionService;
-import com.zhongzheng.modules.bank.vo.QuestionImport;
-import com.zhongzheng.modules.bank.vo.QuestionVo;
-import com.zhongzheng.modules.course.bo.CourseQueryBo;
 import com.zhongzheng.modules.exam.service.IExamPaperService;
 import com.zhongzheng.modules.exam.vo.ExamPaperVo;
 import com.zhongzheng.modules.goods.bo.GoodsQueryBo;
@@ -28,8 +14,9 @@ import com.zhongzheng.modules.goods.bo.SpecialExamRecordAddBo;
 import com.zhongzheng.modules.goods.bo.SpecialExamRecordQuery;
 import com.zhongzheng.modules.goods.bo.TodayExamSubscriptionBo;
 import com.zhongzheng.modules.goods.service.IGoodsService;
-import com.zhongzheng.modules.goods.vo.*;
-import com.zhongzheng.modules.order.vo.OrderGoodsVo;
+import com.zhongzheng.modules.goods.vo.GoodsExamTimeVo;
+import com.zhongzheng.modules.goods.vo.GoodsUserQuestionVo;
+import com.zhongzheng.modules.goods.vo.SpecialExamRecordVo;
 import com.zhongzheng.modules.user.bo.UserExamRecordQueryBo;
 import com.zhongzheng.modules.user.entity.ClientLoginUser;
 import com.zhongzheng.modules.user.service.IUserExamRecordService;
@@ -39,9 +26,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
@@ -181,8 +166,8 @@ public class QuestionController extends BaseController {
      * 每日一练消息提醒订阅
      */
     @ApiOperation("每日一练消息提醒订阅")
-    @GetMapping("/today/exam/subscription")
-    public AjaxResult<Void> todayExamSubscription(TodayExamSubscriptionBo bo) {
+    @PostMapping("/today/exam/subscription")
+    public AjaxResult<Void> todayExamSubscription(@RequestBody TodayExamSubscriptionBo bo) {
         ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
         bo.setUserId(loginUser.getUser().getUserId());
         return toAjax(iUserExamSubscriptionService.todayExamSubscription(bo)? 1 : 0);

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/impl/QuestionServiceImpl.java

@@ -46,7 +46,9 @@ import com.zhongzheng.modules.goods.vo.GoodsUserQuestionVo;
 import com.zhongzheng.modules.user.bo.CheckUserExamRecordBo;
 import com.zhongzheng.modules.user.bo.UserSpecialExamRecord;
 import com.zhongzheng.modules.user.domain.UserExamRecord;
+import com.zhongzheng.modules.user.domain.UserExamSubscription;
 import com.zhongzheng.modules.user.service.IUserExamRecordService;
+import com.zhongzheng.modules.user.service.IUserExamSubscriptionService;
 import com.zhongzheng.modules.user.service.IUserSpecialExamRecordService;
 import org.apache.poi.openxml4j.opc.PackagePart;
 import org.apache.poi.xwpf.usermodel.XWPFDocument;
@@ -117,6 +119,9 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
     @Autowired
     private IUserSpecialExamRecordService userSpecialExamRecordService;
 
+    @Autowired
+    private IUserExamSubscriptionService iUserExamSubscriptionService;
+
     @Autowired
     private IExamService iExamService;
 
@@ -1828,6 +1833,16 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
             Exam examTwo = iExamService.getById(goodsExamTimeTwo.getExamId());
             vo.setExamNameBelow(examTwo.getExamName());
         }
+        //是否订阅消息
+        UserExamSubscription subscription = iUserExamSubscriptionService
+                .getOne(new LambdaQueryWrapper<UserExamSubscription>()
+                .eq(UserExamSubscription::getGoodsId, goodsId)
+                .eq(UserExamSubscription::getUserId, userId));
+        if (ObjectUtils.isNotNull(subscription) && subscription.getSubscriptionStatus() == 1){
+            vo.setSubscription(1);
+        }else {
+            vo.setSubscription(0);
+        }
         //获取打卡记录
         List<UserSpecialExamRecord> list = userSpecialExamRecordService.list(new LambdaQueryWrapper<UserSpecialExamRecord>()
                 .eq(UserSpecialExamRecord::getGoodsId, vo.getGoodsId()));

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/GoodsExamTimeVo.java

@@ -45,5 +45,7 @@ public class GoodsExamTimeVo implements Serializable {
     private Integer examRecord;
     @ApiModelProperty("明日打卡试卷名称")
     private String examNameBelow;
+    @ApiModelProperty("消息订阅状态：1已订阅 0未订阅")
+    private Integer subscription;
 
 }