Commit cddbf83e authored by libin's avatar libin

后台*用户信息获取

parent 882e3df4
package com.xxfc.platform.tour.biz;
import com.ace.cache.annotation.CacheClear;
import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
import com.github.wxiaoqi.security.common.vo.PageDataVO;
import com.xxfc.platform.tour.comstnt.RedisKey;
import com.xxfc.platform.tour.mapper.TourBannerMapper;
......@@ -46,8 +46,8 @@ public class TourBannerBiz extends BaseBiz<TourBannerMapper,TourBanner> {
* @param userInfo
* @return
*/
public int update(TourBanner banner, AppUserDTO userInfo) {
banner.setUpdName(userInfo.getRealname()==null?userInfo.getNickname():userInfo.getRealname());
public int update(TourBanner banner, UserDTO userInfo) {
banner.setUpdName(userInfo.getUsername());
banner.setUpdTime(Instant.now().toEpochMilli());
return mapper.updateByPrimaryKeySelective(banner);
}
......@@ -69,8 +69,8 @@ public class TourBannerBiz extends BaseBiz<TourBannerMapper,TourBanner> {
* @param userInfo
* @return
*/
public int save(TourBanner banner, AppUserDTO userInfo) {
banner.setCrtName(userInfo.getRealname()==null?userInfo.getNickname():userInfo.getRealname());
public int save(TourBanner banner, UserDTO userInfo) {
banner.setCrtName(userInfo.getUsername());
banner.setCrtTime(Instant.now().toEpochMilli());
return mapper.insert(banner);
}
......@@ -82,8 +82,7 @@ public class TourBannerBiz extends BaseBiz<TourBannerMapper,TourBanner> {
* @param userInfo
* @return
*/
public int updateBannerStatus(Integer id, int status, AppUserDTO userInfo) {
String crtName = userInfo.getRealname() == null ? userInfo.getNickname() : userInfo.getRealname();
return mapper.updateByPrimaryKeySelective(TourBanner.builder().id(Long.valueOf(id)).isDel(status).updName(crtName).updTime(Instant.now().toEpochMilli()).build());
public int updateBannerStatus(Integer id, int status, UserDTO userInfo) {
return mapper.updateByPrimaryKeySelective(TourBanner.builder().id(Long.valueOf(id)).isDel(status).updName(userInfo.getUsername()).updTime(Instant.now().toEpochMilli()).build());
}
}
\ No newline at end of file
package com.xxfc.platform.tour.biz;
import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
import com.github.wxiaoqi.security.common.util.EntityUtils;
import com.github.wxiaoqi.security.common.vo.PageDataVO;
import com.xxfc.platform.tour.dto.TourTagBannerDTO;
......@@ -65,12 +66,12 @@ public class TourTagBannerBiz extends BaseBiz<TourTagBannerMapper,TourTagBanner>
* @return
*/
@Transactional(rollbackFor = Exception.class)
public int save(TourTagBannerDTO tourTagBannerDTO, AppUserDTO appUserDTO) {
public int save(TourTagBannerDTO tourTagBannerDTO, UserDTO userDTO) {
TourTagBanner tourTagBanner = new TourTagBanner();
BeanUtils.copyProperties(tourTagBannerDTO,tourTagBanner);
//设置相关信息
tourTagBanner.setCrtTime(Instant.now().toEpochMilli());
tourTagBanner.setCrtName(appUserDTO.getRealname()==null?appUserDTO.getNickname():appUserDTO.getRealname());
tourTagBanner.setCrtName(userDTO.getUsername());
return mapper.insert(tourTagBanner);
}
......@@ -106,9 +107,9 @@ public class TourTagBannerBiz extends BaseBiz<TourTagBannerMapper,TourTagBanner>
* @param tourTagBannerDTOS
*/
@Transactional(rollbackFor = Exception.class)
public void updateTourBannerByBatch(List<TourTagBannerDTO> tourTagBannerDTOS,AppUserDTO appUserDTO) {
public void updateTourBannerByBatch(List<TourTagBannerDTO> tourTagBannerDTOS, UserDTO userDTO) {
tourTagBannerDTOS.stream().peek(tourTagBannerDTO -> EntityUtils.setUpdatedInfo(tourTagBannerDTO)).forEach(tourTagBannerDTO -> {
updateTourBanner(tourTagBannerDTO,appUserDTO);
updateTourBanner(tourTagBannerDTO,userDTO);
});
}
......@@ -118,8 +119,8 @@ public class TourTagBannerBiz extends BaseBiz<TourTagBannerMapper,TourTagBanner>
* @return
*/
@Transactional(rollbackFor = Exception.class)
public int updateTourBanner(TourTagBannerDTO tourTagBannerDTO,AppUserDTO appUserDTO){
tourTagBannerDTO.setUpdName(appUserDTO.getRealname()==null?appUserDTO.getNickname():appUserDTO.getRealname());
public int updateTourBanner(TourTagBannerDTO tourTagBannerDTO,UserDTO userDTO){
tourTagBannerDTO.setUpdName(userDTO.getUsername());
tourTagBannerDTO.setUpdTime(Instant.now().toEpochMilli());
return mapper.updateTourTagBanner(tourTagBannerDTO);
}
......
......@@ -2,6 +2,7 @@ package com.xxfc.platform.tour.biz;
import com.ace.cache.annotation.CacheClear;
import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
import com.github.wxiaoqi.security.common.vo.PageDataVO;
import com.xxfc.platform.tour.comstnt.RedisKey;
import com.xxfc.platform.tour.dto.TourTagAndBannerDTO;
......@@ -121,7 +122,7 @@ public class TourTagBiz extends BaseBiz<TourTagMapper,TourTag> {
* @return
*/
@Transactional(rollbackFor = Exception.class)
public int saveTourTag(TourTagAndBannerDTO tourTagAndBannerDTO, AppUserDTO appUserDTO) {
public int saveTourTag(TourTagAndBannerDTO tourTagAndBannerDTO, UserDTO userDTO) {
TourTagDTO tourTagDTO = tourTagAndBannerDTO.getTourTagDTO();
List<TourTagBannerDTO> tourTagBannerDTOS = tourTagAndBannerDTO.getTourTagBannerDTOS();
//设置标签创建的相关信息
......@@ -134,7 +135,7 @@ public class TourTagBiz extends BaseBiz<TourTagMapper,TourTag> {
//保存标签轮播图
tourTagBannerDTOS.forEach(tourTagBannerDTO -> {
tourTagBannerDTO.setTagId(tourTagDTO.getId());
tourTagBannerBiz.save(tourTagBannerDTO,appUserDTO);
tourTagBannerBiz.save(tourTagBannerDTO,userDTO);
});
return effectRows;
}
......@@ -163,7 +164,7 @@ public class TourTagBiz extends BaseBiz<TourTagMapper,TourTag> {
* @return
*/
@Transactional(rollbackFor = Exception.class)
public int updateTourTag(TourTagAndBannerDTO tourTagAndBannerDTO,AppUserDTO appUserDTO) {
public int updateTourTag(TourTagAndBannerDTO tourTagAndBannerDTO, UserDTO userDTO) {
TourTagDTO tourTagDTO = tourTagAndBannerDTO.getTourTagDTO();
//修改旅游标签信息
tourTagDTO.setUpdTime(Instant.now().toEpochMilli());
......@@ -173,7 +174,7 @@ public class TourTagBiz extends BaseBiz<TourTagMapper,TourTag> {
}
//修改标签的相关轮播图
List<TourTagBannerDTO> tourTagBannerDTOS = tourTagAndBannerDTO.getTourTagBannerDTOS();
tourTagBannerBiz.updateTourBannerByBatch(tourTagBannerDTOS,appUserDTO);
tourTagBannerBiz.updateTourBannerByBatch(tourTagBannerDTOS,userDTO);
return effrows;
}
}
\ No newline at end of file
......@@ -31,7 +31,7 @@ public class TourBannerAdminController extends TourBaseController<TourBannerBiz>
@PutMapping
@ApiOperation(value = "banner修改",notes = "修改")
public ObjectRestResponse<TourBanner> update(@RequestBody TourBanner banner){
int effectRows = getBaseBiz().update(banner,getUserInfo());
int effectRows = getBaseBiz().update(banner,userinfoByToken());
if (effectRows>0){
return ObjectRestResponse.succ();
}
......@@ -78,7 +78,7 @@ public class TourBannerAdminController extends TourBaseController<TourBannerBiz>
@ApiOperation(value = "banner保存",notes = "banner保存")
@PostMapping
public ObjectRestResponse<Void> saveTourBanner(@RequestBody TourBanner banner){
int effectRows = getBaseBiz().save(banner,getUserInfo());
int effectRows = getBaseBiz().save(banner,userinfoByToken());
if (effectRows>0){
return ObjectRestResponse.succ();
}
......@@ -96,7 +96,7 @@ public class TourBannerAdminController extends TourBaseController<TourBannerBiz>
@ApiOperation(value = "banner逻辑删除",notes = "banner逻辑删除")
public ObjectRestResponse<Void> deleteBannerById(@PathVariable Integer id){
int effectRows = getBaseBiz().updateBannerStatus(id,1,getUserInfo());
int effectRows = getBaseBiz().updateBannerStatus(id,1,userinfoByToken());
if (effectRows>0){
return ObjectRestResponse.succ();
}
......
......@@ -60,7 +60,7 @@ public class TourTagAdminController extends TourBaseController<TourTagBiz> {
@PostMapping("/save")
@ApiOperation("保存旅游标签")
public ObjectRestResponse<TourTag> save(@RequestBody TourTagAndBannerDTO tourTagAndBannerDTO) {
int insertRows = getBaseBiz().saveTourTag(tourTagAndBannerDTO,getUserInfo());
int insertRows = getBaseBiz().saveTourTag(tourTagAndBannerDTO,userinfoByToken());
if (insertRows>0){
return ObjectRestResponse.succ();
}
......@@ -89,7 +89,7 @@ public class TourTagAdminController extends TourBaseController<TourTagBiz> {
@PutMapping("/update")
@ApiOperation("更新旅游标签")
public ObjectRestResponse<Void> updateTourTag(@RequestBody TourTagAndBannerDTO tourTagAndBannerDTO){
int effectRows = getBaseBiz().updateTourTag(tourTagAndBannerDTO,getUserInfo());
int effectRows = getBaseBiz().updateTourTag(tourTagAndBannerDTO,userinfoByToken());
if (effectRows>0) {
return ObjectRestResponse.succ();
}
......
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