Merge remote-tracking branch 'origin/master'

This commit is contained in:
wxl
2024-12-18 20:03:49 +08:00
25 changed files with 1526 additions and 19 deletions

View File

@@ -0,0 +1,88 @@
package com.dd.admin.business.author.controller;
import cn.hutool.core.bean.BeanUtil;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import org.springframework.web.bind.annotation.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import com.dd.admin.common.model.UpdateGroup;
import com.dd.admin.common.model.result.ResultBean;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import javax.validation.constraints.NotBlank;
import com.dd.admin.business.author.entity.Author;
import com.dd.admin.business.author.domain.AuthorVo;
import com.dd.admin.business.author.domain.AuthorDto;
import com.dd.admin.business.author.service.AuthorService;
import java.util.List;
import org.springframework.web.bind.annotation.RestController;
/**
* <p>
* 作者(博主) 前端控制器
* </p>
*
* @author 727869402@qq.com
* @since 2024-12-12
*/
@Api(tags = "作者(博主)")
@RestController
public class AuthorController {
@Autowired
AuthorService authorService;
@ApiOperation(value = "作者(博主)-分页列表")
@ApiOperationSupport(order = 1)
@GetMapping("/admin/author/page")
public ResultBean<IPage<AuthorVo>> page(AuthorDto authorDto) {
IPage<AuthorVo> pageInfo = authorService.selectAuthorPage(authorDto);
return ResultBean.success(pageInfo);
}
@ApiOperation(value = "作者(博主)-列表")
@ApiOperationSupport(order = 2)
@GetMapping("/admin/author/list")
public ResultBean<List<AuthorVo>> list(AuthorDto authorDto) {
List<AuthorVo> list = authorService.selectAuthorList(authorDto);
return ResultBean.success(list);
}
@ApiOperation(value = "作者(博主)-添加")
@ApiOperationSupport(order = 3)
@PostMapping("/admin/author/add")
public ResultBean<Author> add(@RequestBody @Validated AuthorDto authorDto) {
Author author = BeanUtil.copyProperties(authorDto, Author.class);
authorService.save(author);
return ResultBean.success(author);
}
@ApiOperation(value = "作者(博主)-查询")
@ApiOperationSupport(order = 4)
@GetMapping("/admin/author/{authorId}")
public ResultBean<AuthorVo> get(@PathVariable @NotBlank String authorId) {
Author author = authorService.getById(authorId);
AuthorVo authorVo = BeanUtil.copyProperties(author,AuthorVo.class);
return ResultBean.success(authorVo);
}
@ApiOperation(value = "作者(博主)-修改")
@ApiOperationSupport(order = 5)
@PostMapping("/admin/author/update")
public ResultBean<Author> update(@RequestBody @Validated(UpdateGroup.class) AuthorDto authorDto) {
Author author = BeanUtil.copyProperties(authorDto, Author.class);
authorService.updateById(author);
return ResultBean.success(author);
}
@ApiOperation(value = "作者(博主)-删除")
@ApiOperationSupport(order = 6)
@GetMapping("/admin/author/delete/{authorId}")
public ResultBean<Author> delete(@PathVariable @NotBlank String authorId) {
Boolean b = authorService.removeById(authorId);
return ResultBean.success(b);
}
}

View File

