Skip to content

C
cloud-web
Commit 3ef6b13a by 阳浪
Options

收藏

parent 9fa46e44
Showing with 54 additions and 1 deletions
cloud-web-student/src/main/java/com/yizhi/application/protal/controller/InformationStudentController.java
...@@ -5,6 +5,7 @@ import com.yizhi.application.protal.constant.BannerNameEnum; ...@@ -5,6 +5,7 @@ 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.cache.RedisCache; import com.yizhi.core.application.cache.RedisCache;
import com.yizhi.core.application.context.ContextHolder; import com.yizhi.core.application.context.ContextHolder;
import com.yizhi.library.application.feign.StudyCaseClient;
import com.yizhi.site.application.feign.InformationStudentFeignClients; import com.yizhi.site.application.feign.InformationStudentFeignClients;
import com.yizhi.site.application.feign.api.EventTrackApiClients; import com.yizhi.site.application.feign.api.EventTrackApiClients;
import com.yizhi.site.application.vo.domain.InformationVo; import com.yizhi.site.application.vo.domain.InformationVo;
...@@ -49,6 +50,9 @@ public class InformationStudentController { ...@@ -49,6 +50,9 @@ public class InformationStudentController {
@Autowired @Autowired
private RedisCache redisCache; private RedisCache redisCache;
@Autowired
private StudyCaseClient studyCaseClient;
@PostMapping("/page/list") @PostMapping("/page/list")
@ApiOperation(value = "资讯列表新", notes = "资讯列表新", response = InformationListVO.class) @ApiOperation(value = "资讯列表新", notes = "资讯列表新", response = InformationListVO.class)
public Response<InformationListVO> listInformation(@RequestBody InfoVO infoVO) { public Response<InformationListVO> listInformation(@RequestBody InfoVO infoVO) {
...@@ -164,7 +168,9 @@ public class InformationStudentController { ...@@ -164,7 +168,9 @@ public class InformationStudentController {
public Response<InformationViewVO> getPcView(@RequestBody IdOneVO idOneVO) { public Response<InformationViewVO> getPcView(@RequestBody IdOneVO idOneVO) {
try { try {
InformationViewVO informationViewVO = informationStudentFeignClients.getPcInformation(idOneVO); InformationViewVO informationViewVO = informationStudentFeignClients.getPcInformation(idOneVO);
if(informationViewVO!=null) {
informationViewVO.setFavoriteState(studyCaseClient.favoriteStudentCase(informationViewVO.getId())?1:0);
}
return Response.ok(informationViewVO); return Response.ok(informationViewVO);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
...@@ -200,6 +206,9 @@ public class InformationStudentController { ...@@ -200,6 +206,9 @@ public class InformationStudentController {
try { try {
vo.setContext(ContextHolder.get()); vo.setContext(ContextHolder.get());
InformationViewVO info = informationStudentFeignClients.getInformation(vo); InformationViewVO info = informationStudentFeignClients.getInformation(vo);
if(info!=null) {
info.setFavoriteState(studyCaseClient.favoriteStudentCase(info.getId())?1:0);
}
return Response.ok(info); return Response.ok(info);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
......
cloud-web-student/src/main/java/com/yizhi/application/protal/controller/PortalApiController.java
...@@ -31,6 +31,7 @@ import com.yizhi.research.application.vo.domain.ResearchVo; ...@@ -31,6 +31,7 @@ import com.yizhi.research.application.vo.domain.ResearchVo;
import com.yizhi.site.application.feign.ClassifyManageFeignClients; import com.yizhi.site.application.feign.ClassifyManageFeignClients;
import com.yizhi.site.application.feign.InformationManageFeignClients; import com.yizhi.site.application.feign.InformationManageFeignClients;
import com.yizhi.site.application.feign.PortalManageFeignClients; import com.yizhi.site.application.feign.PortalManageFeignClients;
import com.yizhi.site.application.feign.api.EventTrackApiClients;
import com.yizhi.site.application.feign.api.PortalApiFeignClients; import com.yizhi.site.application.feign.api.PortalApiFeignClients;
import com.yizhi.site.application.feign.api.PortalBlockFeignClients; import com.yizhi.site.application.feign.api.PortalBlockFeignClients;
import com.yizhi.site.application.vo.domain.*; import com.yizhi.site.application.vo.domain.*;
...@@ -48,6 +49,7 @@ import com.yizhi.training.application.vo.api.TrainingProjectListVo; ...@@ -48,6 +49,7 @@ import com.yizhi.training.application.vo.api.TrainingProjectListVo;
import com.yizhi.training.application.vo.domain.TrainingProjectVo; import com.yizhi.training.application.vo.domain.TrainingProjectVo;
import com.yizhi.training.application.vo.manage.TpPlanActivityVo; import com.yizhi.training.application.vo.manage.TpPlanActivityVo;
import com.yizhi.util.application.constant.ReturnCode; import com.yizhi.util.application.constant.ReturnCode;
import com.yizhi.util.application.date.DateUtil;
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;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
...@@ -114,6 +116,8 @@ public class PortalApiController { ...@@ -114,6 +116,8 @@ public class PortalApiController {
private ClassifyManageFeignClients classifyManageFeignClients; private ClassifyManageFeignClients classifyManageFeignClients;
@Autowired @Autowired
private InformationManageFeignClients informationManageFeignClients; private InformationManageFeignClients informationManageFeignClients;
@Autowired
private EventTrackApiClients eventTrackApiClients;
@Autowired @Autowired
private DictionaryFeignClients dictionaryFeignClients; private DictionaryFeignClients dictionaryFeignClients;
...@@ -272,6 +276,46 @@ public class PortalApiController { ...@@ -272,6 +276,46 @@ public class PortalApiController {
} }
} }
@ApiOperation(value = "首页历史接口", notes = "首页历史接口", response = PortalHomeSearchOtherVO.class)
@GetMapping("/home/other/history")
public Response<PortalHomeSearchOtherVO> listHomeHistory(
@ApiParam(name = "searchName", required = true) String searchName) {
try {
PortalHomeSearchOtherVO vo = new PortalHomeSearchOtherVO();
List<EventTrackVo> eventTrackVoList = eventTrackApiClients.queryListByType(6,ContextHolder.get().getAccountId());
List<ClassificationVO> classificationVOList = Lists.newArrayList();
String toDay = DateUtil.format(new Date(),"yyyy-MM-dd");
if(CollectionUtil.isNotEmpty(eventTrackVoList)){
eventTrackVoList.stream().forEach(e->{
e.setRemark1(DateUtil.format(e.getCreateTime(),"yyyy-MM-dd"));
});
List<String> dateList = eventTrackVoList.stream().map(EventTrackVo::getRemark1).collect(Collectors.toList());
dateList.stream().forEach(d->{
ClassificationVO classificationVO = new ClassificationVO();
List<Long> idList = eventTrackVoList.stream().filter(e->Objects.equals(e.getRemark1(),d)).map(EventTrackVo::getBusinessId).distinct().collect(Collectors.toList());
Date createTime = DateUtil.parse(d,"yyyy-MM-dd");
String name = "";
if(Objects.equals(toDay,d)){
name = "今天";
}else{
name = DateUtil.format(createTime,"MM-dd");
}
name = name+" 浏览"+idList.size()+"条内容";
classificationVO.setName(name);
classificationVO.setCreateTime(createTime);
classificationVO.setInformationVoList(informationManageFeignClients.listbyIds(idList));
classificationVOList.add(classificationVO);
});
vo.setClassificationVOList(classificationVOList);
}
return Response.ok(vo);
} catch (Exception e) {
LOG.error("首页历史接口:", e);
return Response.fail(ReturnCode.SERVICE_UNAVAILABLE.getCode(),ReturnCode.SERVICE_UNAVAILABLE.getMsg());
}
}
@ApiOperation(value = "门户模板信息", notes = "门户模板信息", response = TemplateListVO.class) @ApiOperation(value = "门户模板信息", notes = "门户模板信息", response = TemplateListVO.class)
@GetMapping("/home/template/list") @GetMapping("/home/template/list")
public Response<List<ApiTemplateListVO>> listHomeTemplate( public Response<List<ApiTemplateListVO>> listHomeTemplate(
......
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