Skip to content

C
cloud-platform
Commit e8d73bcf authored by wuwz's avatar wuwz
Browse files
Options

增加热门模块，修改营地接口增加营地标签

parent 473e6ee0
Hide whitespace changes
Inline Side-by-side
Showing with 502 additions and 446 deletions
xx-campsite/xx-campsite-api/src/main/java/com/xxfc/platform/campsite/vo/CampsiteShopPageVo.java
View file @ e8d73bcf
package com.xxfc.platform.campsite.vo; package com.xxfc.platform.campsite.vo;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.xxfc.platform.campsite.dto.CampsiteShopTagDTO;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
...@@ -9,6 +10,7 @@ import lombok.Data; ...@@ -9,6 +10,7 @@ import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import java.io.Serializable; import java.io.Serializable;
import java.util.List;
/** /**
...@@ -111,4 +113,7 @@ public class CampsiteShopPageVo implements Serializable { ...@@ -111,4 +113,7 @@ public class CampsiteShopPageVo implements Serializable {
@ApiModelProperty("seo*html标签优化") @ApiModelProperty("seo*html标签优化")
private String imgDesc; private String imgDesc;
@ApiModelProperty("标签列表")
private List<CampsiteShopTagDTO>list;
} }
xx-campsite/xx-campsite-server/src/main/java/com/xxfc/platform/campsite/biz/CampsiteShopBiz.java
View file @ e8d73bcf
...@@ -100,6 +100,12 @@ public class CampsiteShopBiz extends BaseBiz<CampsiteShopMapper, CampsiteShop> { ...@@ -100,6 +100,12 @@ public class CampsiteShopBiz extends BaseBiz<CampsiteShopMapper, CampsiteShop> {
}*/ }*/
PageDataVO<CampsiteShopPageVo> campsiteShopPageDataVO = findCampsiteShopPageByTypeAndName(campsiteShopFindDTO); PageDataVO<CampsiteShopPageVo> campsiteShopPageDataVO = findCampsiteShopPageByTypeAndName(campsiteShopFindDTO);
/* campHashOperations.put(CAMPSITE_LIST_CACHE_PREKEY,campsite_cache_key,JSONObject.toJSONString(campsiteShopPageDataVO));*/ /* campHashOperations.put(CAMPSITE_LIST_CACHE_PREKEY,campsite_cache_key,JSONObject.toJSONString(campsiteShopPageDataVO));*/
//查询营地的标签
List<CampsiteShopPageVo>list = campsiteShopPageDataVO.getData();
for(CampsiteShopPageVo campsiteShopPageVo : list){
List<CampsiteShopTagDTO> tagList = campsiteShopTagBiz.findByCampsiteShopId(campsiteShopPageVo.getId());
campsiteShopPageVo.setList(tagList);
}
return campsiteShopPageDataVO; return campsiteShopPageDataVO;
} }
...@@ -196,7 +202,7 @@ public class CampsiteShopBiz extends BaseBiz<CampsiteShopMapper, CampsiteShop> { ...@@ -196,7 +202,7 @@ public class CampsiteShopBiz extends BaseBiz<CampsiteShopMapper, CampsiteShop> {
campsiteShopDetailVo.setHasCollection(false); campsiteShopDetailVo.setHasCollection(false);
} }
//
/* campsiteValueOperations.set(String.format("%s%d", CAMSITE_DETAIL_CACHE_PREKEY, id), JSONObject.toJSONString(campsiteShopDetailVo));*/ /* campsiteValueOperations.set(String.format("%s%d", CAMSITE_DETAIL_CACHE_PREKEY, id), JSONObject.toJSONString(campsiteShopDetailVo));*/
return campsiteShopDetailVo; return campsiteShopDetailVo;
......
xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/entity/TourTag.java
View file @ e8d73bcf
package com.xxfc.platform.tour.entity; package com.xxfc.platform.tour.entity;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;
import javax.persistence.*; import javax.persistence.*;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
/** /**
* 旅游路线标签 * 旅游路线标签
* *
* @author zjw * @author zjw
* @email nishijjo@qq.com * @email nishijjo@qq.com
* @date 2019-06-06 11:41:51 * @date 2019-06-06 11:41:51
*/ */
@Data @Data
@Table(name = "tour_tag") @Table(name = "tour_tag")
@Builder @Builder
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
public class TourTag implements Serializable { public class TourTag implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* 主键id * 主键id
*/ */
@Id @Id
@GeneratedValue(generator = "JDBC") @GeneratedValue(generator = "JDBC")
@ApiModelProperty("主键id") @ApiModelProperty("主键id")
private Integer id; private Integer id;
/** /**
* 名称 * 名称
*/ */
@Column(name = "name") @Column(name = "name")
@ApiModelProperty(value = "名称") @ApiModelProperty(value = "名称")
private String name; private String name;
/** /**
* 图片 * 图片
*/ */
@Column(name = "img") @Column(name = "img")
@ApiModelProperty(value = "图片") @ApiModelProperty(value = "图片")
private String img; private String img;
/** /**
* 描述 * 描述
*/ */
@Column(name = "describe") @Column(name = "describe")
@ApiModelProperty(value = "描述") @ApiModelProperty(value = "描述")
private String describe; private String describe;
/** /**
* 链接 * 链接
*/ */
@Column(name = "link") @Column(name = "link")
@ApiModelProperty(value = "链接") @ApiModelProperty(value = "链接")
private String link; private String link;
/** /**
* 是否热门：0-否；1-是 * 是否热门：0-否；1-是
*/ */
@Column(name = "is_hot") @Column(name = "is_hot")
@ApiModelProperty(value = "是否热门：0-否；1-是") @ApiModelProperty(value = "是否热门：0-否；1-是")
private Integer isHot; private Integer isHot;
/** /**
* 成单量 * 成单量
*/ */
@Column(name = "count") @Column(name = "count")
@ApiModelProperty(value = "成单量") @ApiModelProperty(value = "成单量")
private Integer count; private Integer count;
/** /**
* 排序 * 排序
*/ */
@Column(name = "rank") @Column(name = "rank")
@ApiModelProperty(value = "排序") @ApiModelProperty(value = "排序")
private Integer rank; private Integer rank;
/** /**
* 创建时间 * 创建时间
*/ */
@Column(name = "ctr_time") @Column(name = "ctr_time")
@ApiModelProperty(value = "创建时间") @ApiModelProperty(value = "创建时间")
private Long ctrTime; private Long ctrTime;
/** /**
* 更新时间 * 更新时间
*/ */
@Column(name = "upd_time") @Column(name = "upd_time")
@ApiModelProperty(value = "更新时间", hidden = true ) @ApiModelProperty(value = "更新时间", hidden = true )
private Long updTime; private Long updTime;
/** /**
* 是否删除:0-正常；1-删除 * 是否删除:0-正常；1-删除
*/ */
@Column(name = "is_del") @Column(name = "is_del")
@ApiModelProperty(value = "是否删除:0-正常；1-删除") @ApiModelProperty(value = "是否删除:0-正常；1-删除")
private Integer isDel; private Integer isDel;
}
@Transient
private List<TourGood> list;
}
xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/biz/TourTagBiz.java
View file @ e8d73bcf
package com.xxfc.platform.tour.biz; package com.xxfc.platform.tour.biz;
import com.ace.cache.annotation.CacheClear; import cn.hutool.db.handler.HandleHelper;
import com.github.wxiaoqi.security.admin.feign.dto.UserDTO; import com.ace.cache.annotation.CacheClear;
import com.github.wxiaoqi.security.common.vo.PageDataVO; import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
import com.xxfc.platform.tour.comstnt.RedisKey; import com.github.wxiaoqi.security.common.vo.PageDataVO;
import com.xxfc.platform.tour.dto.TourTagAndBannerDTO; import com.xxfc.platform.tour.comstnt.RedisKey;
import com.xxfc.platform.tour.dto.TourTagBannerDTO; import com.xxfc.platform.tour.dto.TourTagAndBannerDTO;
import com.xxfc.platform.tour.dto.TourTagDTO; import com.xxfc.platform.tour.dto.TourTagBannerDTO;
import com.xxfc.platform.tour.mapper.TourTagMapper; import com.xxfc.platform.tour.dto.TourTagDTO;
import lombok.extern.slf4j.Slf4j; import com.xxfc.platform.tour.entity.TourGood;
import org.apache.commons.collections.CollectionUtils; import com.xxfc.platform.tour.mapper.TourGoodMapper;
import org.springframework.beans.BeanUtils; import com.xxfc.platform.tour.mapper.TourTagMapper;
import org.springframework.beans.factory.annotation.Autowired; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service; import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.BeanUtils;
import com.xxfc.platform.tour.entity.TourTag; import org.springframework.beans.factory.annotation.Autowired;
import com.github.wxiaoqi.security.common.biz.BaseBiz; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.xxfc.platform.tour.entity.TourTag;
import java.time.Instant; import com.github.wxiaoqi.security.common.biz.BaseBiz;
import java.util.ArrayList; import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Map; import java.time.Instant;
import java.util.Objects; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
* 旅游路线标签 * 旅游路线标签
* *
* @author zjw * @author zjw
* @email nishijjo@qq.com * @email nishijjo@qq.com
* @date 2019-06-06 11:41:51 * @date 2019-06-06 11:41:51
*/ */
@Service @Service
@Slf4j @Slf4j
public class TourTagBiz extends BaseBiz<TourTagMapper,TourTag> { public class TourTagBiz extends BaseBiz<TourTagMapper,TourTag> {
@Autowired @Autowired
private TourTagBannerBiz tourTagBannerBiz; private TourTagBannerBiz tourTagBannerBiz;
// @Cache(key = RedisKey.CONSTANT_CODE_PREFIX_HOTTAG) @Autowired
public List<TourTag> getHotTag() { private TourGoodMapper tourGoodMapper;
TourTag tag = new TourTag(); // @Cache(key = RedisKey.CONSTANT_CODE_PREFIX_HOTTAG)
tag.setIsDel(0); public List<TourTag> getHotTag() {
tag.setIsHot(1);
return mapper.findHotListTag(tag); TourTag tag = new TourTag();
} tag.setIsDel(0);
tag.setIsHot(1);
public List<TourTag> getTagList(Integer isHot) { return mapper.findHotListTag(tag);
TourTag tag = new TourTag(); }
tag.setIsDel(0);
if (isHot!=null&&isHot==1){ public List<TourTag> getHotTagAndGoods() {
tag.setIsHot(1); TourTag tag = new TourTag();
return mapper.findHotListTag(tag); tag.setIsDel(0);
} tag.setIsHot(1);
return mapper.findAllByIsDel(tag); List<TourTag>list = mapper.findHotListTag(tag);
} Map<String,Object>map = new HashMap<String,Object>();
//增加两条线路例子
for(TourTag tourTag :list){
map.put("tagId",tourTag.getId());
public PageDataVO<TourTag> findPage(Map map) { PageDataVO<TourGood> dataVO = PageDataVO.pageInfo(1, 2, () -> tourGoodMapper.getGoodList(map));
TourTag tag = new TourTag(); List<TourGood> pageDataVO = dataVO.getData();
tag.setIsDel(0); tourTag.setList(pageDataVO);
return PageDataVO.pageInfo((Integer)map.get("page"),(Integer)map.get("limit"),() -> mapper.findAllByIsDel(tag)); }
} return list;
}
@CacheClear(key = RedisKey.CONSTANT_CODE_PREFIX_HOTTAG)
public void update(TourTag banner) { public List<TourTag> getTagList(Integer isHot) {
this.updateSelectiveById(banner); TourTag tag = new TourTag();
} tag.setIsDel(0);
if (isHot!=null&&isHot==1){
tag.setIsHot(1);
@CacheClear(key = RedisKey.CONSTANT_CODE_PREFIX_HOTTAG) return mapper.findHotListTag(tag);
public void remove(int id) { }
this.deleteById(id); return mapper.findAllByIsDel(tag);
} }
/**
* 分页查询旅游标签 public PageDataVO<TourTag> findPage(Map map) {
* @param pageNo 查询的当前 TourTag tag = new TourTag();
* @param pageSize 分页大小 tag.setIsDel(0);
* @return return PageDataVO.pageInfo((Integer)map.get("page"),(Integer)map.get("limit"),() -> mapper.findAllByIsDel(tag));
*/ }
public PageDataVO<TourTagAndBannerDTO> findTourTagWithPage(Integer pageNo, Integer pageSize) {
PageDataVO<TourTagAndBannerDTO> tourTagAndBannerDTOPageDataVO = new PageDataVO<>(); @CacheClear(key = RedisKey.CONSTANT_CODE_PREFIX_HOTTAG)
//根据分页条件查询出旅游标签的信息 public void update(TourTag banner) {
PageDataVO<TourTag> pageDataVO = PageDataVO.pageInfo(pageNo, pageSize, () -> mapper.findAllByIsDel(TourTag.builder().isDel(0).build())); this.updateSelectiveById(banner);
List<TourTag> tourTags = pageDataVO.getData(); }
if (log.isDebugEnabled()){
log.debug("旅游分页查询标签：[{}]",tourTags);
} @CacheClear(key = RedisKey.CONSTANT_CODE_PREFIX_HOTTAG)
if (CollectionUtils.isEmpty(tourTags)){ public void remove(int id) {
return tourTagAndBannerDTOPageDataVO; this.deleteById(id);
} }
List<TourTagAndBannerDTO> tourTagAndBannerDTOS = new ArrayList<>();
//根据标签ids查询banner
List<Integer> tagIds = tourTags.stream().map(TourTag::getId).collect(Collectors.toList()); /**
Map<Integer, List<TourTagBannerDTO>> tourTagBannerMap = tourTagBannerBiz.findTourTagBannersByTagIds(tagIds); * 分页查询旅游标签
tourTags.forEach(tourTag -> { * @param pageNo 查询的当前
* @param pageSize 分页大小
}); * @return
for (TourTag tourTag:tourTags){ */
//vo转换 public PageDataVO<TourTagAndBannerDTO> findTourTagWithPage(Integer pageNo, Integer pageSize) {
TourTagDTO tourTagDTO = new TourTagDTO(); PageDataVO<TourTagAndBannerDTO> tourTagAndBannerDTOPageDataVO = new PageDataVO<>();
BeanUtils.copyProperties(tourTag,tourTagDTO); //根据分页条件查询出旅游标签的信息
//根据旅游标签id查询出标签banner相关信息 PageDataVO<TourTag> pageDataVO = PageDataVO.pageInfo(pageNo, pageSize, () -> mapper.findAllByIsDel(TourTag.builder().isDel(0).build()));
List<TourTagBannerDTO> tagBannerDTOS = tourTagBannerMap.get(tourTag.getId()); List<TourTag> tourTags = pageDataVO.getData();
//banner 数量 if (log.isDebugEnabled()){
tourTagDTO.setBannerNums(tagBannerDTOS==null?0:tagBannerDTOS.size()); log.debug("旅游分页查询标签：[{}]",tourTags);
tourTagAndBannerDTOS.add(TourTagAndBannerDTO.builder().tourTagDTO(tourTagDTO).tourTagBannerDTOS(tagBannerDTOS).build()); }
} if (CollectionUtils.isEmpty(tourTags)){
//组装数据 return tourTagAndBannerDTOPageDataVO;
tourTagAndBannerDTOPageDataVO.setData(tourTagAndBannerDTOS); }
tourTagAndBannerDTOPageDataVO.setPageNum(pageDataVO.getPageNum()); List<TourTagAndBannerDTO> tourTagAndBannerDTOS = new ArrayList<>();
tourTagAndBannerDTOPageDataVO.setPageSize(pageDataVO.getPageSize()); //根据标签ids查询banner
tourTagAndBannerDTOPageDataVO.setTotalCount(pageDataVO.getTotalCount()); List<Integer> tagIds = tourTags.stream().map(TourTag::getId).collect(Collectors.toList());
tourTagAndBannerDTOPageDataVO.setTotalPage(pageDataVO.getTotalPage()); Map<Integer, List<TourTagBannerDTO>> tourTagBannerMap = tourTagBannerBiz.findTourTagBannersByTagIds(tagIds);
tourTags.forEach(tourTag -> {
return tourTagAndBannerDTOPageDataVO;
} });
for (TourTag tourTag:tourTags){
/** //vo转换
* 根据主键id查询 旅游标签 TourTagDTO tourTagDTO = new TourTagDTO();
* @param tagId BeanUtils.copyProperties(tourTag,tourTagDTO);
* @return //根据旅游标签id查询出标签banner相关信息
*/ List<TourTagBannerDTO> tagBannerDTOS = tourTagBannerMap.get(tourTag.getId());
public TourTagAndBannerDTO findTourTagById(Integer tagId){ //banner 数量
TourTagAndBannerDTO tourTagAndBannerDTO = new TourTagAndBannerDTO(); tourTagDTO.setBannerNums(tagBannerDTOS==null?0:tagBannerDTOS.size());
//根据旅游标签id查询出标签信息 tourTagAndBannerDTOS.add(TourTagAndBannerDTO.builder().tourTagDTO(tourTagDTO).tourTagBannerDTOS(tagBannerDTOS).build());
TourTag tourTag = mapper.findById(tagId); }
if (log.isDebugEnabled()){ //组装数据
log.debug("根据标签id=[{}]查询出标签信息:[{}]",tagId,tourTag); tourTagAndBannerDTOPageDataVO.setData(tourTagAndBannerDTOS);
} tourTagAndBannerDTOPageDataVO.setPageNum(pageDataVO.getPageNum());
if (tourTag==null){ tourTagAndBannerDTOPageDataVO.setPageSize(pageDataVO.getPageSize());
return tourTagAndBannerDTO; tourTagAndBannerDTOPageDataVO.setTotalCount(pageDataVO.getTotalCount());
} tourTagAndBannerDTOPageDataVO.setTotalPage(pageDataVO.getTotalPage());
TourTagDTO tourTagDTO = new TourTagDTO();
BeanUtils.copyProperties(tourTag,tourTagDTO); return tourTagAndBannerDTOPageDataVO;
//根据旅游标签id查询出标签对应的轮播图信息 }
List<TourTagBannerDTO> tourTagBannerDTOS = tourTagBannerBiz.findTourTagBannersByTagId(tagId);
if (log.isDebugEnabled()){ /**
log.debug("根据标签id=[{}],查询出轮播图信息：[{}]",tagId,tourTagBannerDTOS); * 根据主键id查询 旅游标签
} * @param tagId
* @return
//组装数据 */
tourTagAndBannerDTO.setTourTagDTO(tourTagDTO); public TourTagAndBannerDTO findTourTagById(Integer tagId){
tourTagAndBannerDTO.setTourTagBannerDTOS(tourTagBannerDTOS); TourTagAndBannerDTO tourTagAndBannerDTO = new TourTagAndBannerDTO();
return tourTagAndBannerDTO; //根据旅游标签id查询出标签信息
} TourTag tourTag = mapper.findById(tagId);
if (log.isDebugEnabled()){
/** log.debug("根据标签id=[{}]查询出标签信息:[{}]",tagId,tourTag);
* 保存旅游标签 }
* @param tourTagAndBannerDTO if (tourTag==null){
* @return return tourTagAndBannerDTO;
*/ }
@Transactional(rollbackFor = Exception.class) TourTagDTO tourTagDTO = new TourTagDTO();
public int saveTourTag(TourTagAndBannerDTO tourTagAndBannerDTO, UserDTO userDTO) { BeanUtils.copyProperties(tourTag,tourTagDTO);
if (log.isDebugEnabled()){ //根据旅游标签id查询出标签对应的轮播图信息
log.debug("传入保存的标签信息:[{}]",tourTagAndBannerDTO); List<TourTagBannerDTO> tourTagBannerDTOS = tourTagBannerBiz.findTourTagBannersByTagId(tagId);
} if (log.isDebugEnabled()){
TourTagDTO tourTagDTO = tourTagAndBannerDTO.getTourTagDTO(); log.debug("根据标签id=[{}],查询出轮播图信息：[{}]",tagId,tourTagBannerDTOS);
List<TourTagBannerDTO> tourTagBannerDTOS = tourTagAndBannerDTO.getTourTagBannerDTOS(); }
//设置标签创建的相关信息
tourTagDTO.setCtrTime(Instant.now().toEpochMilli()); //组装数据
tourTagDTO.setRank(tourTagDTO.getRank()==null?0:tourTagDTO.getRank()); tourTagAndBannerDTO.setTourTagDTO(tourTagDTO);
tourTagDTO.setIsHot(0); tourTagAndBannerDTO.setTourTagBannerDTOS(tourTagBannerDTOS);
//保存标签 return tourTagAndBannerDTO;
int effectRows = mapper.save(tourTagDTO); }
if (effectRows==0){
return effectRows; /**
} * 保存旅游标签
if (CollectionUtils.isNotEmpty(tourTagBannerDTOS)) { * @param tourTagAndBannerDTO
//保存标签轮播图 * @return
tourTagBannerDTOS.stream().peek(tourTagBannerDTO -> tourTagBannerDTO.setTagId(tourTagDTO.getId())).count(); */
tourTagBannerBiz.saveBatch(tourTagBannerDTOS, userDTO); @Transactional(rollbackFor = Exception.class)
} public int saveTourTag(TourTagAndBannerDTO tourTagAndBannerDTO, UserDTO userDTO) {
return effectRows; if (log.isDebugEnabled()){
} log.debug("传入保存的标签信息:[{}]",tourTagAndBannerDTO);
}
/** TourTagDTO tourTagDTO = tourTagAndBannerDTO.getTourTagDTO();
* 根据主键修改标签状态 List<TourTagBannerDTO> tourTagBannerDTOS = tourTagAndBannerDTO.getTourTagBannerDTOS();
* @param id //设置标签创建的相关信息
* @param status tourTagDTO.setCtrTime(Instant.now().toEpochMilli());
* @return tourTagDTO.setRank(tourTagDTO.getRank()==null?0:tourTagDTO.getRank());
*/ tourTagDTO.setIsHot(0);
@Transactional(rollbackFor = Exception.class) //保存标签
public int updateTourTagStateById(Integer id,int status) { int effectRows = mapper.save(tourTagDTO);
//更改标签状态 if (effectRows==0){
int effecttagRows = mapper.updateTourTagStatusById(id, status); return effectRows;
if (effecttagRows ==0){ }
return effecttagRows; if (CollectionUtils.isNotEmpty(tourTagBannerDTOS)) {
} //保存标签轮播图
//更改标签对应的轮播图状态 tourTagBannerDTOS.stream().peek(tourTagBannerDTO -> tourTagBannerDTO.setTagId(tourTagDTO.getId())).count();
tourTagBannerBiz.updateTourTagBannerStatusByTagId(id,status); tourTagBannerBiz.saveBatch(tourTagBannerDTOS, userDTO);
return effecttagRows; }
} return effectRows;
}
/**
*更改旅游标签信息 /**
* @param tourTagAndBannerDTO * 根据主键修改标签状态
* @return * @param id
*/ * @param status
@Transactional(rollbackFor = Exception.class) * @return
public int updateTourTag(TourTagAndBannerDTO tourTagAndBannerDTO, UserDTO userDTO) { */
if (log.isDebugEnabled()){ @Transactional(rollbackFor = Exception.class)
log.debug("更改的旅游标签信息：[{}]",tourTagAndBannerDTO); public int updateTourTagStateById(Integer id,int status) {
} //更改标签状态
TourTagDTO tourTagDTO = tourTagAndBannerDTO.getTourTagDTO(); int effecttagRows = mapper.updateTourTagStatusById(id, status);
//修改旅游标签信息 if (effecttagRows ==0){
tourTagDTO.setUpdTime(Instant.now().toEpochMilli()); return effecttagRows;
int effrows = mapper.updateTourTag(tourTagDTO); }
if (effrows==0){ //更改标签对应的轮播图状态
return effrows; tourTagBannerBiz.updateTourTagBannerStatusByTagId(id,status);
} return effecttagRows;
//修改标签的相关轮播图 }
List<TourTagBannerDTO> tourTagBannerDTOS = tourTagAndBannerDTO.getTourTagBannerDTOS();
if (log.isDebugEnabled()){ /**
log.debug("更改标签对应的轮播图信息：[{}]",tourTagBannerDTOS); *更改旅游标签信息
} * @param tourTagAndBannerDTO
if (CollectionUtils.isNotEmpty(tourTagBannerDTOS)){ * @return
tourTagBannerDTOS.stream().filter(tourTagBannerDTO -> Objects.isNull(tourTagBannerDTO.getTagId())).peek(tourTagBannerDTO -> tourTagBannerDTO.setTagId(tourTagDTO.getId())).count(); */
} @Transactional(rollbackFor = Exception.class)
tourTagBannerBiz.updateTourBannerByBatch(tourTagBannerDTOS,tourTagAndBannerDTO.getTourTagDTO().getId(),userDTO); public int updateTourTag(TourTagAndBannerDTO tourTagAndBannerDTO, UserDTO userDTO) {
return effrows; if (log.isDebugEnabled()){
} log.debug("更改的旅游标签信息：[{}]",tourTagAndBannerDTO);
}
/** TourTagDTO tourTagDTO = tourTagAndBannerDTO.getTourTagDTO();
* 更改旅游标签热度状态 //修改旅游标签信息
* @param id tourTagDTO.setUpdTime(Instant.now().toEpochMilli());
* @param state int effrows = mapper.updateTourTag(tourTagDTO);
* @return if (effrows==0){
*/ return effrows;
public int updateTourTagHotSate(Integer id, Integer state) { }
return mapper.updateTourTagHotSate(id,state); //修改标签的相关轮播图
} List<TourTagBannerDTO> tourTagBannerDTOS = tourTagAndBannerDTO.getTourTagBannerDTOS();
if (log.isDebugEnabled()){
/** log.debug("更改标签对应的轮播图信息：[{}]",tourTagBannerDTOS);
* 根据标签名查询是否存在 }
* @param name if (CollectionUtils.isNotEmpty(tourTagBannerDTOS)){
* @return tourTagBannerDTOS.stream().filter(tourTagBannerDTO -> Objects.isNull(tourTagBannerDTO.getTagId())).peek(tourTagBannerDTO -> tourTagBannerDTO.setTagId(tourTagDTO.getId())).count();
*/ }
public boolean checkTagNameExist(String name,Integer id) { tourTagBannerBiz.updateTourBannerByBatch(tourTagBannerDTOS,tourTagAndBannerDTO.getTourTagDTO().getId(),userDTO);
List<TourTag> tourTags = mapper.findByTagName(name,id); return effrows;
return CollectionUtils.isNotEmpty(tourTags); }
}
/**
/** * 更改旅游标签热度状态
* 根据旅游标签状态查询 * @param id
* @param status * @param state
* @return * @return
*/ */
public List<TourTag> findTourTagNameAndIdsByStatus(Integer status){ public int updateTourTagHotSate(Integer id, Integer state) {
return mapper.selectByStuatus(status); return mapper.updateTourTagHotSate(id,state);
} }
/**
* 根据标签名查询是否存在
* @param name
* @return
*/
public boolean checkTagNameExist(String name,Integer id) {
List<TourTag> tourTags = mapper.findByTagName(name,id);
return CollectionUtils.isNotEmpty(tourTags);
}
/**
* 根据旅游标签状态查询
* @param status
* @return
*/
public List<TourTag> findTourTagNameAndIdsByStatus(Integer status){
return mapper.selectByStuatus(status);
}
} }
\ No newline at end of file
xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/rest/TourTagController.java
View file @ e8d73bcf
package com.xxfc.platform.tour.rest; package com.xxfc.platform.tour.rest;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO; import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse; import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.rest.BaseController; import com.github.wxiaoqi.security.common.rest.BaseController;
import com.github.wxiaoqi.security.common.vo.PageDataVO; import com.github.wxiaoqi.security.common.vo.PageDataVO;
import com.github.wxiaoqi.security.common.vo.PageParam; import com.github.wxiaoqi.security.common.vo.PageParam;
import com.xxfc.platform.tour.biz.TourTagBiz; import com.xxfc.platform.tour.biz.TourTagBiz;
import com.xxfc.platform.tour.entity.TourTag; import com.xxfc.platform.tour.entity.TourTag;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.Data; import lombok.Data;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.List; import java.util.List;
@RestController @RestController
@RequestMapping("tourTag") @RequestMapping("tourTag")
public class TourTagController extends BaseController<TourTagBiz,TourTag> { public class TourTagController extends BaseController<TourTagBiz,TourTag> {
@Autowired @Autowired
private TourTagBiz tagBiz; private TourTagBiz tagBiz;
@GetMapping("/app/unauth/getTagList") @GetMapping("/app/unauth/getTagList")
public ObjectRestResponse getTagList(pageDTO dto){ public ObjectRestResponse getTagList(pageDTO dto){
if (dto==null) { if (dto==null) {
return ObjectRestResponse.createDefaultFail(); return ObjectRestResponse.createDefaultFail();
} }
Integer hot = dto.getHot(); Integer hot = dto.getHot();
if (hot==1){ if (hot==1){
List<TourTag> hotTag = tagBiz.getHotTag(); List<TourTag> hotTag = tagBiz.getHotTag();
return ObjectRestResponse.succ(hotTag); return ObjectRestResponse.succ(hotTag);
} }
PageDataVO<TourTag> all = tagBiz.findPage(BeanUtil.beanToMap(dto)); PageDataVO<TourTag> all = tagBiz.findPage(BeanUtil.beanToMap(dto));
return ObjectRestResponse.succ(all); return ObjectRestResponse.succ(all);
} }
/**
@Override * 标签带两条线路
@ApiOperation("修改") * @param dto
@RequestMapping(value = "/{id}",method = RequestMethod.PUT) * @return
public ObjectRestResponse<TourTag> update(@RequestBody TourTag tag){ */
tagBiz.update(tag); @GetMapping("/app/unauth/getTagListAndGoods")
return new ObjectRestResponse<TourTag>(); public ObjectRestResponse getTagListAndGoods(pageDTO dto){
}
if (dto==null) {
return ObjectRestResponse.createDefaultFail();
}
@Override
@ApiOperation("删除") Integer hot = dto.getHot();
@RequestMapping(value = "/{id}",method = RequestMethod.DELETE)
public ObjectRestResponse<TourTag> remove(@PathVariable int id){ if (hot==1){
tagBiz.remove(id); List<TourTag> hotTag = tagBiz.getHotTagAndGoods();
return new ObjectRestResponse<TourTag>(); return ObjectRestResponse.succ(hotTag);
} }
PageDataVO<TourTag> all = tagBiz.findPage(BeanUtil.beanToMap(dto));
@Data return ObjectRestResponse.succ(all);
public class pageDTO extends PageParam {
@ApiModelProperty("是否热门") }
Integer hot;
} @Override
@ApiOperation("修改")
@RequestMapping(value = "/{id}",method = RequestMethod.PUT)
@GetMapping("/token") public ObjectRestResponse<TourTag> update(@RequestBody TourTag tag){
public ObjectRestResponse apptoken(AppUserDTO appUserDTO){ tagBiz.update(tag);
return new ObjectRestResponse<TourTag>();
return ObjectRestResponse.succ(appUserDTO); }
}
@Override
@ApiOperation("删除")
@RequestMapping(value = "/{id}",method = RequestMethod.DELETE)
public ObjectRestResponse<TourTag> remove(@PathVariable int id){
tagBiz.remove(id);
return new ObjectRestResponse<TourTag>();
}
@Data
public class pageDTO extends PageParam {
@ApiModelProperty("是否热门")
Integer hot;
}
@GetMapping("/token")
public ObjectRestResponse apptoken(AppUserDTO appUserDTO){
return ObjectRestResponse.succ(appUserDTO);
}
} }
\ No newline at end of file
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