fix 通知

zhongzheng-system/src/main/java/com/zhongzheng/modules/mock/bo/MockApplyAddBo.java

@@ -58,6 +58,9 @@ public class MockApplyAddBo {
     /** 开考限制时间 */
     @ApiModelProperty("开考限制时间")
     private Long timeLimit;
+    /** 模考通知状态 0未通知 1已通知 */
+    @ApiModelProperty("模考通知状态 0未通知 1已通知")
+    private Integer mockRemind;
 
     /** 关联专业列表 */
     @ApiModelProperty("关联专业列表")

zhongzheng-system/src/main/java/com/zhongzheng/modules/mock/bo/MockApplyEditBo.java

@@ -72,6 +72,10 @@ public class MockApplyEditBo {
     @ApiModelProperty("开考限制时间")
     private Long timeLimit;
 
+    /** 模考通知状态 0未通知 1已通知 */
+    @ApiModelProperty("模考通知状态 0未通知 1已通知")
+    private Integer mockRemind;
+
     /** 关联专业列表 */
     @ApiModelProperty("关联专业列表")
     private List<MockMajorEditBo> mockMajorList;

zhongzheng-system/src/main/java/com/zhongzheng/modules/mock/bo/MockApplyQueryBo.java

@@ -95,4 +95,8 @@ public class MockApplyQueryBo extends BaseEntity {
 	/** 开考限制时间(毫秒) */
 	@ApiModelProperty("开考限制时间(毫秒)")
 	private Long timeLimitMillisecond ;
+
+	/** 模考通知状态 0未通知 1已通知 */
+	@ApiModelProperty("模考通知状态 0未通知 1已通知")
+	private Integer mockRemind;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/mock/domain/MockApply.java

@@ -1,6 +1,7 @@
 package com.zhongzheng.modules.mock.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
@@ -54,4 +55,6 @@ private static final long serialVersionUID=1L;
     private String code;
     /** 开考限制时间 */
     private String timeLimit;
+    /** 模考通知状态 0未通知 1已通知 */
+    private Integer mockRemind;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/mock/service/impl/MockApplyServiceImpl.java

@@ -97,6 +97,7 @@ public class MockApplyServiceImpl extends ServiceImpl<MockApplyMapper, MockApply
         lqw.eq(bo.getEducationTypeId() != null, MockApply::getEducationTypeId, bo.getEducationTypeId());
         lqw.eq(bo.getBusinessId() != null, MockApply::getBusinessId, bo.getBusinessId());
         lqw.eq(bo.getTimeLimit() != null, MockApply::getTimeLimit, bo.getTimeLimit());
+        lqw.eq(bo.getMockRemind() != null, MockApply::getMockRemind, bo.getMockRemind());
         lqw.eq(StrUtil.isNotBlank(bo.getCode()), MockApply::getCode, bo.getCode());
         return entity2Vo(this.list(lqw));
     }

zhongzheng-system/src/main/java/com/zhongzheng/modules/mock/vo/MockApplyVo.java

@@ -194,4 +194,9 @@ public class MockApplyVo {
 	@ApiModelProperty("封面地址")
 	private String coverUrl;
 
+	/** 模考通知状态 0未通知 1已通知 */
+	@Excel(name = "模考通知状态 0未通知 1已通知")
+	@ApiModelProperty("模考通知状态 0未通知 1已通知")
+	private Integer mockRemind;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/schedule/service/impl/ScheduleServiceImpl.java

@@ -68,6 +68,7 @@ import com.zhongzheng.modules.inform.service.IInformService;
 import com.zhongzheng.modules.inform.service.IInformUserService;
 import com.zhongzheng.modules.inform.vo.InformRemindVo;
 import com.zhongzheng.modules.inform.vo.InformVo;
+import com.zhongzheng.modules.mock.bo.MockApplyEditBo;
 import com.zhongzheng.modules.mock.domain.MockApply;
 import com.zhongzheng.modules.mock.domain.MockMajorSubject;
 import com.zhongzheng.modules.mock.domain.MockMajorSubjectTime;
@@ -1396,6 +1397,12 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                 }
             }
         }
