Skip to content

C
cloud-web
Commit 66d3b9a8 by 梅存智
Options

活动优化

parent b68d9184
Showing with 55 additions and 21 deletions
cloud-web-student/src/main/java/com/yizhi/application/enroll/controller/EnrollApiController.java
...@@ -2,6 +2,7 @@ package com.yizhi.application.enroll.controller; ...@@ -2,6 +2,7 @@ package com.yizhi.application.enroll.controller;
import com.yizhi.enroll.application.feign.EnrollFeignClient; import com.yizhi.enroll.application.feign.EnrollFeignClient;
import com.yizhi.enroll.application.vo.IdEnrollVO; import com.yizhi.enroll.application.vo.IdEnrollVO;
import com.yizhi.training.application.feign.TpEnrollPassedClient;
import com.yizhi.util.application.constant.ReturnCode; import com.yizhi.util.application.constant.ReturnCode;
import com.yizhi.util.application.domain.Response; import com.yizhi.util.application.domain.Response;
import com.yizhi.util.application.enums.i18n.Constants; import com.yizhi.util.application.enums.i18n.Constants;
...@@ -28,6 +29,9 @@ public class EnrollApiController { ...@@ -28,6 +29,9 @@ public class EnrollApiController {
@Autowired @Autowired
private EnrollFeignClient enrollFeignClient; private EnrollFeignClient enrollFeignClient;
@Autowired
private TpEnrollPassedClient tpEnrollPassedClient;
@ApiOperation(value = "添加学员报名信息", notes = "添加学员报名信息") @ApiOperation(value = "添加学员报名信息", notes = "添加学员报名信息")
@PostMapping("/student") @PostMapping("/student")
@ApiImplicitParams({ @ApiImplicitParams({
...@@ -39,6 +43,7 @@ public class EnrollApiController { ...@@ -39,6 +43,7 @@ public class EnrollApiController {
return Response.fail("参数错误"); return Response.fail("参数错误");
} }
Long id = enrollFeignClient.insertTrEnrollRecord(vo.getId()); Long id = enrollFeignClient.insertTrEnrollRecord(vo.getId());
tpEnrollPassedClient.insertTpStudentEnrollPassed(vo.getId(), id);
return Response.ok(id); return Response.ok(id);
} catch (Exception e) { } catch (Exception e) {
LOG.error("添加学员报名信息:" + e); LOG.error("添加学员报名信息:" + e);
......
cloud-web-student/src/main/java/com/yizhi/application/project/controller/TrainingProjectController.java
package com.yizhi.application.project.controller; package com.yizhi.application.project.controller;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.plugins.Page;
import com.yizhi.application.project.controller.util.ProjectWorkUtil; import com.yizhi.application.project.controller.util.ProjectWorkUtil;
import com.yizhi.core.application.cache.RedisCache; import com.yizhi.core.application.cache.RedisCache;
...@@ -9,7 +26,6 @@ import com.yizhi.course.application.feign.CoursePcClient; ...@@ -9,7 +26,6 @@ import com.yizhi.course.application.feign.CoursePcClient;
import com.yizhi.enroll.application.feign.EnrollFeignClient; import com.yizhi.enroll.application.feign.EnrollFeignClient;
import com.yizhi.enroll.application.vo.GetEnrollVO; import com.yizhi.enroll.application.vo.GetEnrollVO;
import com.yizhi.live.application.feign.LiveActivityClient; import com.yizhi.live.application.feign.LiveActivityClient;
import com.yizhi.live.application.vo.LiveActivityVO;
import com.yizhi.site.application.enums.FunctionTypeCode; import com.yizhi.site.application.enums.FunctionTypeCode;
import com.yizhi.site.application.feign.api.FunctionDisplayConfigApiClients; import com.yizhi.site.application.feign.api.FunctionDisplayConfigApiClients;
import com.yizhi.site.application.vo.domain.FunctionDisplayConfigVo; import com.yizhi.site.application.vo.domain.FunctionDisplayConfigVo;
...@@ -17,25 +33,24 @@ import com.yizhi.training.application.constant.CertificateGrantStatus; ...@@ -17,25 +33,24 @@ import com.yizhi.training.application.constant.CertificateGrantStatus;
import com.yizhi.training.application.feign.TpPlanActivityClient; import com.yizhi.training.application.feign.TpPlanActivityClient;
import com.yizhi.training.application.feign.TrainingProjectClient; import com.yizhi.training.application.feign.TrainingProjectClient;
import com.yizhi.training.application.model.BaseModel; import com.yizhi.training.application.model.BaseModel;
import com.yizhi.training.application.vo.api.*; import com.yizhi.training.application.vo.api.HotEnrollListVo;
import com.yizhi.training.application.vo.api.HotEnrollParamVo;
import com.yizhi.training.application.vo.api.IdVo;
import com.yizhi.training.application.vo.api.TrainingProjectDetailVo;
import com.yizhi.training.application.vo.api.TrainingProjectIntroductionEnrollVo;
import com.yizhi.training.application.vo.api.TrainingProjectIntroductionVo;
import com.yizhi.training.application.vo.api.TrainingProjectListVo;
import com.yizhi.training.application.vo.api.TrainingProjectMyParamVo;
import com.yizhi.training.application.vo.api.TrainingProjectParamVo;
import com.yizhi.training.application.vo.domain.TpAuthorizationRangeVo; import com.yizhi.training.application.vo.domain.TpAuthorizationRangeVo;
import com.yizhi.training.application.vo.domain.TrainingActivityVO;
import com.yizhi.training.application.vo.domain.TrainingProjectVo; import com.yizhi.training.application.vo.domain.TrainingProjectVo;
import com.yizhi.util.application.constant.ReturnCode; import com.yizhi.util.application.constant.ReturnCode;
import com.yizhi.util.application.domain.Response; import com.yizhi.util.application.domain.Response;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.*;
import java.util.stream.Collectors;
/** /**
* @Author: shengchenglong * @Author: shengchenglong
...@@ -285,7 +300,7 @@ public class TrainingProjectController { ...@@ -285,7 +300,7 @@ public class TrainingProjectController {
} }
// 查询直播频道号需要 // 查询直播频道号需要
List<TrainingProjectContentPlanVo> dataList = vo.getContentVo().getPlans(); /*List<TrainingProjectContentPlanVo> dataList = vo.getContentVo().getPlans();
Integer minPoint = 0; Integer minPoint = 0;
Integer maxPoint = 0; Integer maxPoint = 0;
...@@ -302,10 +317,10 @@ public class TrainingProjectController { ...@@ -302,10 +317,10 @@ public class TrainingProjectController {
} }
introductionVo.setEnablePoint(introductionVo.getPoint() <= 0 ? false : true); introductionVo.setEnablePoint(introductionVo.getPoint() <= 0 ? false : true);
introductionVo.setMaxPoint(maxPoint); introductionVo.setMaxPoint(maxPoint);
introductionVo.setMinPoint(minPoint); introductionVo.setMinPoint(minPoint);*/
} }
// 查询直播的观看权限类型 // 查询直播的观看权限类型
List<TrainingProjectContentPlanVo> dataAll = vo.getContentVo().getPlans(); /*List<TrainingProjectContentPlanVo> dataAll = vo.getContentVo().getPlans();
if(! CollectionUtils.isEmpty(dataAll)){ if(! CollectionUtils.isEmpty(dataAll)){
for(TrainingProjectContentPlanVo item : dataAll){ for(TrainingProjectContentPlanVo item : dataAll){
List<TrainingProjectContentActivityVo> inData = item.getActivities(); List<TrainingProjectContentActivityVo> inData = item.getActivities();
...@@ -322,7 +337,7 @@ public class TrainingProjectController { ...@@ -322,7 +337,7 @@ public class TrainingProjectController {
} }
} }
} }
} }*/
return Response.ok(vo); return Response.ok(vo);
} catch (Exception e) { } catch (Exception e) {
...@@ -376,7 +391,7 @@ public class TrainingProjectController { ...@@ -376,7 +391,7 @@ public class TrainingProjectController {
} }
} }
// 查询直播频道号需要 // 查询直播频道号需要
List<TrainingProjectContentPlanVo> dataList = vo.getContentVo().getPlans(); /*List<TrainingProjectContentPlanVo> dataList = vo.getContentVo().getPlans();
Integer minPoint = 0; Integer minPoint = 0;
Integer maxPoint = 0; Integer maxPoint = 0;
...@@ -393,11 +408,11 @@ public class TrainingProjectController { ...@@ -393,11 +408,11 @@ public class TrainingProjectController {
} }
introductionVo.setEnablePoint(introductionVo.getPoint() <= 0 ? false : true); introductionVo.setEnablePoint(introductionVo.getPoint() <= 0 ? false : true);
introductionVo.setMaxPoint(maxPoint); introductionVo.setMaxPoint(maxPoint);
introductionVo.setMinPoint(minPoint); introductionVo.setMinPoint(minPoint);*/
} }
// 查询直播的观看权限类型 // 查询直播的观看权限类型
List<TrainingProjectContentPlanVo> dataAll = vo.getContentVo().getPlans(); /*List<TrainingProjectContentPlanVo> dataAll = vo.getContentVo().getPlans();
if(! CollectionUtils.isEmpty(dataAll)){ if(! CollectionUtils.isEmpty(dataAll)){
for(TrainingProjectContentPlanVo item : dataAll){ for(TrainingProjectContentPlanVo item : dataAll){
List<TrainingProjectContentActivityVo> inData = item.getActivities(); List<TrainingProjectContentActivityVo> inData = item.getActivities();
...@@ -414,7 +429,7 @@ public class TrainingProjectController { ...@@ -414,7 +429,7 @@ public class TrainingProjectController {
} }
} }
} }
} }*/
return Response.ok(vo); return Response.ok(vo);
} catch (Exception e) { } catch (Exception e) {
...@@ -467,4 +482,18 @@ public class TrainingProjectController { ...@@ -467,4 +482,18 @@ public class TrainingProjectController {
return Response.fail(ReturnCode.SERVICE_UNAVAILABLE.getCode(),ReturnCode.SERVICE_UNAVAILABLE.getMsg()); return Response.fail(ReturnCode.SERVICE_UNAVAILABLE.getCode(),ReturnCode.SERVICE_UNAVAILABLE.getMsg());
} }
} }
/**
* 获取有活动的日期
* @param bizType 业务类型:1活动服务;2培训测试
* @param startDate
* @param endDate
* @return
*/
@GetMapping("/getTrainingActivity")
public Response<TrainingActivityVO> getTrainingActivity(@RequestParam("bizType") Integer bizType,
@RequestParam(name = "startDate", required = false) String startDate, @RequestParam(name = "endDate", required = false) String endDate) {
TrainingActivityVO result = trainingProjectClient.getTrainingActivity(bizType, startDate, endDate);
return Response.ok(result);
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment