Browse Source

调整复制链接的手动看课

yfh 1 ngày trước cách đây
mục cha
commit
2dedbf4f1a

+ 23 - 5
fs-company/src/main/java/com/fs/company/controller/course/FsUserCoursePeriodController.java

@@ -15,12 +15,11 @@ import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.course.domain.FsUserCoursePeriod;
 import com.fs.course.domain.FsUserCoursePeriodDays;
 import com.fs.course.domain.FsUserCourseVideoRedPackage;
-import com.fs.course.param.CompanyRedPacketParam;
-import com.fs.course.param.FsBatchPeriodRedPackageParam;
-import com.fs.course.param.PeriodCountParam;
-import com.fs.course.param.PeriodStatisticCountParam;
+import com.fs.course.param.*;
+import com.fs.course.param.newfs.FsCourseSortLinkParam;
 import com.fs.course.service.IFsUserCoursePeriodDaysService;
 import com.fs.course.service.IFsUserCoursePeriodService;
+import com.fs.course.service.IFsUserCourseService;
 import com.fs.course.service.IFsUserCourseVideoRedPackageService;
 import com.fs.course.vo.FsPeriodCountVO;
 import com.fs.course.vo.FsUserCoursePeriodVO;
@@ -36,6 +35,8 @@ import com.hc.openapi.tool.fastjson.JSONObject;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
@@ -58,7 +59,7 @@ public class FsUserCoursePeriodController extends BaseController {
     private final IFsUserCoursePeriodDaysService fsUserCoursePeriodDaysService;
     private final IFsUserCourseVideoRedPackageService fsUserCourseVideoRedPackageService;
     private final TokenService tokenService;
-
+    private final IFsUserCourseService fsUserCourseService;
     /**
      * 查询会员营期列表
      */
@@ -351,4 +352,21 @@ public class FsUserCoursePeriodController extends BaseController {
         List<FsUserCoursePeriod> list = fsUserCoursePeriodService.selectFsPeriodlist(param);
         return R.ok().put("data", list);
     }
+
+
+    @PostMapping("/courseSortLink")
+    @ApiOperation("生成课程分享短链")
+    public R createCourseSortLink(@RequestBody FsCourseSortLinkParam param) {
+        FsCourseLinkCreateParam fsCourseLinkCreateParam = new FsCourseLinkCreateParam();
+        BeanUtils.copyProperties(param, fsCourseLinkCreateParam);
+        fsCourseLinkCreateParam.setIsCourse(true);
+        R courseSortLink = fsUserCourseService.createAppCourseSortLink(fsCourseLinkCreateParam);
+        String url = courseSortLink.get("url").toString();
+        Map<String, Object> map = new HashMap<>();
+        map.put("url", url);
+        return R.ok(map);
+    }
+
+
+
 }

+ 5 - 0
fs-service/src/main/java/com/fs/course/param/FsCourseLinkCreateParam.java

@@ -40,4 +40,9 @@ public class FsCourseLinkCreateParam {
 
     private Long projectId;//项目ID
 
+    /**
+     * 是否看课短链
+     */
+    private Boolean isCourse=false;
+
 }

+ 1 - 1
fs-service/src/main/java/com/fs/course/service/impl/FsUserCourseServiceImpl.java

@@ -777,7 +777,7 @@ public class FsUserCourseServiceImpl implements IFsUserCourseService
         link.setUpdateTime(calendar.getTime());
         int i = fsCourseLinkMapper.insertFsCourseLink(link);
         if (i > 0){
-            if (CloudHostUtils.hasCloudHostName("中康")){
+            if (CloudHostUtils.hasCloudHostName("中康")||param.getIsCourse()){
                 String domainName = getDomainName(param.getCompanyUserId(), config);
                 String sortLink = domainName + link.getRealLink().replace("/#","");
                 return R.ok().put("url", sortLink).put("link", random);

+ 1 - 3
fs-user-app/src/main/java/com/fs/app/controller/course/CourseFsUserController.java

@@ -112,7 +112,6 @@ public class CourseFsUserController extends AppBaseController {
         return courseVideoService.getLinkCourseVideoDetails(param);
     }
 
-    @Login
     @ApiOperation("H5国际课程详情")
     @GetMapping("/getCourseGjVideoDetails")
     @UserOperationLog(operationType = FsUserOperationEnum.STUDY)
@@ -147,8 +146,7 @@ public class CourseFsUserController extends AppBaseController {
 
 
     @ApiOperation("获取国际缓冲流量")
-    @PostMapping("/getInternetTraffic")
-    @Login
+    @PostMapping("/getGjInternetTraffic")
     public R getGjInternetTraffic(@RequestBody FsUserCourseVideoFinishUParam param) {
         return courseVideoService.getGjInternetTraffic(param);
     }