+        mockApplyVos.forEach(mockApplyVo -> {
+            MockApplyEditBo bo1 = new MockApplyEditBo();
+            bo1.setApplyId(mockApplyVo.getApplyId());
+            bo1.setMockRemind(1);
+            iMockApplyService.updateByEditBo(bo1);
+        });
     }
 
     @Override
@@ -1403,6 +1410,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
         //提醒考试
         LambdaQueryWrapper<UserMockSubscribe> lqw = Wrappers.lambdaQuery();
         lqw.eq(UserMockSubscribe::getMockRemind,1);
+        lqw.eq(UserMockSubscribe::getHasMockRemind,0);
         List<UserMockSubscribe> userMockSubscribeList = iUserMockSubscribeService.list(lqw);
         userMockSubscribeList.removeIf(userMockSubscribe -> {
             try {
@@ -1459,6 +1467,10 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                         iInformUserService.insertByAddBo(informUserAddBo);
                     }
                 }
+                UserMockSubscribeEditBo bo1 = new UserMockSubscribeEditBo();
+                bo1.setSubscribeId(subscribeVo.getSubscribeId());
+                bo1.setHasMockRemind(1);
+                iUserMockSubscribeService.updateByEditBo(bo1);
             }
         }
     }
@@ -1501,7 +1513,12 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                     iInformUserService.insertByAddBo(informUserAddBo);
                 }
             }
+            UserMockSubscribeEditBo bo1 = new UserMockSubscribeEditBo();
+            bo1.setSubscribeId(userMockSubscribeVo.getSubscribeId());
+            bo1.setHasLiveSubscribe(1);
+            iUserMockSubscribeService.updateByEditBo(bo1);
         }
