diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieci/controller/KcJieciController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieci/controller/KcJieciController.java
index 2adf38a1..c461a3fe 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieci/controller/KcJieciController.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieci/controller/KcJieciController.java
@@ -178,4 +178,11 @@ public class KcJieciController extends JeecgController<KcJieci, IKcJieciService>
 		 return Result.OK(pageList);
 	 }
 
+	 @ApiOperation(value="可线上听课课堂-提前半小时", notes="可线上听课课堂-提前半小时")
+	 @GetMapping(value = "/getIndexJcXskcList")
+	 public Result<List<KcJieci>> getIndexJcXskcList(KcJieci kcJieci) {
+		 List<KcJieci> pageList = kcJieciService.getIndexJcXskcList(kcJieci);
+		 return Result.OK(pageList);
+	 }
+
 }
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieci/service/IKcJieciService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieci/service/IKcJieciService.java
index 238651f6..65aff722 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieci/service/IKcJieciService.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieci/service/IKcJieciService.java
@@ -14,4 +14,6 @@ import java.util.List;
 public interface IKcJieciService extends IService<KcJieci> {
 
     List<KcJieci> getIndexJcList(KcJieci kcJieci);
+
+    List<KcJieci> getIndexJcXskcList(KcJieci kcJieci);
 }
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieci/service/impl/KcJieciServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieci/service/impl/KcJieciServiceImpl.java
index 63311aba..efec2b2e 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieci/service/impl/KcJieciServiceImpl.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieci/service/impl/KcJieciServiceImpl.java
@@ -1,5 +1,6 @@
 package org.jeecg.modules.kc.kcJieci.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.jeecg.common.util.DateUtils;
 import org.jeecg.modules.kc.kcJieci.entity.KcJieci;