@@ -0,0 +1,116 @@
package com.dd.admin.business.author.domain;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.Version;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotBlank;
import com.dd.admin.common.model.UpdateGroup;
/**
* <p>
* 作者(博主)返回对象
* </p>
*
* @author 727869402@qq.com
* @since 2024-12-12
*/
@Data
@ApiModel(value="作者(博主)接收对象")
public class AuthorDto {
@ApiModelProperty(value = "作者id")
@NotBlank(message = "作者博主id不能为空",groups = UpdateGroup.class)
private String authorId;
@ApiModelProperty(value = "作者号")
private String authorNo;
@ApiModelProperty(value = "作者姓名")
private String authorName;
@ApiModelProperty(value = "头像id")
private String avatarId;
@ApiModelProperty(value = "头像地址")
private String avatarUrl;
@ApiModelProperty(value = "简介")
private String description;
@ApiModelProperty(value = "性别")
private String sex;
@ApiModelProperty(value = "生日")
private Date birth;
@ApiModelProperty(value = "职业")
private String job;
@ApiModelProperty(value = "地区")
private String area;
@ApiModelProperty(value = "学校")
private String school;
@ApiModelProperty(value = "背景图")
private String backGroundId;
@ApiModelProperty(value = "背景图地址")
private String backGroundUrl;
@ApiModelProperty(value = "关注数")
private Long follow;
@ApiModelProperty(value = "粉丝数")
private Long fans;
@ApiModelProperty(value = "点赞数")
private Long upCount;
@ApiModelProperty(value = "收藏数")
private Long starCount;
@ApiModelProperty(value = "0正常")
private Integer authorStatus;
@ApiModelProperty(value = "乐观锁字段")
private Long version;
@ApiModelProperty(value = "0正常 1删除")
private Integer deleted;
@ApiModelProperty(value = "创建时间")
private Date createTime;
@ApiModelProperty(value = "修改时间")
private Date updateTime;
@ApiModelProperty(value = "ip地址")
private String ipAddress;
@ApiModelProperty(value = "真实ip地址")
private String ipRealAddress;
@ApiModelProperty(value = "真实姓名")
private String realName;
@ApiModelProperty(value = "身份证号")
private String idCard;
@ApiModelProperty(value = "手机号")
private String phoneNumber;
}

View File

@@ -0,0 +1,112 @@
package com.dd.admin.business.author.domain;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.Version;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
* 作者(博主)返回对象
* </p>
*
* @author 727869402@qq.com
* @since 2024-12-12
*/
@Data
@ApiModel(value="作者(博主)返回对象")
public class AuthorVo {
@ApiModelProperty(value = "作者id")
private String authorId;
@ApiModelProperty(value = "作者号")
private String authorNo;
@ApiModelProperty(value = "作者姓名")
private String authorName;
@ApiModelProperty(value = "头像id")
private String avatarId;
@ApiModelProperty(value = "头像地址")
private String avatarUrl;
@ApiModelProperty(value = "简介")
private String description;
@ApiModelProperty(value = "性别")
private String sex;
@ApiModelProperty(value = "生日")
private Date birth;
@ApiModelProperty(value = "职业")
private String job;
@ApiModelProperty(value = "地区")
private String area;
@ApiModelProperty(value = "学校")
private String school;
@ApiModelProperty(value = "背景图")
private String backGroundId;
@ApiModelProperty(value = "背景图地址")
private String backGroundUrl;
@ApiModelProperty(value = "关注数")
private Long follow;
@ApiModelProperty(value = "粉丝数")
private Long fans;
@ApiModelProperty(value = "点赞数")
private Long upCount;
@ApiModelProperty(value = "收藏数")
private Long starCount;
@ApiModelProperty(value = "0正常")
private Integer authorStatus;
@ApiModelProperty(value = "乐观锁字段")
private Long version;
@ApiModelProperty(value = "0正常 1删除")
private Integer deleted;
@ApiModelProperty(value = "创建时间")
private Date createTime;
@ApiModelProperty(value = "修改时间")
private Date updateTime;
@ApiModelProperty(value = "ip地址")
private String ipAddress;
@ApiModelProperty(value = "真实ip地址")
private String ipRealAddress;
@ApiModelProperty(value = "真实姓名")
private String realName;
@ApiModelProperty(value = "身份证号")
private String idCard;
@ApiModelProperty(value = "手机号")
private String phoneNumber;
}

View File

