Skip to content

C
cloud-platform
Commit 2d38c7e7 authored by libin's avatar libin
Browse files
Options

summit activity

parent fb9ed0fc
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 20 deletions
xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/biz/SummitActivityBiz.java
View file @ 2d38c7e7
......@@ -41,21 +41,22 @@ public class SummitActivityBiz extends BaseBiz<SummitActivityMapper, SummitActiv
example.setOrderByClause("rank");
Example.Criteria criteria = example.createCriteria();
//未删除
criteria.andEqualTo("isDel",0);
criteria.andEqualTo("isDel", 0);
//是首页展示
criteria.andEqualTo("isHomePage",1);
criteria.andEqualTo("isHomePage", 1);
//已发布
criteria.andEqualTo("isPublish",1);
criteria.andEqualTo("isPublish", 1);
//活动未下架
criteria.andEqualTo("isShow",0);
criteria.andEqualTo("isShow", 0);
//结束时间大于当前时间
//criteria.andGreaterThanOrEqualTo("endTime", Instant.now().toEpochMilli());
PageDataVO<SummitActivity> dataVO = PageDataVO.pageInfo(1, limit, () -> mapper.selectByExample(example));
List<SummitActivity> summitActivities = dataVO.getData();
if (CollectionUtils.isEmpty(summitActivities)){
if (CollectionUtils.isEmpty(summitActivities)) {
return Collections.EMPTY_LIST;
}
return JSON.parseObject(JSON.toJSONString(summitActivities),new TypeReference<List<SummitActivityVo>>(){});
return JSON.parseObject(JSON.toJSONString(summitActivities), new TypeReference<List<SummitActivityVo>>() {
});
}
public SummitActivityDetailVo findSummitActivityDetailById(Integer id) {
......@@ -66,20 +67,20 @@ public class SummitActivityBiz extends BaseBiz<SummitActivityMapper, SummitActiv
}
public PageDataVO<SummitActivityAdminVo> listSummitActivityWithPage(SummitActivityFindDTO summitActivityFindDTO) {
PageDataVO<SummitActivityAdminVo> activityAdminVoPageDataVO = new PageDataVO<>();
Example example = new Example(SummitActivity.class);
example.setOrderByClause("crt_time");
PageDataVO<SummitActivityAdminVo> activityAdminVoPageDataVO = new PageDataVO<>();
Example example = new Example(SummitActivity.class);
example.setOrderByClause("crt_time");
Example.Criteria criteria = example.createCriteria();
if (StringUtils.isNotEmpty(summitActivityFindDTO.getTitle())){
criteria.andLike("title",String.format("%%%s%%",summitActivityFindDTO.getTitle()));
if (StringUtils.isNotEmpty(summitActivityFindDTO.getTitle())) {
criteria.andLike("title", String.format("%%%s%%", summitActivityFindDTO.getTitle()));
}
criteria.andEqualTo("isDel",0);
criteria.andEqualTo("isDel", 0);
/* if (Objects.nonNull(summitActivityFindDTO.getStartTime()) && Objects.nonNull(summitActivityFindDTO.getEndTime())){
criteria.andBetween("")
}*/
PageDataVO<SummitActivity> pageDataVO = PageDataVO.pageInfo(summitActivityFindDTO.getPage(),summitActivityFindDTO.getLimit(),()->mapper.selectByExample(example));
PageDataVO<SummitActivity> pageDataVO = PageDataVO.pageInfo(summitActivityFindDTO.getPage(), summitActivityFindDTO.getLimit(), () -> mapper.selectByExample(example));
List<SummitActivity> data = pageDataVO.getData();
if (CollectionUtils.isEmpty(data)){
if (CollectionUtils.isEmpty(data)) {
return activityAdminVoPageDataVO;
}
......@@ -87,7 +88,7 @@ public class SummitActivityBiz extends BaseBiz<SummitActivityMapper, SummitActiv
SummitActivityAdminVo summitActivityAdminVo;
for (SummitActivity summitActivity : data) {
summitActivityAdminVo = new SummitActivityAdminVo();
BeanUtils.copyProperties(summitActivity,summitActivityAdminVo);
BeanUtils.copyProperties(summitActivity, summitActivityAdminVo);
summitActivityAdminVos.add(summitActivityAdminVo);
}
activityAdminVoPageDataVO.setTotalCount(pageDataVO.getTotalCount());
......@@ -100,14 +101,14 @@ public class SummitActivityBiz extends BaseBiz<SummitActivityMapper, SummitActiv
public void saveSummitActivity(SummitActivitySaveDTO summitActivitySaveDTO, UserDTO userDTO) {
SummitActivity summitActivity = new SummitActivity();
if (Objects.isNull(summitActivitySaveDTO.getId())){
BeanUtils.copyProperties(summitActivitySaveDTO,summitActivity);
if (Objects.isNull(summitActivitySaveDTO.getId())) {
BeanUtils.copyProperties(summitActivitySaveDTO, summitActivity);
summitActivity.setCrtName(userDTO.getUsername());
summitActivity.setCrtUser(userDTO.getId());
summitActivity.setCrtTime(Instant.now().toEpochMilli());
mapper.insertSelective(summitActivity);
}else {
BeanUtils.copyProperties(summitActivitySaveDTO,summitActivity);
} else {
BeanUtils.copyProperties(summitActivitySaveDTO, summitActivity);
mapper.updateByPrimaryKeySelective(summitActivity);
}
}
......@@ -150,7 +151,20 @@ public class SummitActivityBiz extends BaseBiz<SummitActivityMapper, SummitActiv
public SummitActivitySaveDTO selectSummitActivityById(Integer id) {
SummitActivitySaveDTO summitActivitySaveDTO = new SummitActivitySaveDTO();
SummitActivity summitActivity = mapper.selectByPrimaryKey(id);
BeanUtils.copyProperties(summitActivity,summitActivitySaveDTO);
BeanUtils.copyProperties(summitActivity, summitActivitySaveDTO);
return summitActivitySaveDTO;
}
/**
* 更改排序
*
* @param id
* @param rank
*/
public void updateSummitActivityRankById(Integer id, Integer rank) {
SummitActivity summitActivity = new SummitActivity();
summitActivity.setId(id);
summitActivity.setRank(rank);
mapper.updateByPrimaryKeySelective(summitActivity);
}
}
\ No newline at end of file
xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/rest/admin/SummitActivityAdminController.java
View file @ 2d38c7e7
......@@ -75,6 +75,13 @@ public class SummitActivityAdminController {
return ObjectRestResponse.succ();
}
@ApiOperation("更改排序")
@PutMapping("/rank/{id}/{rank}")
public ObjectRestResponse<Void> setSummitActivityRank(@PathVariable(value = "id") Integer id,@PathVariable("rank") Integer rank){
summitActivityBiz.updateSummitActivityRankById(id,rank);
return ObjectRestResponse.succ();
}
@ApiOperation("删除活动")
@DeleteMapping("/{id}")
public ObjectRestResponse<Void> deleteSummitActivity(@PathVariable(value = "id") Integer id){
......
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