+
     }
 
     private Long formatTime(Long startTime, String addTime) throws ParseException{

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserMockSubscribeAddBo.java

@@ -73,4 +73,11 @@ public class UserMockSubscribeAddBo {
     /** 预约直播 0不预约 1预约 */
     @ApiModelProperty("预约直播 0不预约 1预约")
     private Integer liveSubscribe;
+
+    /** 是否已发送开考通知 0否 1是 */
+    @ApiModelProperty("是否已发送开考通知 0否 1是")
+    private Integer hasMockRemind;
+    /** 是否已发送开播通知 0不预约 1预约 */
+    @ApiModelProperty("是否已发送开播通知 0不预约 1预约")
+    private Integer hasLiveSubscribe;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserMockSubscribeEditBo.java

@@ -91,4 +91,10 @@ public class UserMockSubscribeEditBo {
     @ApiModelProperty("预约直播 0不预约 1预约")
     private Integer liveSubscribe;
 
+    /** 是否已发送开考通知 0否 1是 */
+    @ApiModelProperty("是否已发送开考通知 0否 1是")
+    private Integer hasMockRemind;
+    /** 是否已发送开播通知 0不预约 1预约 */
+    @ApiModelProperty("是否已发送开播通知 0不预约 1预约")
+    private Integer hasLiveSubscribe;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserMockSubscribeQueryBo.java

@@ -120,4 +120,11 @@ public class UserMockSubscribeQueryBo extends BaseEntity {
 	/** 预约直播 0不预约 1预约 */
 	@ApiModelProperty("预约直播 0不预约 1预约")
 	private Integer liveSubscribe;
+
+	/** 是否已发送开考通知 0否 1是 */
+	@ApiModelProperty("是否已发送开考通知 0否 1是")
+	private Integer hasMockRemind;
+	/** 是否已发送开播通知 0不预约 1预约 */
+	@ApiModelProperty("是否已发送开播通知 0不预约 1预约")
+	private Integer hasLiveSubscribe;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/UserMockSubscribe.java

@@ -65,4 +65,9 @@ private static final long serialVersionUID=1L;
     private Integer mockRemind;
     /** 预约直播 0不预约 1预约 */
     private Integer liveSubscribe;
+
+    /** 是否已发送开考通知 0否 1是 */
+    private Integer hasMockRemind;
+    /** 是否已发送开播通知 0不预约 1预约 */
+    private Integer hasLiveSubscribe;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserMockSubscribeServiceImpl.java

@@ -89,6 +89,8 @@ public class UserMockSubscribeServiceImpl extends ServiceImpl<UserMockSubscribeM
         lqw.eq(bo.getFirstHandTime() != null, UserMockSubscribe::getFirstHandTime, bo.getFirstHandTime());
         lqw.eq(bo.getMockRemind() != null, UserMockSubscribe::getMockRemind, bo.getMockRemind());
         lqw.eq(bo.getLiveSubscribe() != null, UserMockSubscribe::getLiveSubscribe, bo.getLiveSubscribe());
+        lqw.eq(bo.getHasMockRemind() != null, UserMockSubscribe::getHasMockRemind, bo.getHasMockRemind());
+        lqw.eq(bo.getHasLiveSubscribe() != null, UserMockSubscribe::getHasLiveSubscribe, bo.getHasLiveSubscribe());
         return entity2Vo(this.list(lqw));
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserMockSubscribeVo.java

@@ -215,4 +215,13 @@ public class UserMockSubscribeVo {
 	@Excel(name = "前缀名称")
 	@ApiModelProperty("前缀名称")
 	private String prefixName;
+
+	/** 是否已发送开考通知 0否 1是 */
+	@Excel(name = "是否已发送开考通知 0否 1是")
+	@ApiModelProperty("是否已发送开考通知 0否 1是")
+	private Integer hasMockRemind;
+	/** 预约直播 0不预约 1预约 */
+	@Excel(name = "是否已发送直播通知 0否 1是")
+	@ApiModelProperty("是否已发送直播通知 0否 1是")
+	private Integer hasLiveSubscribe;
 }

zhongzheng-system/src/main/resources/mapper/modules/mock/MockApplyMapper.xml

@@ -18,6 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="businessId" column="business_id"/>
         <result property="projectId" column="project_id"/>
         <result property="code" column="code"/>
+        <result property="mockRemind" column="mockRemind"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.mock.vo.MockApplyVo" id="MockApplyVoResult">
@@ -52,6 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="liveEndTime" column="live_end_time"/>
         <result property="recordingUrl" column="recording_url"/>
         <result property="coverUrl" column="cover_url"/>
+        <result property="mockRemind" column="mockRemind"/>
     </resultMap>
     <select id="getMockSubjectInfo" parameterType="java.lang.Long" resultMap="MockApplyVoResult">
         SELECT ma.*,
@@ -219,6 +221,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
             unix_timestamp(now()) &lt; ma.apply_end_time
             AND unix_timestamp(now()) &gt; ma.apply_start_time
+            AND ma.mock_remind = 0
     </select>
     <select id="mockLiving" parameterType="java.lang.Long" resultType="java.lang.String">
         SELECT

zhongzheng-system/src/main/resources/mapper/modules/user/UserMockSubscribeMapper.xml

@@ -24,6 +24,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="firstHandTime" column="first_hand_time"/>
         <result property="mockRemind" column="mock_remind"/>
         <result property="liveSubscribe" column="live_subscribe"/>
+        <result property="hasMockRemind" column="has_mock_remind"/>
+        <result property="hasLiveSubscribe" column="has_live_subscribe"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.user.vo.UserMockSubscribeVo" id="UserMockSubscribeVoResult">
@@ -63,6 +65,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="liveStartTime" column="live_start_time"/>
         <result property="liveEndTime" column="live_end_time"/>
         <result property="prefixName" column="prefix_name"/>
+        <result property="hasMockRemind" column="has_mock_remind"/>
+        <result property="hasLiveSubscribe" column="has_live_subscribe"/>
     </resultMap>
     <select id="getInfo" parameterType="java.lang.Long" resultMap="UserMockSubscribeVoResult">
         SELECT 	ums.*,
@@ -197,6 +201,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN course_subject css ON mms.subject_id = css.id
         WHERE
             ums.live_subscribe = 1
+          and ums.has_live_subscribe = 0
           and cs.live_start_time is not null
     </select>