@@ -0,0 +1,144 @@
package com.dd.admin.business.author.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.Version;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
* 作者(博主)
* </p>
*
* @author 727869402@qq.com
* @since 2024-12-12
*/
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("business_author")
@ApiModel(value="Author对象", description="作者(博主)")
public class Author implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "作者id")
@TableId(value = "AUTHOR_ID", type = IdType.ASSIGN_UUID)
private String authorId;
@ApiModelProperty(value = "作者号")
@TableField("AUTHOR_NO")
private String authorNo;
@ApiModelProperty(value = "作者姓名")
@TableField("AUTHOR_NAME")
private String authorName;
@ApiModelProperty(value = "头像id")
@TableField("AVATAR_ID")
private String avatarId;
@ApiModelProperty(value = "头像地址")
@TableField("AVATAR_URL")
private String avatarUrl;
@ApiModelProperty(value = "简介")
@TableField("DESCRIPTION")
private String description;
@ApiModelProperty(value = "性别")
@TableField("SEX")
private String sex;
@ApiModelProperty(value = "生日")
@TableField("BIRTH")
private Date birth;
@ApiModelProperty(value = "职业")
@TableField("JOB")
private String job;
@ApiModelProperty(value = "地区")
@TableField("AREA")
private String area;
@ApiModelProperty(value = "学校")
@TableField("SCHOOL")
private String school;
@ApiModelProperty(value = "背景图")
@TableField("BACK_GROUND_ID")
private String backGroundId;
@ApiModelProperty(value = "背景图地址")
@TableField("BACK_GROUND_URL")
private String backGroundUrl;
@ApiModelProperty(value = "关注数")
@TableField("FOLLOW")
private Long follow;
@ApiModelProperty(value = "粉丝数")
@TableField("FANS")
private Long fans;
@ApiModelProperty(value = "点赞数")
@TableField("UP_COUNT")
private Long upCount;
@ApiModelProperty(value = "收藏数")
@TableField("STAR_COUNT")
private Long starCount;
@ApiModelProperty(value = "0正常")
@TableField("AUTHOR_STATUS")
private Integer authorStatus;
@ApiModelProperty(value = "乐观锁字段")
@TableField("VERSION")
@Version
private Long version;
@ApiModelProperty(value = "0正常 1删除")
@TableField("DELETED")
@TableLogic
private Integer deleted;
@ApiModelProperty(value = "创建时间")
@TableField(value = "CREATE_TIME", fill = FieldFill.INSERT)
private Date createTime;
@ApiModelProperty(value = "修改时间")
@TableField(value = "UPDATE_TIME", fill = FieldFill.UPDATE)
private Date updateTime;
@ApiModelProperty(value = "ip地址")
@TableField("IP_ADDRESS")
private String ipAddress;
@ApiModelProperty(value = "真实ip地址")
@TableField("IP_REAL_ADDRESS")
private String ipRealAddress;
@ApiModelProperty(value = "真实姓名")
@TableField("REAL_NAME")
private String realName;
@ApiModelProperty(value = "身份证号")
@TableField("ID_CARD")
private String idCard;
@ApiModelProperty(value = "手机号")
@TableField("PHONE_NUMBER")
private String phoneNumber;
}

View File

@@ -0,0 +1,28 @@
package com.dd.admin.business.author.mapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dd.admin.business.author.entity.Author;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dd.admin.business.author.domain.AuthorVo;
import com.dd.admin.business.author.domain.AuthorDto;
import java.util.List;
/**
* <p>
* 作者(博主) Mapper 接口
* </p>
*
* @author 727869402@qq.com
* @since 2024-12-12
*/
@Mapper
public interface AuthorMapper extends BaseMapper<Author> {
IPage<AuthorVo> selectAuthorPage(Page<AuthorVo> page, @Param("authorDto") AuthorDto authorDto);
List<AuthorVo> selectAuthorList(@Param("authorDto") AuthorDto authorDto);
}

View File

