Merge branch 'develop' into release

tuoheng-api/src/main/java/com/tuoheng/api/controller/WestreamVideoController.java

     public JsonResult updateProgress(@RequestBody WestreamVideoQuery query) {
         return westreamVideoService.updateProgress(query);
     }
+
+    /**
+     * 查询学习视频观看进度
+     *
+     * @param query 查询条件
+     * @return
+     */
+    @GetMapping("/getVideoProgress")
+    public JsonResult getVideoProgress(WestreamVideoQuery query) {
+        return westreamVideoService.getVideoProgress(query);
+    }
 }

tuoheng-api/src/main/java/com/tuoheng/api/service/IWestreamVideoService.java

     JsonResult queryPage(WestreamVideoQuery query);
 
     JsonResult updateProgress(WestreamVideoQuery query);
+
+    JsonResult getVideoProgress(WestreamVideoQuery query);
 }

tuoheng-api/src/main/java/com/tuoheng/api/service/impl/WestreamVideoServiceImpl.java

 import com.tuoheng.api.entity.request.WestreamVideoQuery;
 import com.tuoheng.api.mapper.*;
 import com.tuoheng.api.service.IWestreamVideoService;
-import com.tuoheng.api.utils.SmsUtil;
 import com.tuoheng.common.common.BaseServiceImpl;
 import com.tuoheng.common.utils.CommonUtils;
 import com.tuoheng.common.utils.JsonResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Arrays;
 import java.util.Date;
-import java.util.List;
 
 /**
  * 全民护河学习视频表 服务实现类
 
         return JsonResult.success();
     }
+
+    @Override
+    public JsonResult getVideoProgress(WestreamVideoQuery query) {
+        if(null == query.getTenantId() || StringUtils.isEmpty(query.getOpenid())){
+            return JsonResult.error("参数为空！");
+        }
+        if(null == query.getVideoId()){
+            return JsonResult.error("视频ID为空！");
+        }
+
+        WestreamVideoUser westreamVideoUser = westreamVideoUserMapper.selectOne(new LambdaQueryWrapper<WestreamVideoUser>()
+                .eq(WestreamVideoUser::getTenantId, query.getTenantId())
+                .eq(WestreamVideoUser::getOpenid, query.getOpenid())
+                .eq(WestreamVideoUser::getVideoId, query.getVideoId())
+                .eq(WestreamVideoUser::getMark, 1));
+        return JsonResult.success(westreamVideoUser);
+    }
 }