Skip to content

S
site-project
Commit 5f6530c5 by 阳浪
Options

收藏

parent 39965c1e
Showing with 80 additions and 0 deletions
cloud-site-api/src/main/java/com/yizhi/site/application/feign/InformationManageFeignClients.java
...@@ -89,4 +89,7 @@ public interface InformationManageFeignClients { ...@@ -89,4 +89,7 @@ public interface InformationManageFeignClients {
*/ */
@PostMapping(value = "/manage/site/classify/info/updateContent") @PostMapping(value = "/manage/site/classify/info/updateContent")
public boolean updateContent(@RequestBody InformationVo information); public boolean updateContent(@RequestBody InformationVo information);
@GetMapping(value = "/manage/site/classify/info/listbyIds")
List<InformationVo> listbyIds(@RequestParam(name = "idList")List<Long> idList);
} }
cloud-site-api/src/main/java/com/yizhi/site/application/feign/api/EventTrackApiClients.java
package com.yizhi.site.application.feign.api; package com.yizhi.site.application.feign.api;
import com.yizhi.site.application.vo.domain.EventTrackVo;
import com.yizhi.site.application.vo.site.DayNumVo; import com.yizhi.site.application.vo.site.DayNumVo;
import com.yizhi.site.application.vo.site.EventTrackDayNumVo; import com.yizhi.site.application.vo.site.EventTrackDayNumVo;
import com.yizhi.site.application.vo.site.EventTrackDeptNumVo; import com.yizhi.site.application.vo.site.EventTrackDeptNumVo;
...@@ -33,4 +34,7 @@ public interface EventTrackApiClients { ...@@ -33,4 +34,7 @@ public interface EventTrackApiClients {
@GetMapping("/api/eventTrack/queryDeptByType") @GetMapping("/api/eventTrack/queryDeptByType")
List<EventTrackDeptNumVo> queryDeptByType(@RequestParam(value = "date",required = false) String date, @RequestParam("types")List<Integer> types); List<EventTrackDeptNumVo> queryDeptByType(@RequestParam(value = "date",required = false) String date, @RequestParam("types")List<Integer> types);
@GetMapping("/api/eventTrack/queryListByType")
List<EventTrackVo> queryListByType(@RequestParam("type") Integer type, @RequestParam("accountId") Long accountId);
} }
cloud-site-api/src/main/java/com/yizhi/site/application/vo/site/InformationViewVO.java
...@@ -36,6 +36,9 @@ public class InformationViewVO extends InformationVo { ...@@ -36,6 +36,9 @@ public class InformationViewVO extends InformationVo {
@ApiModelProperty(value = "当前信息前一条信息索引") @ApiModelProperty(value = "当前信息前一条信息索引")
private Integer suffixListNO; private Integer suffixListNO;
@ApiModelProperty(value = "收藏状态 0:取消收藏 1:已收藏")
private Integer favoriteState;
@ApiModelProperty(value = "当前信息后一条信息原文链接") @ApiModelProperty(value = "当前信息后一条信息原文链接")
private String suffixUrl; private String suffixUrl;
......
cloud-site-service/src/main/java/com/yizhi/site/application/controller/InformationManageController.java
...@@ -14,6 +14,7 @@ import com.yizhi.comment.application.feign.PdfPagesClient; ...@@ -14,6 +14,7 @@ import com.yizhi.comment.application.feign.PdfPagesClient;
import com.yizhi.comment.application.vo.PdfVO; import com.yizhi.comment.application.vo.PdfVO;
import com.yizhi.core.application.event.EventWrapper; import com.yizhi.core.application.event.EventWrapper;
import com.yizhi.core.application.publish.CloudEventPublisher; import com.yizhi.core.application.publish.CloudEventPublisher;
import com.yizhi.site.application.vo.domain.InformationVo;
import com.yizhi.site.application.vo.site.InfomationParamReleaseVO; import com.yizhi.site.application.vo.site.InfomationParamReleaseVO;
import com.yizhi.util.application.constant.TpActivityType; import com.yizhi.util.application.constant.TpActivityType;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
...@@ -260,4 +261,11 @@ public class InformationManageController { ...@@ -260,4 +261,11 @@ public class InformationManageController {
} }
return this.informationService.updateById(information); return this.informationService.updateById(information);
} }
@GetMapping(value = "/listbyIds")
public List<InformationVo> listbyIds(@RequestParam(name = "idList")List<Long> idList){
return this.informationService.listbyIds(idList);
}
} }
cloud-site-service/src/main/java/com/yizhi/site/application/controller/api/EventTrackController.java
package com.yizhi.site.application.controller.api; package com.yizhi.site.application.controller.api;
import com.yizhi.site.application.service.EventTrackService; import com.yizhi.site.application.service.EventTrackService;
import com.yizhi.site.application.vo.domain.EventTrackVo;
import com.yizhi.site.application.vo.site.DayNumVo; import com.yizhi.site.application.vo.site.DayNumVo;
import com.yizhi.site.application.vo.site.EventTrackDayNumVo; import com.yizhi.site.application.vo.site.EventTrackDayNumVo;
import com.yizhi.site.application.vo.site.EventTrackDeptNumVo; import com.yizhi.site.application.vo.site.EventTrackDeptNumVo;
...@@ -52,4 +53,9 @@ public class EventTrackController { ...@@ -52,4 +53,9 @@ public class EventTrackController {
public List<EventTrackDeptNumVo> queryDeptByType(@RequestParam(value = "date",required = false) String date, @RequestParam("types")List<Integer> types){ public List<EventTrackDeptNumVo> queryDeptByType(@RequestParam(value = "date",required = false) String date, @RequestParam("types")List<Integer> types){
return eventTrackService.queryDeptByType(date,types); return eventTrackService.queryDeptByType(date,types);
} }
@GetMapping("/api/eventTrack/queryListByType")
public List<EventTrackVo> queryListByType(@RequestParam("type") Integer type, @RequestParam("accountId") Long accountId){
return eventTrackService.queryListByType(type,accountId);
}
} }
cloud-site-service/src/main/java/com/yizhi/site/application/service/EventTrackService.java
...@@ -2,6 +2,7 @@ package com.yizhi.site.application.service; ...@@ -2,6 +2,7 @@ package com.yizhi.site.application.service;
import com.baomidou.mybatisplus.service.IService; import com.baomidou.mybatisplus.service.IService;
import com.yizhi.site.application.domain.EventTrack; import com.yizhi.site.application.domain.EventTrack;
import com.yizhi.site.application.vo.domain.EventTrackVo;
import com.yizhi.site.application.vo.site.DayNumVo; import com.yizhi.site.application.vo.site.DayNumVo;
import com.yizhi.site.application.vo.site.EventTrackDayNumVo; import com.yizhi.site.application.vo.site.EventTrackDayNumVo;
import com.yizhi.site.application.vo.site.EventTrackDeptNumVo; import com.yizhi.site.application.vo.site.EventTrackDeptNumVo;
...@@ -28,4 +29,6 @@ public interface EventTrackService extends IService<EventTrack> { ...@@ -28,4 +29,6 @@ public interface EventTrackService extends IService<EventTrack> {
List<EventTrackTypeNumVo> queryNumByType(String date,List<Integer> types,String subName); List<EventTrackTypeNumVo> queryNumByType(String date,List<Integer> types,String subName);
List<EventTrackDeptNumVo> queryDeptByType(String date, List<Integer> types); List<EventTrackDeptNumVo> queryDeptByType(String date, List<Integer> types);
List<EventTrackVo> queryListByType(Integer type, Long accountId);
} }
cloud-site-service/src/main/java/com/yizhi/site/application/service/InformationService.java
...@@ -5,6 +5,7 @@ import java.util.List; ...@@ -5,6 +5,7 @@ import java.util.List;
import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.IService; import com.baomidou.mybatisplus.service.IService;
import com.yizhi.site.application.domain.Information; import com.yizhi.site.application.domain.Information;
import com.yizhi.site.application.vo.domain.InformationVo;
import com.yizhi.site.application.vo.site.*; import com.yizhi.site.application.vo.site.*;
...@@ -117,4 +118,6 @@ public interface InformationService extends IService<Information> { ...@@ -117,4 +118,6 @@ public interface InformationService extends IService<Information> {
List<ImageListVO> listBannerImages(InfoVO infoVO); List<ImageListVO> listBannerImages(InfoVO infoVO);
Page<Information> informationReleaseList(InfomationParamReleaseVO vo); Page<Information> informationReleaseList(InfomationParamReleaseVO vo);
List<InformationVo> listbyIds(List<Long> idList);
} }
cloud-site-service/src/main/java/com/yizhi/site/application/service/impl/EventTrackServiceImpl.java
...@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil; ...@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.google.common.collect.Lists;
import com.yizhi.application.orm.id.IdGenerator; import com.yizhi.application.orm.id.IdGenerator;
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;
...@@ -12,6 +13,7 @@ import com.yizhi.site.application.domain.EventTrack; ...@@ -12,6 +13,7 @@ import com.yizhi.site.application.domain.EventTrack;
import com.yizhi.site.application.mapper.EventTrackMapper; import com.yizhi.site.application.mapper.EventTrackMapper;
import com.yizhi.site.application.service.DataClassificationService; import com.yizhi.site.application.service.DataClassificationService;
import com.yizhi.site.application.service.EventTrackService; import com.yizhi.site.application.service.EventTrackService;
import com.yizhi.site.application.vo.domain.EventTrackVo;
import com.yizhi.site.application.vo.site.DayNumVo; import com.yizhi.site.application.vo.site.DayNumVo;
import com.yizhi.site.application.vo.site.EventTrackDayNumVo; import com.yizhi.site.application.vo.site.EventTrackDayNumVo;
import com.yizhi.site.application.vo.site.EventTrackDeptNumVo; import com.yizhi.site.application.vo.site.EventTrackDeptNumVo;
...@@ -23,6 +25,7 @@ import com.yizhi.training.application.vo.domain.AuthzUserGroupVo; ...@@ -23,6 +25,7 @@ import com.yizhi.training.application.vo.domain.AuthzUserGroupVo;
import com.yizhi.util.application.date.DateUtil; import com.yizhi.util.application.date.DateUtil;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
...@@ -204,6 +207,27 @@ public class EventTrackServiceImpl extends ServiceImpl<EventTrackMapper, EventTr ...@@ -204,6 +207,27 @@ public class EventTrackServiceImpl extends ServiceImpl<EventTrackMapper, EventTr
return eventTrackDeptNumVoList; return eventTrackDeptNumVoList;
} }
@Override
public List<EventTrackVo> queryListByType(Integer type, Long accountId) {
EventTrack eventTrack = new EventTrack();
eventTrack.setType(type);
eventTrack.setCreateById(accountId);
EntityWrapper entityWrapper = new EntityWrapper<>(eventTrack);
List<String> orderList = Lists.newArrayList();
orderList.add("create_time");
entityWrapper.orderDesc(orderList);
List<EventTrack> eventTrackList = this.selectList(entityWrapper);
List<EventTrackVo> eventTrackVoList =Lists.newArrayList();
if(CollectionUtil.isNotEmpty(eventTrackList)){
eventTrackList.stream().forEach(e->{
EventTrackVo vo = new EventTrackVo();
BeanUtils.copyProperties(e,vo);
eventTrackVoList.add(vo);
});
}
return eventTrackVoList;
}
public String getDateString(String date) { public String getDateString(String date) {
String dateString = DateUtil.toDay(new Date()); String dateString = DateUtil.toDay(new Date());
String[] dateArrays = dateString.split("-"); String[] dateArrays = dateString.split("-");
......
cloud-site-service/src/main/java/com/yizhi/site/application/service/impl/InformationServiceImpl.java
...@@ -21,6 +21,7 @@ import com.yizhi.core.application.publish.CloudEventPublisher; ...@@ -21,6 +21,7 @@ import com.yizhi.core.application.publish.CloudEventPublisher;
import com.yizhi.site.application.service.*; import com.yizhi.site.application.service.*;
import com.yizhi.site.application.vo.domain.DataClassificationVo; import com.yizhi.site.application.vo.domain.DataClassificationVo;
import com.yizhi.site.application.vo.domain.InformationClassify; import com.yizhi.site.application.vo.domain.InformationClassify;
import com.yizhi.site.application.vo.domain.InformationVo;
import com.yizhi.site.application.vo.site.*; import com.yizhi.site.application.vo.site.*;
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;
...@@ -963,6 +964,31 @@ public class InformationServiceImpl extends ServiceImpl<InformationMapper, Infor ...@@ -963,6 +964,31 @@ public class InformationServiceImpl extends ServiceImpl<InformationMapper, Infor
} }
@Override @Override
public List<InformationVo> listbyIds(List<Long> idList) {
EntityWrapper<Information> entityWrapper = new EntityWrapper<>();
entityWrapper.in("id", idList);
List<Information> informationList = this.selectList(entityWrapper);
List<InformationVo> list = Lists.newArrayList();
if(CollectionUtils.isNotEmpty(informationList)){
informationList.stream().forEach(info -> {
InformationVo vo = new InformationVo();
if (info.getTypeOne() != null && info.getTypeOne() != 0) {
info.setTypeOneName(findNameById(info.getTypeOne()));
}
if (info.getTypeTwo() != null && info.getTypeTwo() != 0) {
info.setTypeTwoName(findNameById(info.getTypeTwo()));
}
if (info.getTypeThree() != null && info.getTypeThree() != 0) {
info.setTypeThreeName(findNameById(info.getTypeThree()));
}
BeanUtils.copyProperties(info,vo);
list.add(vo);
});
}
return list;
}
@Override
public Page<Information> informationList(InfomationParamVO vo) { public Page<Information> informationList(InfomationParamVO vo) {
// modify by lingye // modify by lingye
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault());
......
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