@@ -0,0 +1,52 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.dd.admin.business.author.mapper.AuthorMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.dd.admin.business.author.entity.Author">
<id column="AUTHOR_ID" property="authorId" />
<result column="AUTHOR_NO" property="authorNo" />
<result column="AUTHOR_NAME" property="authorName" />
<result column="AVATAR_ID" property="avatarId" />
<result column="AVATAR_URL" property="avatarUrl" />
<result column="DESCRIPTION" property="description" />
<result column="SEX" property="sex" />
<result column="BIRTH" property="birth" />
<result column="JOB" property="job" />
<result column="AREA" property="area" />
<result column="SCHOOL" property="school" />
<result column="BACK_GROUND_ID" property="backGroundId" />
<result column="BACK_GROUND_URL" property="backGroundUrl" />
<result column="FOLLOW" property="follow" />
<result column="FANS" property="fans" />
<result column="UP_COUNT" property="upCount" />
<result column="STAR_COUNT" property="starCount" />
<result column="AUTHOR_STATUS" property="authorStatus" />
<result column="VERSION" property="version" />
<result column="DELETED" property="deleted" />
<result column="CREATE_TIME" property="createTime" />
<result column="UPDATE_TIME" property="updateTime" />
<result column="IP_ADDRESS" property="ipAddress" />
<result column="IP_REAL_ADDRESS" property="ipRealAddress" />
<result column="REAL_NAME" property="realName" />
<result column="ID_CARD" property="idCard" />
<result column="PHONE_NUMBER" property="phoneNumber" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
AUTHOR_ID, AUTHOR_NO, AUTHOR_NAME, AVATAR_ID, AVATAR_URL, DESCRIPTION, SEX, BIRTH, JOB, AREA, SCHOOL, BACK_GROUND_ID, BACK_GROUND_URL, FOLLOW, FANS, UP_COUNT, STAR_COUNT, AUTHOR_STATUS, VERSION, DELETED, CREATE_TIME, UPDATE_TIME, IP_ADDRESS, IP_REAL_ADDRESS, REAL_NAME, ID_CARD, PHONE_NUMBER
</sql>
<select id="selectAuthorPage" resultType="com.dd.admin.business.author.domain.AuthorVo">
select
*
from business_author where 1 = 1
</select>
<select id="selectAuthorList" resultType="com.dd.admin.business.author.domain.AuthorVo">
select
*
from business_author where 1 = 1
</select>
</mapper>

View File

@@ -0,0 +1,26 @@
package com.dd.admin.business.author.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.dd.admin.business.author.entity.Author;
import com.baomidou.mybatisplus.extension.service.IService;
import com.dd.admin.business.author.domain.AuthorVo;
import com.dd.admin.business.author.domain.AuthorDto;
import java.util.List;
/**
* <p>
* 作者(博主) 服务类
* </p>
*
* @author 727869402@qq.com
* @since 2024-12-12
*/
public interface AuthorService extends IService<Author> {
//作者(博主)-分页列表
IPage<AuthorVo> selectAuthorPage(AuthorDto authorDto);
//作者(博主)-列表
List<AuthorVo> selectAuthorList(AuthorDto authorDto);
}

View File

@@ -0,0 +1,36 @@
package com.dd.admin.business.author.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dd.admin.common.model.PageFactory;
import com.dd.admin.business.author.entity.Author;
import com.dd.admin.business.author.mapper.AuthorMapper;
import com.dd.admin.business.author.service.AuthorService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import com.dd.admin.business.author.domain.AuthorVo;
import com.dd.admin.business.author.domain.AuthorDto;
import java.util.List;
/**
* <p>
* 作者(博主) 服务实现类
* </p>
*
* @author 727869402@qq.com
* @since 2024-12-12
*/
@Service
public class AuthorServiceImpl extends ServiceImpl<AuthorMapper, Author> implements AuthorService {
@Override
public IPage<AuthorVo> selectAuthorPage(AuthorDto authorDto) {
Page page = PageFactory.defaultPage();
return baseMapper.selectAuthorPage(page,authorDto);
}
@Override
public List<AuthorVo> selectAuthorList(AuthorDto authorDto) {
return baseMapper.selectAuthorList(authorDto);
}
}

View File

@@ -11,10 +11,6 @@ spring:
username: root
password: admin
# url: jdbc:p6spy:mysql://120.26.95.195:3306/memberShop?useSSL=false&autoReconnect=true&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
# username: root
# password: wxlwxl12
jackson:
#配置日期返回格式
date-format: yyyy-MM-dd HH:mm:ss

View File

@@ -75,9 +75,9 @@ public class BusinessGenerator {
// 数据源配置
DataSourceConfig dsc = new DataSourceConfig();
dsc.setUrl("jdbc:mysql://127.0.0.1:3306/ddxhs?useSSL=false&autoReconnect=true&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8");
dsc.setUrl("jdbc:mysql://8.146.211.120:3306/ddxhs?useSSL=false&autoReconnect=true&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8");
dsc.setUsername("root");
dsc.setPassword("admin");
dsc.setPassword("wxlwxl12");
// dsc.setSchemaName("public");
dsc.setDriverName("com.mysql.cj.jdbc.Driver");