fix 判断是否有模考直播

zhongzheng-api/src/main/java/com/zhongzheng/controller/mock/MockApplyController.java

@@ -21,7 +21,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import java.text.ParseException;
 import java.util.Arrays;
 import java.util.List;
 
@@ -148,4 +147,16 @@ public class MockApplyController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 查询是否有模考讲解直播正在进行
+     * @return
+     */
+    @ApiOperation("查询是否有模考讲解直播正在进行")
+    @PreAuthorize("@ss.hasPermi('system:apply:list')")
+    @GetMapping("/mockLiving")
+    public AjaxResult<String> mockLiving() {
+        ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
+        return AjaxResult.success("", iMockApplyService.mockLiving(loginUser.getUser().getUserId()));
+    }
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/mock/mapper/MockApplyMapper.java

@@ -1,5 +1,6 @@
 package com.zhongzheng.modules.mock.mapper;
 
+import com.zhongzheng.common.core.domain.AjaxResult;
 import com.zhongzheng.modules.mock.bo.MockApplyQueryBo;
 import com.zhongzheng.modules.mock.domain.MockApply;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -27,4 +28,6 @@ public interface MockApplyMapper extends BaseMapper<MockApply> {
     List<MockApplyVo> listMockLive(MockApplyQueryBo bo);
 
     List<MockApplyVo> listSubjects();
+
+    String mockLiving(Long userId);
 }

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

@@ -1,5 +1,6 @@
 package com.zhongzheng.modules.mock.service;
 
+import com.zhongzheng.common.core.domain.AjaxResult;
 import com.zhongzheng.modules.mock.domain.MockApply;
 import com.zhongzheng.modules.mock.vo.MockApplyVo;
 import com.zhongzheng.modules.mock.bo.MockApplyQueryBo;
@@ -64,4 +65,6 @@ public interface IMockApplyService extends IService<MockApply> {
     List<MockApplyVo> listMockLive(MockApplyQueryBo bo);
 
     List<MockApplyVo> listSubjects();
+
+    String mockLiving(Long userId);
 }

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

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
+import com.zhongzheng.common.core.domain.AjaxResult;
 import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.ServletUtils;
@@ -519,4 +520,9 @@ public class MockApplyServiceImpl extends ServiceImpl<MockApplyMapper, MockApply
     public List<MockApplyVo> listSubjects() {
         return baseMapper.listSubjects();
     }
+
+    @Override
+    public String mockLiving(Long userId) {
+        return baseMapper.mockLiving(userId);
+    }
 }

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

@@ -220,6 +220,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             unix_timestamp(now()) < ma.apply_end_time
             AND unix_timestamp(now()) > ma.apply_start_time
     </select>
+    <select id="mockLiving" parameterType="java.lang.Long" resultType="java.lang.String">
+        SELECT
+            cs.live_url
+        FROM
+            user_mock_subscribe ums
+        LEFT JOIN mock_major_subject mms ON ums.mock_major_subject_id = mms.mock_major_subject_id
+        LEFT JOIN course_section cs ON mms.section_id = cs.section_id
+        WHERE
+            ums.user_id = #{userId}
+          and unix_timestamp(now()) &gt; cs.live_start_time
+          and unix_timestamp(now()) &lt; cs.live_end_time
+    </select>
 
 
 </mapper>