From 1ae110efb7c8c8c750ffac9f3e1357df95724b92 Mon Sep 17 00:00:00 2001 From: penny <2500338766@qq.com> Date: Sat, 15 Oct 2022 17:46:09 +0800 Subject: [PATCH] =?UTF-8?q?feature-1.0-img:=20=E6=96=B0=E5=A2=9E=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E7=AD=89=E7=BA=A7=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../img/controller/LevelInfoController.java | 81 +++++++++++++++++++ .../java/com/bnyer/img/domain/Creator.java | 14 ++++ .../java/com/bnyer/img/domain/LevelInfo.java | 68 ++++++++++++++++ .../java/com/bnyer/img/dto/LevelInfoDto.java | 41 ++++++++++ .../com/bnyer/img/dto/LevelInfoPageDto.java | 21 +++++ .../com/bnyer/img/mapper/LevelInfoMapper.java | 9 +++ .../bnyer/img/service/LevelInfoService.java | 52 ++++++++++++ .../service/impl/LevelInfoServiceImpl.java | 77 ++++++++++++++++++ .../com/bnyer/img/vo/CreatorDetailsVo.java | 6 ++ .../com/bnyer/img/vo/CreatorFollowVo.java | 6 ++ .../main/java/com/bnyer/img/vo/CreatorVo.java | 6 ++ .../com/bnyer/img/mapper/CreatorMapper.xml | 16 +++- .../com/bnyer/img/mapper/LevelInfoMapper.xml | 23 ++++++ 13 files changed, 418 insertions(+), 2 deletions(-) create mode 100644 bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/LevelInfoController.java create mode 100644 bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/LevelInfo.java create mode 100644 bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/LevelInfoDto.java create mode 100644 bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/LevelInfoPageDto.java create mode 100644 bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/LevelInfoMapper.java create mode 100644 bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/LevelInfoService.java create mode 100644 bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/LevelInfoServiceImpl.java create mode 100644 bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/LevelInfoMapper.xml diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/LevelInfoController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/LevelInfoController.java new file mode 100644 index 0000000..ddb5c70 --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/LevelInfoController.java @@ -0,0 +1,81 @@ +package com.bnyer.img.controller; + +import com.alibaba.fastjson.JSON; +import com.bnyer.common.core.utils.DesensitizedUtils; +import com.bnyer.common.core.web.controller.BaseController; +import com.bnyer.common.core.web.domain.AjaxResult; +import com.bnyer.common.core.web.page.TableDataInfo; +import com.bnyer.img.domain.LevelInfo; +import com.bnyer.img.dto.LevelInfoDto; +import com.bnyer.img.dto.LevelInfoPageDto; +import com.bnyer.img.dto.StatusDto; +import com.bnyer.img.service.LevelInfoService; +import com.github.pagehelper.PageHelper; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@Api(value = "【图文平台】等级信息接口",tags = "【图文平台】等级信息接口") +@RestController +@RequestMapping("/img/levelInfo") +@Slf4j +public class LevelInfoController extends BaseController { + + @Autowired + private LevelInfoService levelInfoService; + + //@RequiresPermissions("system:config:list") + @ApiOperation(value="查询等级信息分页") + @PostMapping("/page") + public TableDataInfo pageLevelInfo(@RequestBody @ApiParam("分页对象") LevelInfoPageDto dto){ + PageHelper.startPage(dto.getPageNum(), dto.getPageSize()); + List levelInfos = levelInfoService.queryList(dto); + return getDataTable(levelInfos); + } + + //@RequiresPermissions("system:config:list") + @ApiOperation(value="新增等级信息") + @PostMapping(value = "/insert") + public AjaxResult insertLevelInfo(@Validated @RequestBody @ApiParam("levelInfo对象") LevelInfoDto dto){ + log.debug("【图文平台后台】新增等级信息参数为:{}", DesensitizedUtils.getJson(dto)); + return AjaxResult.success(levelInfoService.insert(dto.extractParam())); + } + + //@RequiresPermissions("system:config:list") + @ApiOperation(value="修改等级信息") + @PostMapping(value = "/update") + public AjaxResult updateLevelInfo(@Validated @RequestBody @ApiParam("levelInfo对象") LevelInfoDto dto){ + log.debug("【图文平台后台】修改等级信息参数为:{}", JSON.toJSONString(dto)); + return AjaxResult.success(levelInfoService.update(dto.extractParam())); + } + + //@RequiresPermissions("system:config:list") + @ApiOperation(value="删除levelInfo") + @DeleteMapping(value = "/delete/{ids}") + public AjaxResult deleteLevelInfo(@PathVariable @ApiParam("主键ids") List ids){ + log.debug("【图文平台后台】删除等级信息参数为:{}", JSON.toJSONString(ids)); + return AjaxResult.success(levelInfoService.delete(ids)); + } + + //@RequiresPermissions("system:config:list") + @ApiOperation(value="查询等级信息详情") + @GetMapping(value = "/details/{id}") + public AjaxResult detailsLevelInfo(@PathVariable @ApiParam("主键id") Long id){ + log.debug("【图文平台后台】查询等级信息详情参数为:{}", id); + return AjaxResult.success(levelInfoService.queryDetails(id)); + } + + //@RequiresPermissions("system:config:list") + @ApiOperation(value="变更type显示状态") + @PostMapping(value = "/changeStatus") + public AjaxResult changeStatus(@Validated @RequestBody @ApiParam("type状态对象") StatusDto dto){ + log.debug("【图文平台后台】变更type参数为:{}", JSON.toJSONString(dto)); + return AjaxResult.success(levelInfoService.changeStatus(dto.getId(),dto.getStatus())); + } +} diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/Creator.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/Creator.java index 6f9d8c9..71dc494 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/Creator.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/Creator.java @@ -119,5 +119,19 @@ public class Creator extends BaseDomain { @ApiModelProperty(value="最后登录时间") private Date lastLoginTime; + /** + * 等级id + */ + @TableField(value = "level_id") + @ApiModelProperty(value="等级id") + private Long levelId; + + /** + * 经验值 + */ + @TableField(value = "exp") + @ApiModelProperty(value="经验值") + private Integer exp; + private static final long serialVersionUID = 1L; } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/LevelInfo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/LevelInfo.java new file mode 100644 index 0000000..be08073 --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/LevelInfo.java @@ -0,0 +1,68 @@ +package com.bnyer.img.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; +import java.util.Date; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; + +@ApiModel(value="com-bnyer-img-domain-LevelInfo") +@Getter +@Setter +@ToString +@AllArgsConstructor +@NoArgsConstructor +@TableName(value = "img_level_info") +public class LevelInfo extends BaseDomain { + /** + * 主键id + */ + @TableId(value = "id", type = IdType.AUTO) + @ApiModelProperty(value="主键id") + private Long id; + + /** + * 等级头衔名称 + */ + @TableField(value = "title") + @ApiModelProperty(value="等级头衔名称") + private String title; + + /** + * 头衔图标 + */ + @TableField(value = "title_icon") + @ApiModelProperty(value="头衔图标") + private String titleIcon; + + /** + * 最小经验值 + */ + @TableField(value = "min_exp") + @ApiModelProperty(value="最小经验值") + private Integer minExp; + + /** + * 最大经验值 + */ + @TableField(value = "max_exp") + @ApiModelProperty(value="最大经验值") + private Integer maxExp; + + /** + * 等级类型(0->用户;1->创作者) + */ + @TableField(value = "type") + @ApiModelProperty(value="等级类型(0->用户;1->创作者)") + private String type; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/LevelInfoDto.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/LevelInfoDto.java new file mode 100644 index 0000000..839a778 --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/LevelInfoDto.java @@ -0,0 +1,41 @@ +package com.bnyer.img.dto; + +import com.bnyer.common.core.utils.bean.BeanUtils; +import com.bnyer.img.domain.LevelInfo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +import java.io.Serializable; + + +@Getter +@Setter +@ApiModel("等级信息接收类") +public class LevelInfoDto implements Serializable { + + @ApiModelProperty(value="主键id") + private Long id; + + @ApiModelProperty(value="等级头衔名称") + private String title; + + @ApiModelProperty(value="头衔图标") + private String titleIcon; + + @ApiModelProperty(value="最小经验值") + private Integer minExp; + + @ApiModelProperty(value="最大经验值") + private Integer maxExp; + + @ApiModelProperty(value="等级类型(0->用户;1->创作者)") + private String type; + + public LevelInfo extractParam(){ + LevelInfo levelInfo = new LevelInfo(); + BeanUtils.copyProperties(this,levelInfo); + return levelInfo; + } +} diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/LevelInfoPageDto.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/LevelInfoPageDto.java new file mode 100644 index 0000000..481eaf1 --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/LevelInfoPageDto.java @@ -0,0 +1,21 @@ +package com.bnyer.img.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@ApiModel("等级分页接收类") +public class LevelInfoPageDto extends BasePageDto { + + @ApiModelProperty(value="等级头衔名称") + private String title; + + @ApiModelProperty(value="等级类型(0->用户;1->创作者)") + private String type; + + @ApiModelProperty(value="是否显示") + private String isShow; +} diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/LevelInfoMapper.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/LevelInfoMapper.java new file mode 100644 index 0000000..092cbab --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/LevelInfoMapper.java @@ -0,0 +1,9 @@ +package com.bnyer.img.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.bnyer.img.domain.LevelInfo; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface LevelInfoMapper extends BaseMapper { +} \ No newline at end of file diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/LevelInfoService.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/LevelInfoService.java new file mode 100644 index 0000000..d6dff88 --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/LevelInfoService.java @@ -0,0 +1,52 @@ +package com.bnyer.img.service; + +import com.bnyer.img.domain.LevelInfo; +import com.bnyer.img.dto.LevelInfoPageDto; + +import java.util.List; + +public interface LevelInfoService { + + /** + * 新增等级 + * @param levelInfo 等级信息 + * @return - + */ + int insert(LevelInfo levelInfo); + + /** + * 修改等级 + * @param levelInfo 等级信息 + * @return - + */ + int update(LevelInfo levelInfo); + + /** + * 批量删除等级信息 + * @param ids 主键ids + * @return - + */ + int delete(List ids); + + /** + * 查询等级列表分页 + * @param params 分页参数 + * @return - + */ + List queryList(LevelInfoPageDto params); + + /** + * 查询等级详情 + * @param id 主键Id + * @return - + */ + LevelInfo queryDetails(Long id); + + /** + * 变更显示状态 + * @param id 主键id + * @param status 状态 + * @return - + */ + int changeStatus(Long id, String status); +} diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/LevelInfoServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/LevelInfoServiceImpl.java new file mode 100644 index 0000000..4b81069 --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/LevelInfoServiceImpl.java @@ -0,0 +1,77 @@ +package com.bnyer.img.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.bnyer.common.core.utils.StringUtils; +import com.bnyer.img.domain.LevelInfo; +import com.bnyer.img.domain.Notice; +import com.bnyer.img.dto.LevelInfoPageDto; +import com.bnyer.img.mapper.LevelInfoMapper; +import com.bnyer.img.service.LevelInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; +import java.util.List; + +@Service +public class LevelInfoServiceImpl implements LevelInfoService { + + @Autowired + private LevelInfoMapper levelInfoMapper; + + @Override + @Transactional(rollbackFor = Exception.class) + public int insert(LevelInfo levelInfo) { + levelInfo.setCreateTime(new Date()); + levelInfo.setUpdateTime(new Date()); + levelInfo.setIsShow("1"); + levelInfo.setSort(0); + return levelInfoMapper.insert(levelInfo); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public int update(LevelInfo levelInfo) { + levelInfo.setUpdateTime(new Date()); + return levelInfoMapper.updateById(levelInfo); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public int delete(List ids) { + return levelInfoMapper.deleteBatchIds(ids); + } + + @Override + public List queryList(LevelInfoPageDto params) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + if(StringUtils.isNotBlank(params.getTitle())){ + wrapper.like(LevelInfo::getTitle, params.getTitle()); + } + if(StringUtils.isNotBlank(params.getType())){ + wrapper.eq(LevelInfo::getType, params.getType()); + } + if(StringUtils.isNotBlank(params.getIsShow())){ + wrapper.eq(LevelInfo::getIsShow, params.getIsShow()); + } + wrapper.orderByDesc(LevelInfo::getSort); + return levelInfoMapper.selectList(wrapper); + } + + @Override + public LevelInfo queryDetails(Long id) { + return levelInfoMapper.selectById(id); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public int changeStatus(Long id, String status) { + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.eq(LevelInfo::getId, id); + LevelInfo levelInfo = new LevelInfo(); + levelInfo.setIsShow(status); + return levelInfoMapper.update(levelInfo,wrapper); + } +} diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorDetailsVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorDetailsVo.java index 7c6b063..54f4972 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorDetailsVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorDetailsVo.java @@ -26,6 +26,12 @@ public class CreatorDetailsVo implements Serializable { @ApiModelProperty(value="头像img地址") private String img; + @ApiModelProperty(value="等级名称") + private String levelName; + + @ApiModelProperty(value="等级图标") + private String levelIcon; + @ApiModelProperty(value="序号") private Integer sort; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorFollowVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorFollowVo.java index 0f04d10..d7e563b 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorFollowVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorFollowVo.java @@ -19,6 +19,12 @@ public class CreatorFollowVo implements Serializable { @ApiModelProperty(value="搜索码") private String scanCode; + @ApiModelProperty(value="等级名称") + private String levelName; + + @ApiModelProperty(value="等级图标") + private String levelIcon; + @ApiModelProperty(value="是否热门") private String isHot; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorVo.java index 61bb5e6..f7d172f 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorVo.java @@ -41,6 +41,12 @@ public class CreatorVo implements Serializable { @ApiModelProperty(value="图片喜欢数量") private Integer imgLikeNum; + @ApiModelProperty(value="等级名称") + private String levelName; + + @ApiModelProperty(value="等级图标") + private String levelIcon; + @ApiModelProperty(value="图片列表") List imgList; diff --git a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CreatorMapper.xml b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CreatorMapper.xml index a823cb9..895b67a 100644 --- a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CreatorMapper.xml +++ b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CreatorMapper.xml @@ -15,6 +15,8 @@ + + @@ -32,6 +34,8 @@ + + @@ -43,6 +47,8 @@ + + @@ -54,16 +60,18 @@ id, `name`,password, scan_code, phone, img, intro, invite_code, url, status, is_hot, is_show, create_time, - update_time, sort, amt, last_login_time + update_time, sort, amt, last_login_time,level_id,exp @@ -127,17 +135,21 @@