diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/PhoneVo.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/PhoneVo.java index 11ce82c3..448b9089 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/PhoneVo.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/PhoneVo.java @@ -15,4 +15,5 @@ import java.io.Serializable; @Data public class PhoneVo extends BaseEntity { private String phone; + private String code; } diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/TbUserVo.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/TbUserVo.java index 884338a5..f271df0d 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/TbUserVo.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/TbUserVo.java @@ -16,14 +16,13 @@ import java.util.Date; @Data public class TbUserVo extends BaseEntity { - private static final long serialVersionUID = 1L; private Long userId; + private String token; /** * 用户账号 */ private String userName; - private String token; /** * 用户昵称 @@ -48,7 +47,7 @@ public class TbUserVo extends BaseEntity { /** * 用户性别（0男 1女 2未知） */ - private String sex; + private Integer sex; /** * 头像地址 @@ -68,12 +67,12 @@ public class TbUserVo extends BaseEntity { /** * 帐号状态（0正常 1停用） */ - private String status; + private Integer status; /** * 删除标志（0代表存在 2代表删除） */ - private String delFlag; + private Integer delFlag; /** * 最后登录IP @@ -124,12 +123,11 @@ public class TbUserVo extends BaseEntity { /** * 实名状态(0,未实名1已实名) */ - private String realnameState; + private Integer realnameState; /** * 信誉积分 */ private Integer honorIntegral; - } diff --git a/ruoyi-modules/ruoyi-user/pom.xml b/ruoyi-modules/ruoyi-user/pom.xml index c738af55..aff0c0c5 100644 --- a/ruoyi-modules/ruoyi-user/pom.xml +++ b/ruoyi-modules/ruoyi-user/pom.xml @@ -125,7 +125,11 @@ com.ruoyi ruoyi-common-swagger - + + com.github.xiaoymin + knife4j-spring-boot-starter + 2.0.7 + diff --git a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/mapper/TbPermMapper.java b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/mapper/TbPermMapper.java deleted file mode 100644 index 3176d6aa..00000000 --- a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/mapper/TbPermMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.bwie.ruoyi.mapper; - -import com.bwie.ruoyi.pojo.TbPerm; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** -* @author 海龙 -* @description 针对表【tb_perm(权限表)】的数据库操作Mapper -* @createDate 2023-01-13 14:34:44 -* @Entity com.bwie.ruoyi.pojo.TbPerm -*/ -public interface TbPermMapper extends BaseMapper { - -} - - - - diff --git a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/mapper/TbRoleMapper.java b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/mapper/TbRoleMapper.java deleted file mode 100644 index 9cbc5598..00000000 --- a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/mapper/TbRoleMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.bwie.ruoyi.mapper; - -import com.bwie.ruoyi.pojo.TbRole; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** -* @author 海龙 -* @description 针对表【tb_role(角色表)】的数据库操作Mapper -* @createDate 2023-01-13 14:34:44 -* @Entity com.bwie.ruoyi.pojo.TbRole -*/ -public interface TbRoleMapper extends BaseMapper { - -} - - - - diff --git a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/mapper/TbRolePermMapper.java b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/mapper/TbRolePermMapper.java deleted file mode 100644 index 3b4d3262..00000000 --- a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/mapper/TbRolePermMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.bwie.ruoyi.mapper; - -import com.bwie.ruoyi.pojo.TbRolePerm; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** -* @author 海龙 -* @description 针对表【tb_role_perm(角色权限表)】的数据库操作Mapper -* @createDate 2023-01-13 14:34:44 -* @Entity com.bwie.ruoyi.pojo.TbRolePerm -*/ -public interface TbRolePermMapper extends BaseMapper { - -} - - - - diff --git a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/mapper/TbUserBankcardMapper.java b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/mapper/TbUserBankcardMapper.java deleted file mode 100644 index b7f99c99..00000000 --- a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/mapper/TbUserBankcardMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.bwie.ruoyi.mapper; - -import com.bwie.ruoyi.pojo.TbUserBankcard; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** -* @author 海龙 -* @description 针对表【tb_user_bankcard(账户表)】的数据库操作Mapper -* @createDate 2023-01-13 14:34:44 -* @Entity com.bwie.ruoyi.pojo.TbUserBankcard -*/ -public interface TbUserBankcardMapper extends BaseMapper { - -} - - - - diff --git a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/mapper/TbUserRoleMapper.java b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/mapper/TbUserRoleMapper.java deleted file mode 100644 index a1ee4340..00000000 --- a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/mapper/TbUserRoleMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.bwie.ruoyi.mapper; - -import com.bwie.ruoyi.pojo.TbUserRole; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** -* @author 海龙 -* @description 针对表【tb_user_role(用户类型表)】的数据库操作Mapper -* @createDate 2023-01-13 14:34:44 -* @Entity com.bwie.ruoyi.pojo.TbUserRole -*/ -public interface TbUserRoleMapper extends BaseMapper { - -} - - - - diff --git a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/pojo/TbRole.java b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/pojo/TbRole.java deleted file mode 100644 index aa188dce..00000000 --- a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/pojo/TbRole.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.bwie.ruoyi.pojo; - -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 java.io.Serializable; -import java.util.Date; - -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; - -/** - * 角色表 - * @TableName tb_role - */ -@TableName(value ="tb_role") -@Data -public class TbRole implements Serializable { - /** - * - */ - @TableId(type = IdType.AUTO) - private Integer roleId; - - /** - * 角色名称 - */ - private String roleName; - - /** - * 删除状态0：未删除1：已删除 - */ - private Integer deleted; - - /** - * 创建时间 - */ - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date createTime; - - /** - * 更新时间 - */ - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date updateTime; - - @TableField(exist = false) - private static final long serialVersionUID = 1L; -} \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/service/TbPermService.java b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/service/TbPermService.java deleted file mode 100644 index 558705b4..00000000 --- a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/service/TbPermService.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.bwie.ruoyi.service; - -import com.bwie.ruoyi.pojo.TbPerm; -import com.baomidou.mybatisplus.extension.service.IService; - -/** -* @author 海龙 -* @description 针对表【tb_perm(权限表)】的数据库操作Service -* @createDate 2023-01-13 14:34:44 -*/ -public interface TbPermService extends IService { - -} diff --git a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/service/TbRolePermService.java b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/service/TbRolePermService.java deleted file mode 100644 index 5cb53d14..00000000 --- a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/service/TbRolePermService.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.bwie.ruoyi.service; - -import com.bwie.ruoyi.pojo.TbRolePerm; -import com.baomidou.mybatisplus.extension.service.IService; - -/** -* @author 海龙 -* @description 针对表【tb_role_perm(角色权限表)】的数据库操作Service -* @createDate 2023-01-13 14:34:44 -*/ -public interface TbRolePermService extends IService { - -} diff --git a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/service/TbRoleService.java b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/service/TbRoleService.java deleted file mode 100644 index 89446534..00000000 --- a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/service/TbRoleService.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.bwie.ruoyi.service; - -import com.bwie.ruoyi.pojo.TbRole; -import com.baomidou.mybatisplus.extension.service.IService; - -/** -* @author 海龙 -* @description 针对表【tb_role(角色表)】的数据库操作Service -* @createDate 2023-01-13 14:34:44 -*/ -public interface TbRoleService extends IService { - -} diff --git a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/service/TbUserBankcardService.java b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/service/TbUserBankcardService.java deleted file mode 100644 index 15509d8b..00000000 --- a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/service/TbUserBankcardService.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.bwie.ruoyi.service; - -import com.bwie.ruoyi.pojo.TbUserBankcard; -import com.baomidou.mybatisplus.extension.service.IService; - -/** -* @author 海龙 -* @description 针对表【tb_user_bankcard(账户表)】的数据库操作Service -* @createDate 2023-01-13 14:34:44 -*/ -public interface TbUserBankcardService extends IService { - -} diff --git a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/service/TbUserRoleService.java b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/service/TbUserRoleService.java deleted file mode 100644 index db30cbc1..00000000 --- a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/service/TbUserRoleService.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.bwie.ruoyi.service; - -import com.bwie.ruoyi.pojo.TbUserRole; -import com.baomidou.mybatisplus.extension.service.IService; - -/** -* @author 海龙 -* @description 针对表【tb_user_role(用户类型表)】的数据库操作Service -* @createDate 2023-01-13 14:34:44 -*/ -public interface TbUserRoleService extends IService { - -} diff --git a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/service/impl/TbPermServiceImpl.java b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/service/impl/TbPermServiceImpl.java deleted file mode 100644 index 6afaa891..00000000 --- a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/service/impl/TbPermServiceImpl.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.bwie.ruoyi.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.bwie.ruoyi.pojo.TbPerm; -import com.bwie.ruoyi.service.TbPermService; -import com.bwie.ruoyi.mapper.TbPermMapper; -import org.springframework.stereotype.Service; - -/** -* @author 海龙 -* @description 针对表【tb_perm(权限表)】的数据库操作Service实现 -* @createDate 2023-01-13 14:34:44 -*/ -@Service -public class TbPermServiceImpl extends ServiceImpl - implements TbPermService{ - -} - - - - diff --git a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/service/impl/TbRolePermServiceImpl.java b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/service/impl/TbRolePermServiceImpl.java deleted file mode 100644 index 3024fe4b..00000000 --- a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/service/impl/TbRolePermServiceImpl.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.bwie.ruoyi.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.bwie.ruoyi.pojo.TbRolePerm; -import com.bwie.ruoyi.service.TbRolePermService; -import com.bwie.ruoyi.mapper.TbRolePermMapper; -import org.springframework.stereotype.Service; - -/** -* @author 海龙 -* @description 针对表【tb_role_perm(角色权限表)】的数据库操作Service实现 -* @createDate 2023-01-13 14:34:44 -*/ -@Service -public class TbRolePermServiceImpl extends ServiceImpl - implements TbRolePermService{ - -} - - - - diff --git a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/service/impl/TbRoleServiceImpl.java b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/service/impl/TbRoleServiceImpl.java deleted file mode 100644 index e4f043d5..00000000 --- a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/service/impl/TbRoleServiceImpl.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.bwie.ruoyi.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.bwie.ruoyi.pojo.TbRole; -import com.bwie.ruoyi.service.TbRoleService; -import com.bwie.ruoyi.mapper.TbRoleMapper; -import org.springframework.stereotype.Service; - -/** -* @author 海龙 -* @description 针对表【tb_role(角色表)】的数据库操作Service实现 -* @createDate 2023-01-13 14:34:44 -*/ -@Service -public class TbRoleServiceImpl extends ServiceImpl - implements TbRoleService{ - -} - - - - diff --git a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/service/impl/TbUserBankcardServiceImpl.java b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/service/impl/TbUserBankcardServiceImpl.java deleted file mode 100644 index fa8bcc56..00000000 --- a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/service/impl/TbUserBankcardServiceImpl.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.bwie.ruoyi.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.bwie.ruoyi.pojo.TbUserBankcard; -import com.bwie.ruoyi.service.TbUserBankcardService; -import com.bwie.ruoyi.mapper.TbUserBankcardMapper; -import org.springframework.stereotype.Service; - -/** -* @author 海龙 -* @description 针对表【tb_user_bankcard(账户表)】的数据库操作Service实现 -* @createDate 2023-01-13 14:34:44 -*/ -@Service -public class TbUserBankcardServiceImpl extends ServiceImpl - implements TbUserBankcardService{ - -} - - - - diff --git a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/service/impl/TbUserRoleServiceImpl.java b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/service/impl/TbUserRoleServiceImpl.java deleted file mode 100644 index 3bafb84f..00000000 --- a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/service/impl/TbUserRoleServiceImpl.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.bwie.ruoyi.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.bwie.ruoyi.pojo.TbUserRole; -import com.bwie.ruoyi.service.TbUserRoleService; -import com.bwie.ruoyi.mapper.TbUserRoleMapper; -import org.springframework.stereotype.Service; - -/** -* @author 海龙 -* @description 针对表【tb_user_role(用户类型表)】的数据库操作Service实现 -* @createDate 2023-01-13 14:34:44 -*/ -@Service -public class TbUserRoleServiceImpl extends ServiceImpl - implements TbUserRoleService{ - -} - - - - diff --git a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/RuoYiUserApplication.java b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/RuoYiUserApplication.java similarity index 91% rename from ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/RuoYiUserApplication.java rename to ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/RuoYiUserApplication.java index 5e96c64e..d5185ced 100644 --- a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/RuoYiUserApplication.java +++ b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/RuoYiUserApplication.java @@ -1,8 +1,9 @@ -package com.bwie.ruoyi; +package com.bwie.user; import com.ruoyi.common.security.annotation.EnableCustomConfig; import com.ruoyi.common.security.annotation.EnableRyFeignClients; import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2; +import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -15,6 +16,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @EnableCustomSwagger2 @EnableRyFeignClients @SpringBootApplication +@MapperScan("com.bwie.user.mapper") public class RuoYiUserApplication { public static void main(String[] args) diff --git a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/config/Knife4jConfiguration.java b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/config/Knife4jConfiguration.java similarity index 51% rename from ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/config/Knife4jConfiguration.java rename to ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/config/Knife4jConfiguration.java index 3edeb256..7e019913 100644 --- a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/config/Knife4jConfiguration.java +++ b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/config/Knife4jConfiguration.java @@ -1,48 +1,43 @@ -package com.bwie.ruoyi.config; +package com.bwie.user.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import springfox.documentation.builders.ApiInfoBuilder; import springfox.documentation.builders.PathSelectors; import springfox.documentation.builders.RequestHandlerSelectors; -import springfox.documentation.service.ApiInfo; import springfox.documentation.service.Contact; import springfox.documentation.spi.DocumentationType; import springfox.documentation.spring.web.plugins.Docket; -import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc; +import springfox.documentation.swagger2.annotations.EnableSwagger2; /** - * @author 冰烆 - * @version 1.0 - * @description: TODO - * @date 2022/10/21 20:15 + * @Description //TODO + * @Author 王辉 + * @Date 2022/11/13 19:53 */ - @Configuration -@EnableSwagger2WebMvc +@EnableSwagger2 public class Knife4jConfiguration { - @Bean(value = "dockerBean") - public Docket dockerBean() { - //指定使用Swagger2规范 - Docket docket = new Docket(DocumentationType.SWAGGER_2) - .apiInfo(webApiInfo()) + @Bean(value = "defaultApi2") + public Docket defaultApi2() { + String groupName="3.X版本"; + Docket docket=new Docket(DocumentationType.OAS_30) + .apiInfo(new ApiInfoBuilder() + .title("这是User API ") + .description("# 这里记录服务端所有的接口的入参，出参等等信息") + .termsOfServiceUrl("https://www.shenmazong.com") + .contact(new Contact("shl","http://bwie.com","1447562585@qq.com")) + .version("3.0") + .build()) //分组名称 - .groupName("WebApi") + .groupName(groupName) .select() //这里指定Controller扫描包路径 - .apis(RequestHandlerSelectors.basePackage("com.bwie")) + .apis(RequestHandlerSelectors.basePackage("com.bwie.user")) .paths(PathSelectors.any()) .build(); return docket; } - private ApiInfo webApiInfo() { - return new ApiInfoBuilder() - //描述字段支持Markdown语法 - .title("Weekly-API") - .contact(new Contact("苏海龙", "https://www.bwie.net/", "bwie@bwie.com")) - .description("考试服务端API-version1.0") - .version("1.0") - .build(); - } + } diff --git a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/controller/DuanXinSend.java b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/controller/DuanXinSend.java similarity index 89% rename from ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/controller/DuanXinSend.java rename to ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/controller/DuanXinSend.java index 688ffdb4..6f944f69 100644 --- a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/controller/DuanXinSend.java +++ b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/controller/DuanXinSend.java @@ -1,6 +1,6 @@ -package com.bwie.ruoyi.controller; +package com.bwie.user.controller; -import com.bwie.ruoyi.service.TbUserService; +import com.bwie.user.service.TbUserService; import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.system.api.model.PhoneVo; import io.swagger.annotations.Api; diff --git a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/controller/TbMyroleController.java b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/controller/TbMyroleController.java new file mode 100644 index 00000000..d7d6e470 --- /dev/null +++ b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/controller/TbMyroleController.java @@ -0,0 +1,105 @@ +package com.bwie.user.controller; + +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.log.annotation.Log; +import com.ruoyi.common.log.enums.BusinessType; +import com.ruoyi.common.security.annotation.RequiresPermissions; +import com.bwie.user.domain.TbMyrole; +import com.bwie.user.service.ITbMyroleService; +import com.ruoyi.common.core.web.controller.BaseController; +import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.common.core.utils.poi.ExcelUtil; +import com.ruoyi.common.core.web.page.TableDataInfo; + +/** + * 角色Controller + * + * @author xs + * @date 2023-01-15 + */ +@RestController +@RequestMapping("/myrole") +public class TbMyroleController extends BaseController +{ + @Autowired + private ITbMyroleService tbMyroleService; + + /** + * 查询角色列表 + */ + @RequiresPermissions("myrole:myrole:list") + @GetMapping("/list") + public TableDataInfo list(TbMyrole tbMyrole) + { + startPage(); + List list = tbMyroleService.selectTbMyroleList(tbMyrole); + return getDataTable(list); + } + + /** + * 导出角色列表 + */ + @RequiresPermissions("myrole:myrole:export") + @Log(title = "角色", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, TbMyrole tbMyrole) + { + List list = tbMyroleService.selectTbMyroleList(tbMyrole); + ExcelUtil util = new ExcelUtil(TbMyrole.class); + util.exportExcel(response, list, "角色数据"); + } + + /** + * 获取角色详细信息 + */ + @RequiresPermissions("myrole:myrole:query") + @GetMapping(value = "/{roleId}") + public AjaxResult getInfo(@PathVariable("roleId") Long roleId) + { + return success(tbMyroleService.selectTbMyroleByRoleId(roleId)); + } + + /** + * 新增角色 + */ + @RequiresPermissions("myrole:myrole:add") + @Log(title = "角色", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody TbMyrole tbMyrole) + { + return toAjax(tbMyroleService.insertTbMyrole(tbMyrole)); + } + + /** + * 修改角色 + */ + @RequiresPermissions("myrole:myrole:edit") + @Log(title = "角色", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody TbMyrole tbMyrole) + { + return toAjax(tbMyroleService.updateTbMyrole(tbMyrole)); + } + + /** + * 删除角色 + */ + @RequiresPermissions("myrole:myrole:remove") + @Log(title = "角色", businessType = BusinessType.DELETE) + @DeleteMapping("/{roleIds}") + public AjaxResult remove(@PathVariable Long[] roleIds) + { + return toAjax(tbMyroleService.deleteTbMyroleByRoleIds(roleIds)); + } +} diff --git a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/controller/TbPermController.java b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/controller/TbPermController.java new file mode 100644 index 00000000..f24a7c67 --- /dev/null +++ b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/controller/TbPermController.java @@ -0,0 +1,105 @@ +package com.bwie.user.controller; + +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.log.annotation.Log; +import com.ruoyi.common.log.enums.BusinessType; +import com.ruoyi.common.security.annotation.RequiresPermissions; +import com.bwie.user.domain.TbPerm; +import com.bwie.user.service.ITbPermService; +import com.ruoyi.common.core.web.controller.BaseController; +import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.common.core.utils.poi.ExcelUtil; +import com.ruoyi.common.core.web.page.TableDataInfo; + +/** + * 权限Controller + * + * @author ruoyi + * @date 2023-01-15 + */ +@RestController +@RequestMapping("/perm") +public class TbPermController extends BaseController +{ + @Autowired + private ITbPermService tbPermService; + + /** + * 查询权限列表 + */ + @RequiresPermissions("perm:perm:list") + @GetMapping("/list") + public TableDataInfo list(TbPerm tbPerm) + { + startPage(); + List list = tbPermService.selectTbPermList(tbPerm); + return getDataTable(list); + } + + /** + * 导出权限列表 + */ + @RequiresPermissions("perm:perm:export") + @Log(title = "权限", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, TbPerm tbPerm) + { + List list = tbPermService.selectTbPermList(tbPerm); + ExcelUtil util = new ExcelUtil(TbPerm.class); + util.exportExcel(response, list, "权限数据"); + } + + /** + * 获取权限详细信息 + */ + @RequiresPermissions("perm:perm:query") + @GetMapping(value = "/{permId}") + public AjaxResult getInfo(@PathVariable("permId") Long permId) + { + return success(tbPermService.selectTbPermByPermId(permId)); + } + + /** + * 新增权限 + */ + @RequiresPermissions("perm:perm:add") + @Log(title = "权限", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody TbPerm tbPerm) + { + return toAjax(tbPermService.insertTbPerm(tbPerm)); + } + + /** + * 修改权限 + */ + @RequiresPermissions("perm:perm:edit") + @Log(title = "权限", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody TbPerm tbPerm) + { + return toAjax(tbPermService.updateTbPerm(tbPerm)); + } + + /** + * 删除权限 + */ + @RequiresPermissions("perm:perm:remove") + @Log(title = "权限", businessType = BusinessType.DELETE) + @DeleteMapping("/{permIds}") + public AjaxResult remove(@PathVariable Long[] permIds) + { + return toAjax(tbPermService.deleteTbPermByPermIds(permIds)); + } +} diff --git a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/controller/TbRolePermController.java b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/controller/TbRolePermController.java new file mode 100644 index 00000000..d4699d5e --- /dev/null +++ b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/controller/TbRolePermController.java @@ -0,0 +1,105 @@ +package com.bwie.user.controller; + +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.log.annotation.Log; +import com.ruoyi.common.log.enums.BusinessType; +import com.ruoyi.common.security.annotation.RequiresPermissions; +import com.bwie.user.domain.TbRolePerm; +import com.bwie.user.service.ITbRolePermService; +import com.ruoyi.common.core.web.controller.BaseController; +import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.common.core.utils.poi.ExcelUtil; +import com.ruoyi.common.core.web.page.TableDataInfo; + +/** + * 角色权限Controller + * + * @author xs + * @date 2023-01-15 + */ +@RestController +@RequestMapping("/roleperm") +public class TbRolePermController extends BaseController +{ + @Autowired + private ITbRolePermService tbRolePermService; + + /** + * 查询角色权限列表 + */ + @RequiresPermissions("roleperm:roleperm:list") + @GetMapping("/list") + public TableDataInfo list(TbRolePerm tbRolePerm) + { + startPage(); + List list = tbRolePermService.selectTbRolePermList(tbRolePerm); + return getDataTable(list); + } + + /** + * 导出角色权限列表 + */ + @RequiresPermissions("roleperm:roleperm:export") + @Log(title = "角色权限", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, TbRolePerm tbRolePerm) + { + List list = tbRolePermService.selectTbRolePermList(tbRolePerm); + ExcelUtil util = new ExcelUtil(TbRolePerm.class); + util.exportExcel(response, list, "角色权限数据"); + } + + /** + * 获取角色权限详细信息 + */ + @RequiresPermissions("roleperm:roleperm:query") + @GetMapping(value = "/{rolePermId}") + public AjaxResult getInfo(@PathVariable("rolePermId") Long rolePermId) + { + return success(tbRolePermService.selectTbRolePermByRolePermId(rolePermId)); + } + + /** + * 新增角色权限 + */ + @RequiresPermissions("roleperm:roleperm:add") + @Log(title = "角色权限", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody TbRolePerm tbRolePerm) + { + return toAjax(tbRolePermService.insertTbRolePerm(tbRolePerm)); + } + + /** + * 修改角色权限 + */ + @RequiresPermissions("roleperm:roleperm:edit") + @Log(title = "角色权限", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody TbRolePerm tbRolePerm) + { + return toAjax(tbRolePermService.updateTbRolePerm(tbRolePerm)); + } + + /** + * 删除角色权限 + */ + @RequiresPermissions("roleperm:roleperm:remove") + @Log(title = "角色权限", businessType = BusinessType.DELETE) + @DeleteMapping("/{rolePermIds}") + public AjaxResult remove(@PathVariable Long[] rolePermIds) + { + return toAjax(tbRolePermService.deleteTbRolePermByRolePermIds(rolePermIds)); + } +} diff --git a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/controller/TbUserRoleController.java b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/controller/TbUserRoleController.java new file mode 100644 index 00000000..3c317914 --- /dev/null +++ b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/controller/TbUserRoleController.java @@ -0,0 +1,105 @@ +package com.bwie.user.controller; + +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.log.annotation.Log; +import com.ruoyi.common.log.enums.BusinessType; +import com.ruoyi.common.security.annotation.RequiresPermissions; +import com.bwie.user.domain.TbUserRole; +import com.bwie.user.service.ITbUserRoleService; +import com.ruoyi.common.core.web.controller.BaseController; +import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.common.core.utils.poi.ExcelUtil; +import com.ruoyi.common.core.web.page.TableDataInfo; + +/** + * 用户类型Controller + * + * @author xs + * @date 2023-01-15 + */ +@RestController +@RequestMapping("/userrole") +public class TbUserRoleController extends BaseController +{ + @Autowired + private ITbUserRoleService tbUserRoleService; + + /** + * 查询用户类型列表 + */ + @RequiresPermissions("userrole:userrole:list") + @GetMapping("/list") + public TableDataInfo list(TbUserRole tbUserRole) + { + startPage(); + List list = tbUserRoleService.selectTbUserRoleList(tbUserRole); + return getDataTable(list); + } + + /** + * 导出用户类型列表 + */ + @RequiresPermissions("userrole:userrole:export") + @Log(title = "用户类型", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, TbUserRole tbUserRole) + { + List list = tbUserRoleService.selectTbUserRoleList(tbUserRole); + ExcelUtil util = new ExcelUtil(TbUserRole.class); + util.exportExcel(response, list, "用户类型数据"); + } + + /** + * 获取用户类型详细信息 + */ + @RequiresPermissions("userrole:userrole:query") + @GetMapping(value = "/{userRoleId}") + public AjaxResult getInfo(@PathVariable("userRoleId") Long userRoleId) + { + return success(tbUserRoleService.selectTbUserRoleByUserRoleId(userRoleId)); + } + + /** + * 新增用户类型 + */ + @RequiresPermissions("userrole:userrole:add") + @Log(title = "用户类型", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody TbUserRole tbUserRole) + { + return toAjax(tbUserRoleService.insertTbUserRole(tbUserRole)); + } + + /** + * 修改用户类型 + */ + @RequiresPermissions("userrole:userrole:edit") + @Log(title = "用户类型", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody TbUserRole tbUserRole) + { + return toAjax(tbUserRoleService.updateTbUserRole(tbUserRole)); + } + + /** + * 删除用户类型 + */ + @RequiresPermissions("userrole:userrole:remove") + @Log(title = "用户类型", businessType = BusinessType.DELETE) + @DeleteMapping("/{userRoleIds}") + public AjaxResult remove(@PathVariable Long[] userRoleIds) + { + return toAjax(tbUserRoleService.deleteTbUserRoleByUserRoleIds(userRoleIds)); + } +} diff --git a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/controller/UserController.java b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/controller/UserController.java similarity index 88% rename from ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/controller/UserController.java rename to ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/controller/UserController.java index 6d7f0282..1808605e 100644 --- a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/controller/UserController.java +++ b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/controller/UserController.java @@ -1,7 +1,6 @@ -package com.bwie.ruoyi.controller; +package com.bwie.user.controller; -import com.bwie.ruoyi.pojo.TbUser; -import com.bwie.ruoyi.service.TbUserService; +import com.bwie.user.service.TbUserService; import com.github.pagehelper.PageHelper; import com.ruoyi.common.core.web.controller.BaseController; import com.ruoyi.common.core.web.domain.AjaxResult; @@ -40,8 +39,8 @@ public class UserController extends BaseController { return tbUserServicet.deluser(idVo); } @PostMapping("adduser") - private AjaxResult adduser(@RequestBody TbUserVo tbUserVo){ - return tbUserServicet.adduser(tbUserVo); + private AjaxResult adduser(@RequestBody PhoneVo phoneVo){ + return tbUserServicet.adduser(phoneVo); } @PostMapping("updateuser") diff --git a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/domain/TbMyrole.java b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/domain/TbMyrole.java new file mode 100644 index 00000000..1925968d --- /dev/null +++ b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/domain/TbMyrole.java @@ -0,0 +1,67 @@ +package com.bwie.user.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.core.annotation.Excel; +import com.ruoyi.common.core.web.domain.BaseEntity; + +/** + * 角色对象 tb_myrole + * + * @author xs + * @date 2023-01-15 + */ +public class TbMyrole extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 角色id */ + private Long roleId; + + /** 角色名称 */ + @Excel(name = "角色名称") + private String roleName; + + /** 删除状态0：未删除1：已删除 */ + @Excel(name = "删除状态0：未删除1：已删除") + private Integer deleted; + + public void setRoleId(Long roleId) + { + this.roleId = roleId; + } + + public Long getRoleId() + { + return roleId; + } + public void setRoleName(String roleName) + { + this.roleName = roleName; + } + + public String getRoleName() + { + return roleName; + } + public void setDeleted(Integer deleted) + { + this.deleted = deleted; + } + + public Integer getDeleted() + { + return deleted; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("roleId", getRoleId()) + .append("roleName", getRoleName()) + .append("deleted", getDeleted()) + .append("createTime", getCreateTime()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/pojo/TbUser.java b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/domain/TbUser.java similarity index 94% rename from ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/pojo/TbUser.java rename to ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/domain/TbUser.java index 79d52f02..cfe62fef 100644 --- a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/pojo/TbUser.java +++ b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/domain/TbUser.java @@ -1,4 +1,4 @@ -package com.bwie.ruoyi.pojo; +package com.bwie.user.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -52,7 +52,7 @@ public class TbUser implements Serializable { /** * 用户性别（0男 1女 2未知） */ - private String sex; + private Integer sex; /** * 头像地址 @@ -72,12 +72,12 @@ public class TbUser implements Serializable { /** * 帐号状态（0正常 1停用） */ - private String status; + private Integer status; /** * 删除标志（0代表存在 2代表删除） */ - private String delFlag; + private Integer delFlag; /** * 最后登录IP @@ -128,7 +128,7 @@ public class TbUser implements Serializable { /** * 实名状态(0,未实名1已实名) */ - private String realnameState; + private Integer realnameState; /** * 信誉积分 diff --git a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/pojo/TbUserBankcard.java b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/domain/TbUserBankcard.java similarity index 98% rename from ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/pojo/TbUserBankcard.java rename to ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/domain/TbUserBankcard.java index 6d6af6c2..b8df6b64 100644 --- a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/pojo/TbUserBankcard.java +++ b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/domain/TbUserBankcard.java @@ -1,4 +1,4 @@ -package com.bwie.ruoyi.pojo; +package com.bwie.user.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/mapper/TbMyroleMapper.java b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/mapper/TbMyroleMapper.java new file mode 100644 index 00000000..24cabdf1 --- /dev/null +++ b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/mapper/TbMyroleMapper.java @@ -0,0 +1,61 @@ +package com.bwie.user.mapper; + +import java.util.List; +import com.bwie.user.domain.TbMyrole; + +/** + * 角色Mapper接口 + * + * @author xs + * @date 2023-01-15 + */ +public interface TbMyroleMapper +{ + /** + * 查询角色 + * + * @param roleId 角色主键 + * @return 角色 + */ + public TbMyrole selectTbMyroleByRoleId(Long roleId); + + /** + * 查询角色列表 + * + * @param tbMyrole 角色 + * @return 角色集合 + */ + public List selectTbMyroleList(TbMyrole tbMyrole); + + /** + * 新增角色 + * + * @param tbMyrole 角色 + * @return 结果 + */ + public int insertTbMyrole(TbMyrole tbMyrole); + + /** + * 修改角色 + * + * @param tbMyrole 角色 + * @return 结果 + */ + public int updateTbMyrole(TbMyrole tbMyrole); + + /** + * 删除角色 + * + * @param roleId 角色主键 + * @return 结果 + */ + public int deleteTbMyroleByRoleId(Long roleId); + + /** + * 批量删除角色 + * + * @param roleIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteTbMyroleByRoleIds(Long[] roleIds); +} diff --git a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/mapper/TbPermMapper.java b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/mapper/TbPermMapper.java new file mode 100644 index 00000000..a44c4157 --- /dev/null +++ b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/mapper/TbPermMapper.java @@ -0,0 +1,61 @@ +package com.bwie.user.mapper; + +import java.util.List; +import com.bwie.user.domain.TbPerm; + +/** + * 权限Mapper接口 + * + * @author ruoyi + * @date 2023-01-15 + */ +public interface TbPermMapper +{ + /** + * 查询权限 + * + * @param permId 权限主键 + * @return 权限 + */ + public TbPerm selectTbPermByPermId(Long permId); + + /** + * 查询权限列表 + * + * @param tbPerm 权限 + * @return 权限集合 + */ + public List selectTbPermList(TbPerm tbPerm); + + /** + * 新增权限 + * + * @param tbPerm 权限 + * @return 结果 + */ + public int insertTbPerm(TbPerm tbPerm); + + /** + * 修改权限 + * + * @param tbPerm 权限 + * @return 结果 + */ + public int updateTbPerm(TbPerm tbPerm); + + /** + * 删除权限 + * + * @param permId 权限主键 + * @return 结果 + */ + public int deleteTbPermByPermId(Long permId); + + /** + * 批量删除权限 + * + * @param permIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteTbPermByPermIds(Long[] permIds); +} diff --git a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/mapper/TbRolePermMapper.java b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/mapper/TbRolePermMapper.java new file mode 100644 index 00000000..fed0a1f6 --- /dev/null +++ b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/mapper/TbRolePermMapper.java @@ -0,0 +1,61 @@ +package com.bwie.user.mapper; + +import java.util.List; +import com.bwie.user.domain.TbRolePerm; + +/** + * 角色权限Mapper接口 + * + * @author xs + * @date 2023-01-15 + */ +public interface TbRolePermMapper +{ + /** + * 查询角色权限 + * + * @param rolePermId 角色权限主键 + * @return 角色权限 + */ + public TbRolePerm selectTbRolePermByRolePermId(Long rolePermId); + + /** + * 查询角色权限列表 + * + * @param tbRolePerm 角色权限 + * @return 角色权限集合 + */ + public List selectTbRolePermList(TbRolePerm tbRolePerm); + + /** + * 新增角色权限 + * + * @param tbRolePerm 角色权限 + * @return 结果 + */ + public int insertTbRolePerm(TbRolePerm tbRolePerm); + + /** + * 修改角色权限 + * + * @param tbRolePerm 角色权限 + * @return 结果 + */ + public int updateTbRolePerm(TbRolePerm tbRolePerm); + + /** + * 删除角色权限 + * + * @param rolePermId 角色权限主键 + * @return 结果 + */ + public int deleteTbRolePermByRolePermId(Long rolePermId); + + /** + * 批量删除角色权限 + * + * @param rolePermIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteTbRolePermByRolePermIds(Long[] rolePermIds); +} diff --git a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/mapper/TbUserMapper.java b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/mapper/TbUserMapper.java similarity index 81% rename from ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/mapper/TbUserMapper.java rename to ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/mapper/TbUserMapper.java index b2b89529..65def1ec 100644 --- a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/mapper/TbUserMapper.java +++ b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/mapper/TbUserMapper.java @@ -1,6 +1,6 @@ -package com.bwie.ruoyi.mapper; +package com.bwie.user.mapper; -import com.bwie.ruoyi.pojo.TbUser; +import com.bwie.user.domain.TbUser; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/mapper/TbUserRoleMapper.java b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/mapper/TbUserRoleMapper.java new file mode 100644 index 00000000..db8accad --- /dev/null +++ b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/mapper/TbUserRoleMapper.java @@ -0,0 +1,61 @@ +package com.bwie.user.mapper; + +import java.util.List; +import com.bwie.user.domain.TbUserRole; + +/** + * 用户类型Mapper接口 + * + * @author xs + * @date 2023-01-15 + */ +public interface TbUserRoleMapper +{ + /** + * 查询用户类型 + * + * @param userRoleId 用户类型主键 + * @return 用户类型 + */ + public TbUserRole selectTbUserRoleByUserRoleId(Long userRoleId); + + /** + * 查询用户类型列表 + * + * @param tbUserRole 用户类型 + * @return 用户类型集合 + */ + public List selectTbUserRoleList(TbUserRole tbUserRole); + + /** + * 新增用户类型 + * + * @param tbUserRole 用户类型 + * @return 结果 + */ + public int insertTbUserRole(TbUserRole tbUserRole); + + /** + * 修改用户类型 + * + * @param tbUserRole 用户类型 + * @return 结果 + */ + public int updateTbUserRole(TbUserRole tbUserRole); + + /** + * 删除用户类型 + * + * @param userRoleId 用户类型主键 + * @return 结果 + */ + public int deleteTbUserRoleByUserRoleId(Long userRoleId); + + /** + * 批量删除用户类型 + * + * @param userRoleIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteTbUserRoleByUserRoleIds(Long[] userRoleIds); +} diff --git a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/service/ITbMyroleService.java b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/service/ITbMyroleService.java new file mode 100644 index 00000000..698bf80a --- /dev/null +++ b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/service/ITbMyroleService.java @@ -0,0 +1,61 @@ +package com.bwie.user.service; + +import java.util.List; +import com.bwie.user.domain.TbMyrole; + +/** + * 角色Service接口 + * + * @author xs + * @date 2023-01-15 + */ +public interface ITbMyroleService +{ + /** + * 查询角色 + * + * @param roleId 角色主键 + * @return 角色 + */ + public TbMyrole selectTbMyroleByRoleId(Long roleId); + + /** + * 查询角色列表 + * + * @param tbMyrole 角色 + * @return 角色集合 + */ + public List selectTbMyroleList(TbMyrole tbMyrole); + + /** + * 新增角色 + * + * @param tbMyrole 角色 + * @return 结果 + */ + public int insertTbMyrole(TbMyrole tbMyrole); + + /** + * 修改角色 + * + * @param tbMyrole 角色 + * @return 结果 + */ + public int updateTbMyrole(TbMyrole tbMyrole); + + /** + * 批量删除角色 + * + * @param roleIds 需要删除的角色主键集合 + * @return 结果 + */ + public int deleteTbMyroleByRoleIds(Long[] roleIds); + + /** + * 删除角色信息 + * + * @param roleId 角色主键 + * @return 结果 + */ + public int deleteTbMyroleByRoleId(Long roleId); +} diff --git a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/service/ITbPermService.java b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/service/ITbPermService.java new file mode 100644 index 00000000..72c8d968 --- /dev/null +++ b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/service/ITbPermService.java @@ -0,0 +1,61 @@ +package com.bwie.user.service; + +import java.util.List; +import com.bwie.user.domain.TbPerm; + +/** + * 权限Service接口 + * + * @author ruoyi + * @date 2023-01-15 + */ +public interface ITbPermService +{ + /** + * 查询权限 + * + * @param permId 权限主键 + * @return 权限 + */ + public TbPerm selectTbPermByPermId(Long permId); + + /** + * 查询权限列表 + * + * @param tbPerm 权限 + * @return 权限集合 + */ + public List selectTbPermList(TbPerm tbPerm); + + /** + * 新增权限 + * + * @param tbPerm 权限 + * @return 结果 + */ + public int insertTbPerm(TbPerm tbPerm); + + /** + * 修改权限 + * + * @param tbPerm 权限 + * @return 结果 + */ + public int updateTbPerm(TbPerm tbPerm); + + /** + * 批量删除权限 + * + * @param permIds 需要删除的权限主键集合 + * @return 结果 + */ + public int deleteTbPermByPermIds(Long[] permIds); + + /** + * 删除权限信息 + * + * @param permId 权限主键 + * @return 结果 + */ + public int deleteTbPermByPermId(Long permId); +} diff --git a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/service/ITbRolePermService.java b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/service/ITbRolePermService.java new file mode 100644 index 00000000..247df331 --- /dev/null +++ b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/service/ITbRolePermService.java @@ -0,0 +1,61 @@ +package com.bwie.user.service; + +import java.util.List; +import com.bwie.user.domain.TbRolePerm; + +/** + * 角色权限Service接口 + * + * @author xs + * @date 2023-01-15 + */ +public interface ITbRolePermService +{ + /** + * 查询角色权限 + * + * @param rolePermId 角色权限主键 + * @return 角色权限 + */ + public TbRolePerm selectTbRolePermByRolePermId(Long rolePermId); + + /** + * 查询角色权限列表 + * + * @param tbRolePerm 角色权限 + * @return 角色权限集合 + */ + public List selectTbRolePermList(TbRolePerm tbRolePerm); + + /** + * 新增角色权限 + * + * @param tbRolePerm 角色权限 + * @return 结果 + */ + public int insertTbRolePerm(TbRolePerm tbRolePerm); + + /** + * 修改角色权限 + * + * @param tbRolePerm 角色权限 + * @return 结果 + */ + public int updateTbRolePerm(TbRolePerm tbRolePerm); + + /** + * 批量删除角色权限 + * + * @param rolePermIds 需要删除的角色权限主键集合 + * @return 结果 + */ + public int deleteTbRolePermByRolePermIds(Long[] rolePermIds); + + /** + * 删除角色权限信息 + * + * @param rolePermId 角色权限主键 + * @return 结果 + */ + public int deleteTbRolePermByRolePermId(Long rolePermId); +} diff --git a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/service/ITbUserRoleService.java b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/service/ITbUserRoleService.java new file mode 100644 index 00000000..c2b1d18e --- /dev/null +++ b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/service/ITbUserRoleService.java @@ -0,0 +1,61 @@ +package com.bwie.user.service; + +import java.util.List; +import com.bwie.user.domain.TbUserRole; + +/** + * 用户类型Service接口 + * + * @author xs + * @date 2023-01-15 + */ +public interface ITbUserRoleService +{ + /** + * 查询用户类型 + * + * @param userRoleId 用户类型主键 + * @return 用户类型 + */ + public TbUserRole selectTbUserRoleByUserRoleId(Long userRoleId); + + /** + * 查询用户类型列表 + * + * @param tbUserRole 用户类型 + * @return 用户类型集合 + */ + public List selectTbUserRoleList(TbUserRole tbUserRole); + + /** + * 新增用户类型 + * + * @param tbUserRole 用户类型 + * @return 结果 + */ + public int insertTbUserRole(TbUserRole tbUserRole); + + /** + * 修改用户类型 + * + * @param tbUserRole 用户类型 + * @return 结果 + */ + public int updateTbUserRole(TbUserRole tbUserRole); + + /** + * 批量删除用户类型 + * + * @param userRoleIds 需要删除的用户类型主键集合 + * @return 结果 + */ + public int deleteTbUserRoleByUserRoleIds(Long[] userRoleIds); + + /** + * 删除用户类型信息 + * + * @param userRoleId 用户类型主键 + * @return 结果 + */ + public int deleteTbUserRoleByUserRoleId(Long userRoleId); +} diff --git a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/service/TbUserService.java b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/service/TbUserService.java similarity index 85% rename from ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/service/TbUserService.java rename to ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/service/TbUserService.java index 555faabe..bd9dbb9a 100644 --- a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/service/TbUserService.java +++ b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/service/TbUserService.java @@ -1,6 +1,6 @@ -package com.bwie.ruoyi.service; +package com.bwie.user.service; -import com.bwie.ruoyi.pojo.TbUser; +import com.bwie.user.domain.TbUser; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.system.api.model.*; @@ -18,7 +18,7 @@ public interface TbUserService extends IService { AjaxResult deluser(IdVo idVo); - AjaxResult adduser(TbUserVo tbUserVo); + AjaxResult adduser(PhoneVo phoneVo); AjaxResult phoneSend(PhoneVo phoneVo); diff --git a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/service/impl/TbMyroleServiceImpl.java b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/service/impl/TbMyroleServiceImpl.java new file mode 100644 index 00000000..1e19ea9a --- /dev/null +++ b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/service/impl/TbMyroleServiceImpl.java @@ -0,0 +1,96 @@ +package com.bwie.user.service.impl; + +import java.util.List; +import com.ruoyi.common.core.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.bwie.user.mapper.TbMyroleMapper; +import com.bwie.user.domain.TbMyrole; +import com.bwie.user.service.ITbMyroleService; + +/** + * 角色Service业务层处理 + * + * @author xs + * @date 2023-01-15 + */ +@Service +public class TbMyroleServiceImpl implements ITbMyroleService +{ + @Autowired + private TbMyroleMapper tbMyroleMapper; + + /** + * 查询角色 + * + * @param roleId 角色主键 + * @return 角色 + */ + @Override + public TbMyrole selectTbMyroleByRoleId(Long roleId) + { + return tbMyroleMapper.selectTbMyroleByRoleId(roleId); + } + + /** + * 查询角色列表 + * + * @param tbMyrole 角色 + * @return 角色 + */ + @Override + public List selectTbMyroleList(TbMyrole tbMyrole) + { + return tbMyroleMapper.selectTbMyroleList(tbMyrole); + } + + /** + * 新增角色 + * + * @param tbMyrole 角色 + * @return 结果 + */ + @Override + public int insertTbMyrole(TbMyrole tbMyrole) + { + tbMyrole.setCreateTime(DateUtils.getNowDate()); + return tbMyroleMapper.insertTbMyrole(tbMyrole); + } + + /** + * 修改角色 + * + * @param tbMyrole 角色 + * @return 结果 + */ + @Override + public int updateTbMyrole(TbMyrole tbMyrole) + { + tbMyrole.setUpdateTime(DateUtils.getNowDate()); + return tbMyroleMapper.updateTbMyrole(tbMyrole); + } + + /** + * 批量删除角色 + * + * @param roleIds 需要删除的角色主键 + * @return 结果 + */ + @Override + public int deleteTbMyroleByRoleIds(Long[] roleIds) + { + return tbMyroleMapper.deleteTbMyroleByRoleIds(roleIds); + } + + /** + * 删除角色信息 + * + * @param roleId 角色主键 + * @return 结果 + */ + @Override + public int deleteTbMyroleByRoleId(Long roleId) + { + return tbMyroleMapper.deleteTbMyroleByRoleId(roleId); + } +} diff --git a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/service/impl/TbPermServiceImpl.java b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/service/impl/TbPermServiceImpl.java new file mode 100644 index 00000000..66dd3592 --- /dev/null +++ b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/service/impl/TbPermServiceImpl.java @@ -0,0 +1,96 @@ +package com.bwie.user.service.impl; + +import java.util.List; +import com.ruoyi.common.core.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.bwie.user.mapper.TbPermMapper; +import com.bwie.user.domain.TbPerm; +import com.bwie.user.service.ITbPermService; + +/** + * 权限Service业务层处理 + * + * @author ruoyi + * @date 2023-01-15 + */ +@Service +public class TbPermServiceImpl implements ITbPermService +{ + @Autowired + private TbPermMapper tbPermMapper; + + /** + * 查询权限 + * + * @param permId 权限主键 + * @return 权限 + */ + @Override + public TbPerm selectTbPermByPermId(Long permId) + { + return tbPermMapper.selectTbPermByPermId(permId); + } + + /** + * 查询权限列表 + * + * @param tbPerm 权限 + * @return 权限 + */ + @Override + public List selectTbPermList(TbPerm tbPerm) + { + return tbPermMapper.selectTbPermList(tbPerm); + } + + /** + * 新增权限 + * + * @param tbPerm 权限 + * @return 结果 + */ + @Override + public int insertTbPerm(TbPerm tbPerm) + { + tbPerm.setCreateTime(DateUtils.getNowDate()); + return tbPermMapper.insertTbPerm(tbPerm); + } + + /** + * 修改权限 + * + * @param tbPerm 权限 + * @return 结果 + */ + @Override + public int updateTbPerm(TbPerm tbPerm) + { + tbPerm.setUpdateTime(DateUtils.getNowDate()); + return tbPermMapper.updateTbPerm(tbPerm); + } + + /** + * 批量删除权限 + * + * @param permIds 需要删除的权限主键 + * @return 结果 + */ + @Override + public int deleteTbPermByPermIds(Long[] permIds) + { + return tbPermMapper.deleteTbPermByPermIds(permIds); + } + + /** + * 删除权限信息 + * + * @param permId 权限主键 + * @return 结果 + */ + @Override + public int deleteTbPermByPermId(Long permId) + { + return tbPermMapper.deleteTbPermByPermId(permId); + } +} diff --git a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/service/impl/TbRolePermServiceImpl.java b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/service/impl/TbRolePermServiceImpl.java new file mode 100644 index 00000000..bf150b49 --- /dev/null +++ b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/service/impl/TbRolePermServiceImpl.java @@ -0,0 +1,96 @@ +package com.bwie.user.service.impl; + +import java.util.List; +import com.ruoyi.common.core.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.bwie.user.mapper.TbRolePermMapper; +import com.bwie.user.domain.TbRolePerm; +import com.bwie.user.service.ITbRolePermService; + +/** + * 角色权限Service业务层处理 + * + * @author xs + * @date 2023-01-15 + */ +@Service +public class TbRolePermServiceImpl implements ITbRolePermService +{ + @Autowired + private TbRolePermMapper tbRolePermMapper; + + /** + * 查询角色权限 + * + * @param rolePermId 角色权限主键 + * @return 角色权限 + */ + @Override + public TbRolePerm selectTbRolePermByRolePermId(Long rolePermId) + { + return tbRolePermMapper.selectTbRolePermByRolePermId(rolePermId); + } + + /** + * 查询角色权限列表 + * + * @param tbRolePerm 角色权限 + * @return 角色权限 + */ + @Override + public List selectTbRolePermList(TbRolePerm tbRolePerm) + { + return tbRolePermMapper.selectTbRolePermList(tbRolePerm); + } + + /** + * 新增角色权限 + * + * @param tbRolePerm 角色权限 + * @return 结果 + */ + @Override + public int insertTbRolePerm(TbRolePerm tbRolePerm) + { + tbRolePerm.setCreateTime(DateUtils.getNowDate()); + return tbRolePermMapper.insertTbRolePerm(tbRolePerm); + } + + /** + * 修改角色权限 + * + * @param tbRolePerm 角色权限 + * @return 结果 + */ + @Override + public int updateTbRolePerm(TbRolePerm tbRolePerm) + { + tbRolePerm.setUpdateTime(DateUtils.getNowDate()); + return tbRolePermMapper.updateTbRolePerm(tbRolePerm); + } + + /** + * 批量删除角色权限 + * + * @param rolePermIds 需要删除的角色权限主键 + * @return 结果 + */ + @Override + public int deleteTbRolePermByRolePermIds(Long[] rolePermIds) + { + return tbRolePermMapper.deleteTbRolePermByRolePermIds(rolePermIds); + } + + /** + * 删除角色权限信息 + * + * @param rolePermId 角色权限主键 + * @return 结果 + */ + @Override + public int deleteTbRolePermByRolePermId(Long rolePermId) + { + return tbRolePermMapper.deleteTbRolePermByRolePermId(rolePermId); + } +} diff --git a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/service/impl/TbUserRoleServiceImpl.java b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/service/impl/TbUserRoleServiceImpl.java new file mode 100644 index 00000000..d86b0a15 --- /dev/null +++ b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/service/impl/TbUserRoleServiceImpl.java @@ -0,0 +1,96 @@ +package com.bwie.user.service.impl; + +import java.util.List; +import com.ruoyi.common.core.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.bwie.user.mapper.TbUserRoleMapper; +import com.bwie.user.domain.TbUserRole; +import com.bwie.user.service.ITbUserRoleService; + +/** + * 用户类型Service业务层处理 + * + * @author xs + * @date 2023-01-15 + */ +@Service +public class TbUserRoleServiceImpl implements ITbUserRoleService +{ + @Autowired + private TbUserRoleMapper tbUserRoleMapper; + + /** + * 查询用户类型 + * + * @param userRoleId 用户类型主键 + * @return 用户类型 + */ + @Override + public TbUserRole selectTbUserRoleByUserRoleId(Long userRoleId) + { + return tbUserRoleMapper.selectTbUserRoleByUserRoleId(userRoleId); + } + + /** + * 查询用户类型列表 + * + * @param tbUserRole 用户类型 + * @return 用户类型 + */ + @Override + public List selectTbUserRoleList(TbUserRole tbUserRole) + { + return tbUserRoleMapper.selectTbUserRoleList(tbUserRole); + } + + /** + * 新增用户类型 + * + * @param tbUserRole 用户类型 + * @return 结果 + */ + @Override + public int insertTbUserRole(TbUserRole tbUserRole) + { + tbUserRole.setCreateTime(DateUtils.getNowDate()); + return tbUserRoleMapper.insertTbUserRole(tbUserRole); + } + + /** + * 修改用户类型 + * + * @param tbUserRole 用户类型 + * @return 结果 + */ + @Override + public int updateTbUserRole(TbUserRole tbUserRole) + { + tbUserRole.setUpdateTime(DateUtils.getNowDate()); + return tbUserRoleMapper.updateTbUserRole(tbUserRole); + } + + /** + * 批量删除用户类型 + * + * @param userRoleIds 需要删除的用户类型主键 + * @return 结果 + */ + @Override + public int deleteTbUserRoleByUserRoleIds(Long[] userRoleIds) + { + return tbUserRoleMapper.deleteTbUserRoleByUserRoleIds(userRoleIds); + } + + /** + * 删除用户类型信息 + * + * @param userRoleId 用户类型主键 + * @return 结果 + */ + @Override + public int deleteTbUserRoleByUserRoleId(Long userRoleId) + { + return tbUserRoleMapper.deleteTbUserRoleByUserRoleId(userRoleId); + } +} diff --git a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/service/impl/TbUserServiceImpl.java b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/service/impl/TbUserServiceImpl.java similarity index 74% rename from ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/service/impl/TbUserServiceImpl.java rename to ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/service/impl/TbUserServiceImpl.java index 7ed4eb6e..c043324b 100644 --- a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/service/impl/TbUserServiceImpl.java +++ b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/service/impl/TbUserServiceImpl.java @@ -1,16 +1,15 @@ -package com.bwie.ruoyi.service.impl; +package com.bwie.user.service.impl; import cn.hutool.core.util.RandomUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.bwie.ruoyi.pojo.TbUser; -import com.bwie.ruoyi.service.TbUserService; -import com.bwie.ruoyi.mapper.TbUserMapper; -import com.bwie.ruoyi.utils.DuanxinUtils; -import com.bwie.ruoyi.utils.TokenUtils; +import com.bwie.user.domain.TbUser; +import com.bwie.user.service.TbUserService; +import com.bwie.user.mapper.TbUserMapper; +import com.bwie.user.utils.DuanxinUtils; +import com.bwie.user.utils.TokenUtils; import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.system.api.model.*; -import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.BeanUtils; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.security.crypto.bcrypt.BCrypt; @@ -51,24 +50,21 @@ public class TbUserServiceImpl extends ServiceImpl } @Override - public AjaxResult adduser(TbUserVo tbUserVo) { + public AjaxResult adduser(PhoneVo phoneVo) { LambdaQueryWrapper wrapper=new LambdaQueryWrapper<>(); - wrapper.eq(TbUser::getPhonenumber,tbUserVo.getPhonenumber()); - //判断手机号 - if(tbUserMapper.selectOne(wrapper)!=null){ - return AjaxResult.error("手机号已经注册请检查手机号"); + wrapper.eq(TbUser::getPhonenumber,phoneVo.getPhone()); + TbUser tbUser1 = tbUserMapper.selectOne(wrapper); + if(tbUser1!=null){ + return AjaxResult.error("手机号已被注册"); } - //判断用户的昵称 - LambdaQueryWrapper wrapper1=new LambdaQueryWrapper<>(); - wrapper1.eq(TbUser::getNickName,tbUserVo.getNickName() ); - if(tbUserMapper.selectOne(wrapper1)!=null){ - return AjaxResult.error("用户昵称已经被注册请换一个"); + Object o = redisTemplate.opsForValue().get(phoneVo.getPhone()); + if(!phoneVo.getCode().equals(o)){ + return AjaxResult.error("验证码不正确"); } - //加密密码 - String hashpw = BCrypt.hashpw(tbUserVo.getPassword(), BCrypt.gensalt()); TbUser tbUser = new TbUser(); - BeanUtils.copyProperties(tbUserVo, tbUser); - //更换加密密码 + tbUser.setNickName("tbuser_"+RandomUtil.randomNumbers(4)); + tbUser.setPhonenumber(phoneVo.getPhone()); + String hashpw = BCrypt.hashpw("123456", BCrypt.gensalt()); tbUser.setPassword(hashpw); tbUserMapper.insert(tbUser); return AjaxResult.success(tbUser); @@ -118,20 +114,15 @@ public class TbUserServiceImpl extends ServiceImpl @Override public AjaxResult loginuser(LoginVo loginVo) { - //第一步判断账号 LambdaQueryWrapper wrapper=new LambdaQueryWrapper<>(); - wrapper.eq(TbUser::getNickName,loginVo.getNickName()); + wrapper.eq(TbUser::getPhonenumber,loginVo.getPhone()); TbUser tbUser = tbUserMapper.selectOne(wrapper); if(tbUser==null){ - return AjaxResult.error("账号不存在"); - } - boolean checkpw = BCrypt.checkpw(loginVo.getUserPass(), tbUser.getPassword()); - if(!checkpw){ - return AjaxResult.error("密码不正确"); + return AjaxResult.error("电话号没有被注册请先注册"); } - //判断code - String o =(String) redisTemplate.opsForValue().get(loginVo.getPhone()); - if(!loginVo.getCode().equals(o)){ + //在进行判断code + String code =(String) redisTemplate.opsForValue().get(loginVo.getPhone()); + if(!loginVo.getCode().equals(code)) { return AjaxResult.error("验证码不正确"); } //生成token diff --git a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/utils/DuanxinUtils.java b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/utils/DuanxinUtils.java similarity index 98% rename from ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/utils/DuanxinUtils.java rename to ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/utils/DuanxinUtils.java index 3233885b..924bc21d 100644 --- a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/utils/DuanxinUtils.java +++ b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/utils/DuanxinUtils.java @@ -1,4 +1,4 @@ -package com.bwie.ruoyi.utils; +package com.bwie.user.utils; import org.apache.http.HttpResponse; diff --git a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/utils/HttpUtils.java b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/utils/HttpUtils.java similarity index 99% rename from ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/utils/HttpUtils.java rename to ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/utils/HttpUtils.java index 1b9bd7db..0a353688 100644 --- a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/utils/HttpUtils.java +++ b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/utils/HttpUtils.java @@ -1,4 +1,4 @@ -package com.bwie.ruoyi.utils; +package com.bwie.user.utils; import org.apache.commons.lang.StringUtils; import org.apache.http.HttpResponse; diff --git a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/utils/TokenUtils.java b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/utils/TokenUtils.java similarity index 99% rename from ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/utils/TokenUtils.java rename to ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/utils/TokenUtils.java index 5b43a79f..414ebdac 100644 --- a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/utils/TokenUtils.java +++ b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/utils/TokenUtils.java @@ -1,4 +1,4 @@ -package com.bwie.ruoyi.utils; +package com.bwie.user.utils; import io.jsonwebtoken.*; diff --git a/ruoyi-modules/ruoyi-user/src/main/resources/mapper/TbPermMapper.xml b/ruoyi-modules/ruoyi-user/src/main/resources/mapper/TbPermMapper.xml deleted file mode 100644 index 5a3a0096..00000000 --- a/ruoyi-modules/ruoyi-user/src/main/resources/mapper/TbPermMapper.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - perm_id,perm_name,perm_code, - deleted,create_time,update_time - - diff --git a/ruoyi-modules/ruoyi-user/src/main/resources/mapper/TbRoleMapper.xml b/ruoyi-modules/ruoyi-user/src/main/resources/mapper/TbRoleMapper.xml deleted file mode 100644 index b59b2c7f..00000000 --- a/ruoyi-modules/ruoyi-user/src/main/resources/mapper/TbRoleMapper.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - role_id,role_name,deleted, - create_time,update_time - - diff --git a/ruoyi-modules/ruoyi-user/src/main/resources/mapper/TbRolePermMapper.xml b/ruoyi-modules/ruoyi-user/src/main/resources/mapper/TbRolePermMapper.xml deleted file mode 100644 index 2a5d1614..00000000 --- a/ruoyi-modules/ruoyi-user/src/main/resources/mapper/TbRolePermMapper.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - role_perm_id,role_id,perm_id, - deleted,create_time,update_time - - diff --git a/ruoyi-modules/ruoyi-user/src/main/resources/mapper/TbUserBankcardMapper.xml b/ruoyi-modules/ruoyi-user/src/main/resources/mapper/TbUserBankcardMapper.xml deleted file mode 100644 index d63cb616..00000000 --- a/ruoyi-modules/ruoyi-user/src/main/resources/mapper/TbUserBankcardMapper.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - bankcard_id,brankcard_name,user_id, - bankcard_money,create_by,create_time, - del_flag,update_by,update_time - - diff --git a/ruoyi-modules/ruoyi-user/src/main/resources/mapper/TbUserMapper.xml b/ruoyi-modules/ruoyi-user/src/main/resources/mapper/TbUserMapper.xml index c7ac2290..1747a718 100644 --- a/ruoyi-modules/ruoyi-user/src/main/resources/mapper/TbUserMapper.xml +++ b/ruoyi-modules/ruoyi-user/src/main/resources/mapper/TbUserMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/ruoyi-modules/ruoyi-user/src/main/resources/mapper/TbUserRoleMapper.xml b/ruoyi-modules/ruoyi-user/src/main/resources/mapper/TbUserRoleMapper.xml deleted file mode 100644 index fd2a8128..00000000 --- a/ruoyi-modules/ruoyi-user/src/main/resources/mapper/TbUserRoleMapper.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - user_role_id,user_role_name,create_by, - create_time,update_by,update_time, - role_function - - diff --git a/ruoyi-modules/ruoyi-user/src/main/resources/mapper/myrole/TbMyroleMapper.xml b/ruoyi-modules/ruoyi-user/src/main/resources/mapper/myrole/TbMyroleMapper.xml new file mode 100644 index 00000000..6e552600 --- /dev/null +++ b/ruoyi-modules/ruoyi-user/src/main/resources/mapper/myrole/TbMyroleMapper.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + select role_id, role_name, deleted, create_time, update_time from tb_myrole + + + + + + + + insert into tb_myrole + + role_name, + deleted, + create_time, + update_time, + + + #{roleName}, + #{deleted}, + #{createTime}, + #{updateTime}, + + + + + update tb_myrole + + role_name = #{roleName}, + deleted = #{deleted}, + create_time = #{createTime}, + update_time = #{updateTime}, + + where role_id = #{roleId} + + + + delete from tb_myrole where role_id = #{roleId} + + + + delete from tb_myrole where role_id in + + #{roleId} + + + \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-user/src/main/resources/mapper/perm/TbPermMapper.xml b/ruoyi-modules/ruoyi-user/src/main/resources/mapper/perm/TbPermMapper.xml new file mode 100644 index 00000000..76b1725b --- /dev/null +++ b/ruoyi-modules/ruoyi-user/src/main/resources/mapper/perm/TbPermMapper.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + select perm_id, perm_name, perm_code, deleted, create_time, update_time from tb_perm + + + + + + + + insert into tb_perm + + perm_name, + perm_code, + deleted, + create_time, + update_time, + + + #{permName}, + #{permCode}, + #{deleted}, + #{createTime}, + #{updateTime}, + + + + + update tb_perm + + perm_name = #{permName}, + perm_code = #{permCode}, + deleted = #{deleted}, + create_time = #{createTime}, + update_time = #{updateTime}, + + where perm_id = #{permId} + + + + delete from tb_perm where perm_id = #{permId} + + + + delete from tb_perm where perm_id in + + #{permId} + + + \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-user/src/main/resources/mapper/roleperm/TbRolePermMapper.xml b/ruoyi-modules/ruoyi-user/src/main/resources/mapper/roleperm/TbRolePermMapper.xml new file mode 100644 index 00000000..50ea16b0 --- /dev/null +++ b/ruoyi-modules/ruoyi-user/src/main/resources/mapper/roleperm/TbRolePermMapper.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + select role_perm_id, role_id, perm_id, deleted, create_time, update_time from tb_role_perm + + + + + + + + insert into tb_role_perm + + role_id, + perm_id, + deleted, + create_time, + update_time, + + + #{roleId}, + #{permId}, + #{deleted}, + #{createTime}, + #{updateTime}, + + + + + update tb_role_perm + + role_id = #{roleId}, + perm_id = #{permId}, + deleted = #{deleted}, + create_time = #{createTime}, + update_time = #{updateTime}, + + where role_perm_id = #{rolePermId} + + + + delete from tb_role_perm where role_perm_id = #{rolePermId} + + + + delete from tb_role_perm where role_perm_id in + + #{rolePermId} + + + \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-user/src/main/resources/mapper/userrole/TbUserRoleMapper.xml b/ruoyi-modules/ruoyi-user/src/main/resources/mapper/userrole/TbUserRoleMapper.xml new file mode 100644 index 00000000..0b09a677 --- /dev/null +++ b/ruoyi-modules/ruoyi-user/src/main/resources/mapper/userrole/TbUserRoleMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + select user_role_id, user_role_name, create_by, create_time, update_by, update_time, role_function from tb_user_role + + + + + + + + insert into tb_user_role + + user_role_name, + create_by, + create_time, + update_by, + update_time, + role_function, + + + #{userRoleName}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{roleFunction}, + + + + + update tb_user_role + + user_role_name = #{userRoleName}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + role_function = #{roleFunction}, + + where user_role_id = #{userRoleId} + + + + delete from tb_user_role where user_role_id = #{userRoleId} + + + + delete from tb_user_role where user_role_id in + + #{userRoleId} + + + \ No newline at end of file