@@ -61,17 +62,118 @@ public class KcJieciServiceImpl extends ServiceImpl<KcJieciMapper, KcJieci> impl
                 xyjjc = list.get(0).getJieci();
             }else{
                 for(int i=0;i<list.size();i++){
+                    dqkssj = DateUtils.getDate("yyyy-MM-dd");
                     String kssj = "";
                     String jssj = "";
-                    if(i==list.size()-1){
-                        kssj = list.get(i).getHhks();
-                        jssj = list.get(i).getHhjs();
-                    }else{
-                        kssj = list.get(i).getHhks();
-                        jssj = list.get(i+1).getHhks();
-                    }
+
+                    kssj = list.get(i).getHhks();
+                    jssj = list.get(i).getHhjs();
+
+                    Calendar calendar2 = Calendar.getInstance();
+                    calendar2.setTime(DateUtil.parse(dqkssj+" "+kssj.substring(0,2)+":"+kssj.substring(2,4)+":00","yyyy-MM-dd HH:mm:ss"));
+                    //从当前日期减去15分钟
+                    calendar2.add(Calendar.MINUTE, -15);
+                    kssj = DateUtil.format(calendar2.getTime(),"HHmm") ;
+//
+//                    if(i==list.size()-1){
+//                        kssj = list.get(i).getHhks();
+//                        jssj = list.get(i).getHhjs();
+//                    }else{
+//                        kssj = list.get(i).getHhks();
+//                        jssj = list.get(i+1).getHhks();
+//                    }
                     if(Integer.parseInt(dqsj)>=Integer.parseInt(kssj)&&Integer.parseInt(dqsj)<Integer.parseInt(jssj)){
-                        dqkssj = DateUtils.getDate("yyyy-MM-dd");
+                        dqjc = list.get(i).getJieci();
+                        if(i==list.size()-1){
+                            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");//设置格式
+                            Calendar calendar = Calendar.getInstance(); //创建Calendar 的实例
+                            calendar.add(Calendar.DAY_OF_MONTH, +1); //当前时间减去一天，即一天前的时间
+                            //如果当前时间大于最后一节课则赋值给最后一节课
+                            dqkssj = DateUtils.getDate("yyyy-MM-dd");
+                            dqjc = "";
+                            //下一节课赋值给明天第一节
+                            xyjkssj = simpleDateFormat.format(calendar.getTime());
+                            xyjjc = list.get(0).getJieci();
+                        }else{
+                            xyjkssj = DateUtils.getDate("yyyy-MM-dd");
+                            xyjjc = list.get(i+1).getJieci();
+                        }
+                        break;
+                    }
+                }
+            }
+        }
+        KcJieci kcJieciRes = new KcJieci();
+        kcJieciRes.setKssj(dqkssj);
+        kcJieciRes.setJieci(dqjc);
+        kcJieciRes.setType("1");
+        resList.add(kcJieciRes);
+        kcJieciRes = new KcJieci();
+        kcJieciRes.setKssj(xyjkssj);
+        kcJieciRes.setJieci(xyjjc);
+        kcJieciRes.setType("2");
+        resList.add(kcJieciRes);
+        return resList;
+    }
+
+    @Override
+    public List<KcJieci> getIndexJcXskcList(KcJieci kcJieci) {
+        QueryWrapper<KcJieci> queryWrapper = new QueryWrapper<>();
+        queryWrapper.apply("LENGTH(jieci)>2");
+        queryWrapper.orderByAsc("id");
+        List<KcJieci> list = baseMapper.selectList(queryWrapper);
+        List<KcJieci> resList = new ArrayList<>();
+        String dqsj = DateUtils.getDate("HHmm");//获取当前时间的小时和分钟
+        String minDate = list.get(0).getHhks();//最小开始时间
+        String maxDate = list.get(5).getHhjs();//最大结束时间
+        String dqkssj = "";//当前开始时间
+        String dqjc = "";//当前节次
+        String xyjkssj = "";//当前开始时间
+        String xyjjc = "";//当前节次
+        if(Integer.parseInt(dqsj)<Integer.parseInt(minDate)){
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");//设置格式
+            Calendar calendar = Calendar.getInstance(); //创建Calendar 的实例
+            calendar.add(Calendar.DAY_OF_MONTH, -1); //当前时间减去一天，即一天前的时间
+            //如果当前时间小于第一节开始时间则当前时间赋值为昨天，节次为最后一节
+            dqkssj = simpleDateFormat.format(calendar.getTime());
+            dqjc = "";
+            //下一节赋值为当天第一节
+            xyjkssj = DateUtils.getDate("yyyy-MM-dd");
+            xyjjc = list.get(0).getJieci();
+        }else{
+            if(Integer.parseInt(dqsj)>Integer.parseInt(maxDate)){
+                SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");//设置格式
+                Calendar calendar = Calendar.getInstance(); //创建Calendar 的实例
+                calendar.add(Calendar.DAY_OF_MONTH, +1); //当前时间减去一天，即一天前的时间
+                //如果当前时间大于最后一节课则赋值给最后一节课
+                dqkssj = DateUtils.getDate("yyyy-MM-dd");
+                dqjc = "";
+                //下一节课赋值给明天第一节
+                xyjkssj = simpleDateFormat.format(calendar.getTime());
+                xyjjc = list.get(0).getJieci();
+            }else{
+                dqkssj = DateUtils.getDate("yyyy-MM-dd");
+                for(int i=0;i<list.size();i++){
+                    String kssj = "";
+                    String jssj = "";
+                    kssj = list.get(i).getHhks();
+                    jssj = list.get(i).getHhjs();
+
+                    Calendar calendar2 = Calendar.getInstance();
+                    calendar2.setTime(DateUtil.parse(dqkssj+" "+kssj.substring(0,2)+":"+kssj.substring(2,4)+":00","yyyy-MM-dd HH:mm:ss"));
+                    //从当前日期减去15分钟
+                    calendar2.add(Calendar.MINUTE, -15);
+                    kssj = DateUtil.format(calendar2.getTime(),"HHmm") ;
+
+//                    if(i==0){
+//                        kssj = list.get(i).getHhks();
+//                        jssj = list.get(i).getHhjs();
+//                    }else{
+//                        kssj = list.get(i-1).getHhjs();
+//                        jssj = list.get(i).getHhjs();
+//                    }
+                    if(Integer.parseInt(dqsj)>=Integer.parseInt(kssj)&&Integer.parseInt(dqsj)<Integer.parseInt(jssj)){
+
                         dqjc = list.get(i).getJieci();
                         if(i==list.size()-1){
                             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");//设置格式