Skip to content

C
cloud-web
Commit 306e6b99 by 梅存智
Options

Merge branch 'dev' into 'master' 

Dev

See merge request !1
parents 469da196 fe0b8c47
Showing with 128 additions and 38 deletions
cloud-web-manage/src/main/java/com/yizhi/application/course/controller/CourseController.java
...@@ -466,7 +466,7 @@ public class CourseController { ...@@ -466,7 +466,7 @@ public class CourseController {
CourseVo courseVoDB = courseClient.getOne(courseVo.getId()); CourseVo courseVoDB = courseClient.getOne(courseVo.getId());
param.setBizdName(courseVoDB.getName()); param.setBizdName(courseVoDB.getName());
param.setType(1); param.setType(1);
certificateClient.relateProject(param); // certificateClient.relateProject(param);
} }
return BizResponse.ok(); return BizResponse.ok();
} }
......
cloud-web-manage/src/main/java/com/yizhi/application/project/controller/TpCommentController.java
...@@ -39,10 +39,11 @@ public class TpCommentController { ...@@ -39,10 +39,11 @@ public class TpCommentController {
@ApiOperation(value = "评论列表查询", notes = "返回评论列表", response = PageCommentVo.class) @ApiOperation(value = "评论列表查询", notes = "返回评论列表", response = PageCommentVo.class)
public Response<Page<PageCommentVo>> list( public Response<Page<PageCommentVo>> list(
@ApiParam(value = "培训项目id",required = true)@RequestParam("trainingProjectId")Long trainingProjectId, @ApiParam(value = "培训项目id",required = true)@RequestParam("trainingProjectId")Long trainingProjectId,
@ApiParam(value = "关联业务类型:1活动服务;2新闻资讯；3培训测试；4培训资讯") @RequestParam("bizType") Integer bizType,
@ApiParam(name = "pageNo", value = "跳转页数,默认第一页", required = true) @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @ApiParam(name = "pageNo", value = "跳转页数,默认第一页", required = true) @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@ApiParam(name = "pageSize", value = "每页条数,默认20条", required = true) @RequestParam(name = "pageSize", defaultValue = "20") Integer pageSize){ @ApiParam(name = "pageSize", value = "每页条数,默认20条", required = true) @RequestParam(name = "pageSize", defaultValue = "20") Integer pageSize){
RequestContext requestContext = ContextHolder.get(); RequestContext requestContext = ContextHolder.get();
Page<PageCommentVo> page = tpCommentClient.list(trainingProjectId,requestContext.getAccountId(),pageNo,pageSize,0); Page<PageCommentVo> page = tpCommentClient.list(trainingProjectId, bizType, requestContext.getAccountId(),pageNo,pageSize,0);
return Response.ok(page); return Response.ok(page);
} }
......
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;
...@@ -27,6 +28,9 @@ public class EnrollApiController { ...@@ -27,6 +28,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")
...@@ -38,7 +42,8 @@ public class EnrollApiController { ...@@ -38,7 +42,8 @@ public class EnrollApiController {
if (vo.getId() == null) { if (vo.getId() == null) {
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/TpCommentApiController.java
...@@ -84,11 +84,12 @@ public class TpCommentApiController { ...@@ -84,11 +84,12 @@ public class TpCommentApiController {
@ApiOperation(value = "项目查看评论列表", notes = "项目查看评论列表", response = PageCommentVo.class) @ApiOperation(value = "项目查看评论列表", notes = "项目查看评论列表", response = PageCommentVo.class)
public Response commentList( public Response commentList(
@ApiParam(value = "项目主键id", required = true) @RequestParam("id") Long id, @ApiParam(value = "项目主键id", required = true) @RequestParam("id") Long id,
@ApiParam(value = "关联业务类型:1活动服务;2新闻资讯；3培训测试；4培训资讯") @RequestParam(name = "bizType", required = false) Integer bizType,
@ApiParam(name = "pageNo", value = "跳转页数,默认第一页", required = true) @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @ApiParam(name = "pageNo", value = "跳转页数,默认第一页", required = true) @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@ApiParam(name = "pageSize", value = "每页条数,默认20条", required = true) @RequestParam(name = "pageSize", defaultValue = "20") Integer pageSize @ApiParam(name = "pageSize", value = "每页条数,默认20条", required = true) @RequestParam(name = "pageSize", defaultValue = "20") Integer pageSize
) { ) {
RequestContext requestContext = ContextHolder.get(); RequestContext requestContext = ContextHolder.get();
Page<PageCommentVo> page = tpCommentClient.list(id, requestContext.getAccountId(), pageNo, pageSize,1); Page<PageCommentVo> page = tpCommentClient.list(id, bizType, requestContext.getAccountId(), pageNo, pageSize,1);
page = workUtil.fillData(page, requestContext); page = workUtil.fillData(page, requestContext);
return Response.ok(page); return Response.ok(page);
} }
...@@ -104,7 +105,7 @@ public class TpCommentApiController { ...@@ -104,7 +105,7 @@ public class TpCommentApiController {
@ApiOperation(value = "PC端培训项目展现评论列表") @ApiOperation(value = "PC端培训项目展现评论列表")
Response<PageCommentVo> tpCommentList(@ApiParam(value = "trCommentVo") @RequestBody TrCommentVo trCommentVo) { Response<PageCommentVo> tpCommentList(@ApiParam(value = "trCommentVo") @RequestBody TrCommentVo trCommentVo) {
RequestContext requestContext = ContextHolder.get(); RequestContext requestContext = ContextHolder.get();
Page<PageCommentVo> commentVoPage = tpCommentClient.list(trCommentVo.getTrainingProjectId(), requestContext.getAccountId(), trCommentVo.getPageNo(), trCommentVo.getPageSize(),1); Page<PageCommentVo> commentVoPage = tpCommentClient.list(trCommentVo.getTrainingProjectId(), trCommentVo.getBizType(), requestContext.getAccountId(), trCommentVo.getPageNo(), trCommentVo.getPageSize(),1);
commentVoPage = workUtil.fillData(commentVoPage, requestContext); commentVoPage = workUtil.fillData(commentVoPage, requestContext);
Pair pair = PageTools.split(commentVoPage); Pair pair = PageTools.split(commentVoPage);
return Response.ok(commentVoPage, (Map<String, Integer>) pair.getRight()); return Response.ok(commentVoPage, (Map<String, Integer>) pair.getRight());
......
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
...@@ -92,6 +107,8 @@ public class TrainingProjectController { ...@@ -92,6 +107,8 @@ public class TrainingProjectController {
} }
} }
} }
/*//2024-11-28注释，不需要调用课程服务
List<Long> trProectIds = new ArrayList<>(); List<Long> trProectIds = new ArrayList<>();
if (!CollectionUtils.isEmpty(listVos)) { if (!CollectionUtils.isEmpty(listVos)) {
for (TrainingProjectListVo tr : listVos) { for (TrainingProjectListVo tr : listVos) {
...@@ -110,7 +127,7 @@ public class TrainingProjectController { ...@@ -110,7 +127,7 @@ public class TrainingProjectController {
} }
} }
} }
} }*/
return Response.ok(resultPage); return Response.ok(resultPage);
} catch (Exception e) { } catch (Exception e) {
LOGGER.error("", e); LOGGER.error("", e);
...@@ -285,7 +302,7 @@ public class TrainingProjectController { ...@@ -285,7 +302,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 +319,10 @@ public class TrainingProjectController { ...@@ -302,10 +319,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 +339,7 @@ public class TrainingProjectController { ...@@ -322,7 +339,7 @@ public class TrainingProjectController {
} }
} }
} }
} }*/
return Response.ok(vo); return Response.ok(vo);
} catch (Exception e) { } catch (Exception e) {
...@@ -376,7 +393,7 @@ public class TrainingProjectController { ...@@ -376,7 +393,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 +410,11 @@ public class TrainingProjectController { ...@@ -393,11 +410,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 +431,7 @@ public class TrainingProjectController { ...@@ -414,7 +431,7 @@ public class TrainingProjectController {
} }
} }
} }
} }*/
return Response.ok(vo); return Response.ok(vo);
} catch (Exception e) { } catch (Exception e) {
...@@ -467,4 +484,18 @@ public class TrainingProjectController { ...@@ -467,4 +484,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);
}
} }
cloud-web-student/src/main/java/com/yizhi/application/protal/constant/BannerNameEnum.java
...@@ -2,7 +2,7 @@ package com.yizhi.application.protal.constant; ...@@ -2,7 +2,7 @@ package com.yizhi.application.protal.constant;
public enum BannerNameEnum { public enum BannerNameEnum {
MARKET("营销"), TRAIN("项目"), HOMEPAGE("首页"), COURSE("课程"), NEWS("新闻资讯"),ALBUM("专辑"); MARKET("营销"), TRAIN("项目"), HOMEPAGE("首页"), COURSE("课程"), NEWS("新闻资讯"),ALBUM("专辑"),TRAIN_EXAM("培训测验"),RESEARCH("问卷调查");
private String key; private String key;
......
cloud-web-student/src/main/java/com/yizhi/application/protal/controller/BannerApiController.java
package com.yizhi.application.protal.controller; package com.yizhi.application.protal.controller;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.yizhi.application.protal.constant.BannerNameEnum; import com.yizhi.application.protal.constant.BannerNameEnum;
import com.yizhi.application.protal.constant.TerminalEnum; import com.yizhi.application.protal.constant.TerminalEnum;
import com.yizhi.core.application.context.ContextHolder; import com.yizhi.core.application.context.ContextHolder;
import com.yizhi.core.application.context.RequestContext; import com.yizhi.core.application.context.RequestContext;
import com.yizhi.research.application.feign.ResearchClient;
import com.yizhi.research.application.vo.domain.ResearchVo;
import com.yizhi.site.application.feign.BannerManageFeignClients; import com.yizhi.site.application.feign.BannerManageFeignClients;
import com.yizhi.site.application.vo.site.AllHomeBannerImageVO; import com.yizhi.site.application.vo.site.AllHomeBannerImageVO;
import com.yizhi.site.application.vo.site.ImageListVO; import com.yizhi.site.application.vo.site.ImageListVO;
import com.yizhi.training.application.feign.TrainingProjectClient;
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 org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; 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.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
...@@ -36,13 +42,19 @@ public class BannerApiController { ...@@ -36,13 +42,19 @@ public class BannerApiController {
@Autowired @Autowired
BannerManageFeignClients bannerManageFeignClients; BannerManageFeignClients bannerManageFeignClients;
@Autowired
TrainingProjectClient trainingProjectClient;
@Autowired
ResearchClient researchClient;
/** /**
* 所有首页 轮播图 * 所有首页 轮播图
*/ */
@ApiOperation(value = "轮播学员端管理", notes = "轮播学员端管理", response = ImageListVO.class) @ApiOperation(value = "轮播学员端管理", notes = "轮播学员端管理", response = ImageListVO.class)
@PostMapping(value="/home/image/list") @PostMapping(value="/home/image/list")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name="bannerName" , value="轮播图所属栏目, MARKET:营销, TRAIN:培训, HOMEPAGE:首页, COURSE:课程, NEWS:新闻资讯，ALBUM:专辑", dataType="Long"), @ApiImplicitParam(name="bannerName" , value="轮播图所属栏目, MARKET:营销, TRAIN:培训, HOMEPAGE:首页, COURSE:课程, NEWS:新闻资讯，ALBUM:专辑;TRAIN_EXAM:培训测验;RESEARCH:问卷调查", dataType="Long"),
@ApiImplicitParam(name="terminalName" , value="终端名称, PC端：PC; APP： MOBILE; 微信: WECHAT", dataType="Long") @ApiImplicitParam(name="terminalName" , value="终端名称, PC端：PC; APP： MOBILE; 微信: WECHAT", dataType="Long")
}) })
public Response<List<ImageListVO>> listAllHomeBannerImage(@RequestBody AllHomeBannerImageVO vo){ public Response<List<ImageListVO>> listAllHomeBannerImage(@RequestBody AllHomeBannerImageVO vo){
...@@ -68,7 +80,39 @@ public class BannerApiController { ...@@ -68,7 +80,39 @@ public class BannerApiController {
vo.setTerminalName(terminalName); vo.setTerminalName(terminalName);
vo.setBannerName(bannerName); vo.setBannerName(bannerName);
try { try {
return Response.ok(bannerManageFeignClients.listAllHomeBannerImage(vo)); List<ImageListVO> result = null;
if(vo != null && BannerNameEnum.TRAIN_EXAM.getKey().equals(vo.getBannerName())){
List<TrainingProjectVo> list = trainingProjectClient.getTop();
if (!CollectionUtils.isEmpty(list)) {
result = new ArrayList<ImageListVO>(1);
for(TrainingProjectVo item : list){
ImageListVO img = new ImageListVO();
img.setImgTitle(item.getName());
img.setId(item.getId());
img.setBannerPath(item.getLogoImg());
img.setCreateByName(item.getCreateByName());
img.setCreateTime(item.getCreateTime());
result.add(img);
}
}
} else if(vo != null && BannerNameEnum.RESEARCH.getKey().equals(vo.getBannerName())){
List<ResearchVo> list = researchClient.getResearchTop(1);
if (!CollectionUtils.isEmpty(list)) {
result = new ArrayList<ImageListVO>(1);
for(ResearchVo item : list){
ImageListVO img = new ImageListVO();
img.setImgTitle(item.getName());
img.setId(item.getId());
img.setBannerPath(item.getLogoImg());
img.setCreateByName(item.getCreateByName());
img.setCreateTime(item.getCreateTime());
result.add(img);
}
}
} else {
result = bannerManageFeignClients.listAllHomeBannerImage(vo);
}
return Response.ok(result);
} catch (Exception e) { } catch (Exception e) {
LOGGER.error("所有首页 轮播图：" + e); LOGGER.error("所有首页 轮播图：" + e);
return Response.fail(ReturnCode.SERVICE_UNAVAILABLE.getCode(),ReturnCode.SERVICE_UNAVAILABLE.getMsg()); return Response.fail(ReturnCode.SERVICE_UNAVAILABLE.getCode(),ReturnCode.SERVICE_UNAVAILABLE.getMsg());
......
cloud-web-student/src/main/java/com/yizhi/application/protal/controller/InformationStudentController.java
...@@ -98,7 +98,8 @@ public class InformationStudentController { ...@@ -98,7 +98,8 @@ public class InformationStudentController {
@ApiImplicitParam(name = "typeOne", value = "资讯父类型", paramType = "body"), @ApiImplicitParam(name = "typeOne", value = "资讯父类型", paramType = "body"),
@ApiImplicitParam(name = "typeTwo", value = "资讯子类型", paramType = "body"), @ApiImplicitParam(name = "typeTwo", value = "资讯子类型", paramType = "body"),
@ApiImplicitParam(name = "terminalName", value = "终端名称, PC：PC，APP： MOBILE, 微信: WECHAT", paramType = "body"), @ApiImplicitParam(name = "terminalName", value = "终端名称, PC：PC，APP： MOBILE, 微信: WECHAT", paramType = "body"),
@ApiImplicitParam(name = "bannerName", value = "轮播图所属栏目, MARKET:营销, TRAIN:培训, HOMEPAGE:首页, COURSE:课程, NEWS:新闻资讯", paramType = "body") @ApiImplicitParam(name = "bannerName", value = "轮播图所属栏目, MARKET:营销, TRAIN:培训, HOMEPAGE:首页, COURSE:课程, NEWS:新闻资讯", paramType = "body"),
@ApiImplicitParam(name = "relationId", value = "绑定业务的ID", paramType = "body")
} }
) )
@ApiOperation(value = "pc端,新闻/公告列表", notes = "pc端,新闻/公告列表", response = InformationListVO.class) @ApiOperation(value = "pc端,新闻/公告列表", notes = "pc端,新闻/公告列表", response = InformationListVO.class)
......
cloud-web-student/src/main/java/com/yizhi/application/research/controller/ResearchController.java
...@@ -39,8 +39,8 @@ public class ResearchController { ...@@ -39,8 +39,8 @@ public class ResearchController {
@GetMapping("/page/list") @GetMapping("/page/list")
@ApiOperation(value = "分页查询学员能看到的调研", notes = "分两种状态", response = ResearchVo.class) @ApiOperation(value = "分页查询学员能看到的调研", notes = "分两种状态", response = ResearchVo.class)
public Response<ResearchVo> listPage( public Response<ResearchVo> listPage(
@ApiParam(name = "state", value = "状态：1已完成，2进行中", required = true) @RequestParam("state") Integer state, @ApiParam(name = "state", value = "状态：1已完成，2进行中", required = false) @RequestParam(name = "state", required = false) Integer state,
@ApiParam(name = "bizType", value = "业务类型:1调研（问卷、投票）；2考试测验，默认1", required = true) @RequestParam(name = "bizType", defaultValue = "1") Integer bizType,
@ApiParam(name = "pageNo", value = "跳转页数,默认第一页", required = true) @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @ApiParam(name = "pageNo", value = "跳转页数,默认第一页", required = true) @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@ApiParam(name = "pageSize", value = "每页条数,默认20条", required = true) @RequestParam(name = "pageSize", defaultValue = "20") Integer pageSize @ApiParam(name = "pageSize", value = "每页条数,默认20条", required = true) @RequestParam(name = "pageSize", defaultValue = "20") Integer pageSize
) { ) {
...@@ -53,6 +53,7 @@ public class ResearchController { ...@@ -53,6 +53,7 @@ public class ResearchController {
pageVo.setPageNo(pageNo); pageVo.setPageNo(pageNo);
pageVo.setPageSize(pageSize); pageVo.setPageSize(pageSize);
pageVo.setState(state); pageVo.setState(state);
pageVo.setBizType(bizType);
com.yizhi.research.application.vo.BaseModel<PageVo> model = new BaseModel<>(); com.yizhi.research.application.vo.BaseModel<PageVo> model = new BaseModel<>();
model.setDate(new Date()); model.setDate(new Date());
model.setObj(pageVo); model.setObj(pageVo);
......
cloud-web-student/src/main/java/com/yizhi/application/system/controller/SystemController.java
...@@ -215,16 +215,19 @@ public class SystemController { ...@@ -215,16 +215,19 @@ public class SystemController {
//我的消息 //我的消息
Integer sum = null; Integer sum = null;
try { try {
// sum = messageClient.unreadCount(ContextHolder.get().getAccountId()); /*//2024-11-2需求不需要统计数据，先注释
sum = messageClient.unreadCount(ContextHolder.get().getAccountId());*/
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
MyItemVO xx = new MyItemVO(ItemCode.XX.getCode(), ItemCode.XX.getName(), sum == null ? 0 : sum); /*MyItemVO xx = new MyItemVO(ItemCode.XX.getCode(), ItemCode.XX.getName(), sum == null ? 0 : sum);
if (!data2.contains(xx)) { if (!data2.contains(xx)) {
data2.add(xx); data2.add(xx);
} }*/
//课程收藏 //课程收藏
Integer courseCount = 0; Integer courseCount = 0;
/*//2024-11-2需求不需要统计数据，先注释
try { try {
courseCount = courseClient.getMyFavoriteCount(context.getAccountId(), context.getCompanyId(), context.getSiteId()); courseCount = courseClient.getMyFavoriteCount(context.getAccountId(), context.getCompanyId(), context.getSiteId());
Integer courseCount1 = studentCaseClient.getFavoritesCount(context.getCompanyId(), context.getSiteId(), context.getAccountId()); Integer courseCount1 = studentCaseClient.getFavoritesCount(context.getCompanyId(), context.getSiteId(), context.getAccountId());
...@@ -235,7 +238,7 @@ public class SystemController { ...@@ -235,7 +238,7 @@ public class SystemController {
} }
} catch (Exception e) { } catch (Exception e) {
LOG.info("异常信息={}", e); LOG.info("异常信息={}", e);
} }*/
MyItemVO kcsc = new MyItemVO(ItemCode.KCSC.getCode(), ItemCode.KCSC.getName(), courseCount == null ? 0 : courseCount); MyItemVO kcsc = new MyItemVO(ItemCode.KCSC.getCode(), ItemCode.KCSC.getName(), courseCount == null ? 0 : courseCount);
data1.put(ItemCode.KCSC.getCode(), kcsc); data1.put(ItemCode.KCSC.getCode(), kcsc);
} }
...@@ -248,6 +251,8 @@ public class SystemController { ...@@ -248,6 +251,8 @@ public class SystemController {
private void getApiData(List<MyItemConfigVO> voList, RequestContext context, List<MyItemVO> data2) { private void getApiData(List<MyItemConfigVO> voList, RequestContext context, List<MyItemVO> data2) {
for (MyItemConfigVO vo : voList) { for (MyItemConfigVO vo : voList) {
MyItemVO item = new MyItemVO(); MyItemVO item = new MyItemVO();
/*//2024-11-2需求不需要统计数据，先注释
switch (vo.getItemType()) { switch (vo.getItemType()) {
case 1://我的培训 case 1://我的培训
BaseModel<TrainingProjectParamVo> model = new BaseModel<>(); BaseModel<TrainingProjectParamVo> model = new BaseModel<>();
...@@ -426,10 +431,11 @@ public class SystemController { ...@@ -426,10 +431,11 @@ public class SystemController {
break; break;
default: default:
break; break;
} }*/
item.setCode(vo.getWeixinCode()); item.setCode(vo.getWeixinCode());
item.setName(vo.getName()); item.setName(vo.getName());
item.setSortNo(vo.getSort()); item.setSortNo(vo.getSort());
item.setLogoImg(vo.getLogoImg());
data2.add(item); data2.add(item);
LOG.info("---栏目名：" + item.getName() + "---统计数据：" + item.getQuantity()); LOG.info("---栏目名：" + item.getName() + "---统计数据：" + item.getQuantity());
} }
......
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