Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 7b00c2ad89 | |||
| d9aa77368b |
@@ -2,8 +2,6 @@ kind: pipeline
|
||||
type: docker
|
||||
name: fateverse
|
||||
|
||||
|
||||
|
||||
steps:
|
||||
- name: build-jar # 流水线名称
|
||||
image: maven:3.8.5-openjdk-11 # 定义创建容器的Docker镜像,maven:3.8.5-openjdk-8用于对java进行打包使用
|
||||
@@ -88,6 +86,3 @@ trigger:
|
||||
- custom-query-biz
|
||||
- sentinel-dashboard
|
||||
- workflow
|
||||
|
||||
event:
|
||||
- push
|
||||
@@ -2,7 +2,7 @@ package cn.fateverse.admin.dto;
|
||||
|
||||
import cn.fateverse.admin.entity.Config;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotNull;
|
||||
@@ -20,41 +20,41 @@ public class ConfigDto {
|
||||
/**
|
||||
* 参数主键
|
||||
*/
|
||||
@Schema(description = "参数主键")
|
||||
@ApiModelProperty("参数主键")
|
||||
private Integer configId;
|
||||
|
||||
/**
|
||||
* 参数名称
|
||||
*/
|
||||
@NotNull(message = "参数名称不能为空!")
|
||||
@Schema(description = "参数名称")
|
||||
@ApiModelProperty("参数名称")
|
||||
private String configName;
|
||||
|
||||
/**
|
||||
* 参数键名
|
||||
*/
|
||||
@NotNull(message = "参数键名不能为空!")
|
||||
@Schema(description = "参数键名")
|
||||
@ApiModelProperty("参数键名")
|
||||
private String configKey;
|
||||
|
||||
/**
|
||||
* 参数键值
|
||||
*/
|
||||
@NotNull(message = "参数键值不能为空!")
|
||||
@Schema(description = "参数键值")
|
||||
@ApiModelProperty("参数键值")
|
||||
private String configValue;
|
||||
|
||||
/**
|
||||
* 系统内置（1是 0否）
|
||||
*/
|
||||
@NotNull(message = "是否系统内置不能为空!")
|
||||
@Schema(description = "系统内置（1是 0否）")
|
||||
@ApiModelProperty("系统内置（1是 0否）")
|
||||
private Integer configType;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@Schema(description = "备注")
|
||||
@ApiModelProperty("备注")
|
||||
private String remark;
|
||||
|
||||
public Config toConfig() {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package cn.fateverse.admin.dto;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotNull;
|
||||
@@ -20,51 +20,51 @@ public class DictDataDto {
|
||||
/**
|
||||
* 字典排序
|
||||
*/
|
||||
@Schema(description = "字典排序")
|
||||
@ApiModelProperty("字典排序")
|
||||
@NotNull(message = "状态不能为空!")
|
||||
private Integer dictSort;
|
||||
/**
|
||||
* 字典标签
|
||||
*/
|
||||
@Schema(description = "字典标签")
|
||||
@ApiModelProperty("字典标签")
|
||||
@NotNull(message = "字典标签不能为空!")
|
||||
private String dictLabel;
|
||||
/**
|
||||
* 字典键值
|
||||
*/
|
||||
@Schema(description = "字典键值")
|
||||
@ApiModelProperty("字典键值")
|
||||
@NotNull(message = "字典键值不能为空!")
|
||||
private String dictValue;
|
||||
/**
|
||||
* 字典类型
|
||||
*/
|
||||
@Schema(description = "字典类型")
|
||||
@ApiModelProperty("字典类型")
|
||||
@NotNull(message = "字典类型不能为空!")
|
||||
private String dictType;
|
||||
/**
|
||||
* 样式属性（其他样式扩展）
|
||||
*/
|
||||
@Schema(description = "样式属性（其他样式扩展）")
|
||||
@ApiModelProperty("样式属性（其他样式扩展）")
|
||||
private Boolean isType;
|
||||
/**
|
||||
* 表格回显样式
|
||||
*/
|
||||
@Schema(description = "表格回显样式")
|
||||
@ApiModelProperty("表格回显样式")
|
||||
private String listClass;
|
||||
/**
|
||||
* 字典显示主题(ui框架时)or文字颜色(自定义颜色时)
|
||||
*/
|
||||
@Schema(description = "字典显示主题(ui框架时)or文字颜色(自定义颜色时)")
|
||||
@ApiModelProperty("字典显示主题(ui框架时)or文字颜色(自定义颜色时)")
|
||||
private String theme;
|
||||
/**
|
||||
* 是否默认（Y是 N否）
|
||||
*/
|
||||
@Schema(description = "是否默认（Y是 N否）")
|
||||
@ApiModelProperty("是否默认（Y是 N否）")
|
||||
private Integer isDefault;
|
||||
/**
|
||||
* 状态（1正常 0停用）
|
||||
*/
|
||||
@Schema(description = "状态（1正常 0停用）",required = true)
|
||||
@ApiModelProperty(value = "状态（1正常 0停用）",required = true)
|
||||
@NotNull(message = "状态不能为空!")
|
||||
private String state;
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package cn.fateverse.admin.dto;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotNull;
|
||||
@@ -17,24 +17,24 @@ public class DictTypeDto {
|
||||
/**
|
||||
* 字典主键
|
||||
*/
|
||||
@Schema(description = "字典主键")
|
||||
@ApiModelProperty("字典主键")
|
||||
private Long dictId;
|
||||
/**
|
||||
* 字典名称
|
||||
*/
|
||||
@Schema(description = "字典名称")
|
||||
@ApiModelProperty("字典名称")
|
||||
@NotNull(message = "字典名称不能为空!")
|
||||
private String dictName;
|
||||
/**
|
||||
* 字典类型
|
||||
*/
|
||||
@Schema(description = "字典类型")
|
||||
@ApiModelProperty("字典类型")
|
||||
@NotNull(message = "字典类型不能为空!")
|
||||
private String dictType;
|
||||
/**
|
||||
* 字典状态（1正常 0停用）
|
||||
*/
|
||||
@Schema(description = "字典状态")
|
||||
@ApiModelProperty("字典状态")
|
||||
@NotNull(message = "字典状态不能为空!")
|
||||
private String state;
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package cn.fateverse.admin.dto;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
@@ -14,13 +14,13 @@ public class IpBackDto {
|
||||
/**
|
||||
* 主键id
|
||||
*/
|
||||
@Schema(description = "主键id")
|
||||
@ApiModelProperty("主键id")
|
||||
private Long id;
|
||||
/**
|
||||
* ip地址
|
||||
*/
|
||||
@NotBlank(message = "ip地址不能为空")
|
||||
@Schema(description = "ip地址")
|
||||
@ApiModelProperty("ip地址")
|
||||
private String ipAddr;
|
||||
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package cn.fateverse.admin.dto;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
@@ -21,7 +21,7 @@ public class MenuDto implements Serializable {
|
||||
/**
|
||||
* 菜单ID
|
||||
*/
|
||||
@Schema(description = "菜单ID")
|
||||
@ApiModelProperty("菜单ID")
|
||||
private Long menuId;
|
||||
|
||||
/**
|
||||
@@ -29,86 +29,86 @@ public class MenuDto implements Serializable {
|
||||
*/
|
||||
@NotBlank(message = "菜单名称不能为空")
|
||||
@Size(min = 0, max = 50, message = "菜单名称长度不能超过50个字符")
|
||||
@Schema(description = "菜单名称")
|
||||
@ApiModelProperty("菜单名称")
|
||||
private String menuName;
|
||||
|
||||
/**
|
||||
* 父菜单ID
|
||||
*/
|
||||
@Schema(description = "父菜单ID")
|
||||
@ApiModelProperty("父菜单ID")
|
||||
private Long parentId;
|
||||
|
||||
/**
|
||||
* 显示顺序
|
||||
*/
|
||||
@Schema(description = "显示顺序")
|
||||
@ApiModelProperty("显示顺序")
|
||||
@NotNull(message = "显示顺序不能为空")
|
||||
private Integer orderNum;
|
||||
|
||||
/**
|
||||
* 路由地址
|
||||
*/
|
||||
@Schema(description = "路由地址")
|
||||
@ApiModelProperty("路由地址")
|
||||
@Size(min = 0, max = 200, message = "路由地址不能超过200个字符")
|
||||
private String path;
|
||||
|
||||
@Schema(description = "路径参数")
|
||||
@ApiModelProperty("路径参数")
|
||||
private String pathParams;
|
||||
|
||||
/**
|
||||
* 组件路径
|
||||
*/
|
||||
@Schema(description = "组件路径")
|
||||
@ApiModelProperty("组件路径")
|
||||
@Size(min = 0, max = 200, message = "组件路径不能超过255个字符")
|
||||
private String component;
|
||||
|
||||
/**
|
||||
* 是否为外链（0是 1否）
|
||||
*/
|
||||
@Schema(description = "是否为外链（0是 1否）")
|
||||
@ApiModelProperty("是否为外链（0是 1否）")
|
||||
private Boolean isFrame;
|
||||
|
||||
/**
|
||||
* 是否缓存（0缓存 1不缓存）
|
||||
*/
|
||||
@Schema(description = "是否缓存（0缓存 1不缓存）")
|
||||
@ApiModelProperty("是否缓存（0缓存 1不缓存）")
|
||||
private Boolean isCache;
|
||||
|
||||
@Schema(description = "不重定向")
|
||||
@ApiModelProperty("不重定向")
|
||||
private Boolean noRedirect;
|
||||
|
||||
@Schema(description = "面包屑")
|
||||
@ApiModelProperty("面包屑")
|
||||
private Boolean breadcrumb;
|
||||
|
||||
/**
|
||||
* 类型（D目录 M菜单 B按钮）
|
||||
*/
|
||||
@Schema(description = "类型（D目录 M菜单 B按钮）")
|
||||
@ApiModelProperty("类型（D目录 M菜单 B按钮）")
|
||||
@NotBlank(message = "菜单类型不能为空")
|
||||
private String menuType;
|
||||
|
||||
/**
|
||||
* 显示状态（0显示 1隐藏）
|
||||
*/
|
||||
@Schema(description = "显示状态（0显示 1隐藏）")
|
||||
@ApiModelProperty("显示状态（0显示 1隐藏）")
|
||||
private String visible;
|
||||
|
||||
/**
|
||||
* 菜单状态（0显示 1隐藏）
|
||||
*/
|
||||
@Schema(description = "菜单状态（0显示 1隐藏）")
|
||||
@ApiModelProperty("菜单状态（0显示 1隐藏）")
|
||||
private String state;
|
||||
|
||||
/**
|
||||
* 权限字符串
|
||||
*/
|
||||
@Schema(description = "权限字符串")
|
||||
@ApiModelProperty("权限字符串")
|
||||
@Size(min = 0, max = 100, message = "权限标识长度不能超过100个字符")
|
||||
private String perms;
|
||||
|
||||
/**
|
||||
* 菜单图标
|
||||
*/
|
||||
@Schema(description = "菜单图标")
|
||||
@ApiModelProperty("菜单图标")
|
||||
private String icon;
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package cn.fateverse.admin.dto;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotNull;
|
||||
@@ -17,30 +17,30 @@ public class PostDto {
|
||||
/**
|
||||
* 岗位ID
|
||||
*/
|
||||
@Schema(description = "岗位ID")
|
||||
@ApiModelProperty("岗位ID")
|
||||
private Long postId;
|
||||
/**
|
||||
* 岗位编码
|
||||
*/
|
||||
@Schema(description = "岗位编码")
|
||||
@ApiModelProperty("岗位编码")
|
||||
@NotNull(message = "岗位编码不能为空!")
|
||||
private String postCode;
|
||||
/**
|
||||
* 岗位名称
|
||||
*/
|
||||
@Schema(description = "岗位名称")
|
||||
@ApiModelProperty("岗位名称")
|
||||
@NotNull(message = "岗位名称不能为空!")
|
||||
private String postName;
|
||||
/**
|
||||
* 显示顺序
|
||||
*/
|
||||
@Schema(description = "显示顺序")
|
||||
@ApiModelProperty("显示顺序")
|
||||
@NotNull(message = "显示顺序不能为空!")
|
||||
private Integer postSort;
|
||||
/**
|
||||
* 状态（1正常 0停用）
|
||||
*/
|
||||
@Schema(description = "状态（1正常 0停用）")
|
||||
@ApiModelProperty("状态（1正常 0停用）")
|
||||
@NotNull(message = "状态不能为空!")
|
||||
private String state;
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ package cn.fateverse.admin.dto;
|
||||
|
||||
import cn.fateverse.common.core.entity.Role;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
@@ -24,53 +24,53 @@ public class RoleDto {
|
||||
/**
|
||||
* 角色ID
|
||||
*/
|
||||
@Schema(description = "角色id")
|
||||
@ApiModelProperty("角色id")
|
||||
private Long roleId;
|
||||
|
||||
/**
|
||||
* 角色名称
|
||||
*/
|
||||
@Schema(description = "角色名称")
|
||||
@ApiModelProperty("角色名称")
|
||||
@NotBlank(message = "角色名称不能为空!")
|
||||
private String roleName;
|
||||
|
||||
/**
|
||||
* 角色关键词
|
||||
*/
|
||||
@Schema(description = "角色关键词")
|
||||
@ApiModelProperty("角色关键词")
|
||||
@NotBlank(message = "角色关键词不能为空!")
|
||||
private String roleKey;
|
||||
|
||||
/**
|
||||
* 角色排序
|
||||
*/
|
||||
@Schema(description = "角色排序")
|
||||
@ApiModelProperty("角色排序")
|
||||
@NotNull(message = "角色排序不能为空!")
|
||||
private Integer roleSort;
|
||||
|
||||
/**
|
||||
* 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限）
|
||||
*/
|
||||
@Schema(description = "数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限）")
|
||||
@ApiModelProperty("数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限）")
|
||||
private String dataScope;
|
||||
|
||||
/**
|
||||
* 角色状态（1正常 0停用）
|
||||
*/
|
||||
@Schema(description = "角色状态（1正常 0停用）")
|
||||
@ApiModelProperty("角色状态（1正常 0停用）")
|
||||
@NotBlank(message = "角色状态不能为空!")
|
||||
private String state;
|
||||
|
||||
/**
|
||||
* 菜单组
|
||||
*/
|
||||
@Schema(description = "菜单组")
|
||||
@ApiModelProperty("菜单组")
|
||||
private Set<Long> menuIds;
|
||||
|
||||
/**
|
||||
* 部门组（数据权限）
|
||||
*/
|
||||
@Schema(description = "部门组（数据权限）")
|
||||
@ApiModelProperty("部门组（数据权限）")
|
||||
private Long[] deptIds;
|
||||
|
||||
public Role toRole() {
|
||||
|
||||
@@ -2,7 +2,7 @@ package cn.fateverse.admin.dto;
|
||||
|
||||
import cn.fateverse.common.core.entity.UserBase;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.Email;
|
||||
@@ -74,12 +74,12 @@ public class UserDto{
|
||||
/**
|
||||
* 岗位ids
|
||||
*/
|
||||
@Schema(description = "岗位ids")
|
||||
@ApiModelProperty("岗位ids")
|
||||
private List<Long> postIds;
|
||||
/**
|
||||
* 角色ids
|
||||
*/
|
||||
@Schema(description = "角色ids")
|
||||
@ApiModelProperty("角色ids")
|
||||
private List<Long> roleIds;
|
||||
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ package cn.fateverse.admin.entity;
|
||||
import cn.fateverse.common.core.annotaion.EnableAutoField;
|
||||
import cn.fateverse.common.core.entity.BaseEntity;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotNull;
|
||||
@@ -20,24 +20,24 @@ public class DictType extends BaseEntity {
|
||||
/**
|
||||
* 字典主键
|
||||
*/
|
||||
@Schema(description = "字典主键")
|
||||
@ApiModelProperty("字典主键")
|
||||
private Long dictId;
|
||||
/**
|
||||
* 字典名称
|
||||
*/
|
||||
@Schema(description = "字典名称")
|
||||
@ApiModelProperty("字典名称")
|
||||
@NotNull(message = "字典名称不能为空!")
|
||||
private String dictName;
|
||||
/**
|
||||
* 字典类型
|
||||
*/
|
||||
@Schema(description = "字典类型")
|
||||
@ApiModelProperty("字典类型")
|
||||
@NotNull(message = "字典类型不能为空!")
|
||||
private String dictType;
|
||||
/**
|
||||
* 字典状态（1正常 0停用）
|
||||
*/
|
||||
@Schema(description = "字典状态")
|
||||
@ApiModelProperty("字典状态")
|
||||
@NotNull(message = "字典状态不能为空!")
|
||||
private String state;
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package cn.fateverse.admin.entity;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
|
||||
@@ -19,45 +19,45 @@ public class OnlineUser {
|
||||
/**
|
||||
* 会话id
|
||||
*/
|
||||
@Schema(description = "会话id")
|
||||
@ApiModelProperty("会话id")
|
||||
private String tokenId;
|
||||
|
||||
/**
|
||||
* 用户名
|
||||
*/
|
||||
@Schema(description = "用户名")
|
||||
@ApiModelProperty("用户名")
|
||||
private String username;
|
||||
|
||||
/**
|
||||
* 部门名称
|
||||
*/
|
||||
@Schema(description = "部门名称")
|
||||
@ApiModelProperty("部门名称")
|
||||
private String deptName;
|
||||
/**
|
||||
* 登录ip
|
||||
*/
|
||||
@Schema(description = "登录ip")
|
||||
@ApiModelProperty("登录ip")
|
||||
private String ipAddr;
|
||||
/**
|
||||
* 登录地点
|
||||
*/
|
||||
@Schema(description = "登录地点")
|
||||
@ApiModelProperty("登录地点")
|
||||
private String loginLocation;
|
||||
/**
|
||||
* 浏览器类型
|
||||
*/
|
||||
@Schema(description = "浏览器类型")
|
||||
@ApiModelProperty("浏览器类型")
|
||||
private String browser;
|
||||
/**
|
||||
* 操作系统
|
||||
*/
|
||||
@Schema(description = "操作系统")
|
||||
@ApiModelProperty("操作系统")
|
||||
private String os;
|
||||
|
||||
/**
|
||||
* 登录时间
|
||||
*/
|
||||
@Schema(description = "登录时间")
|
||||
@ApiModelProperty("登录时间")
|
||||
private Date loginTime;
|
||||
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package cn.fateverse.admin.query;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
@@ -21,18 +21,18 @@ public class ConfigQuery {
|
||||
/**
|
||||
* 参数名称
|
||||
*/
|
||||
@Schema(description = "参数名称")
|
||||
@ApiModelProperty("参数名称")
|
||||
private String configName;
|
||||
|
||||
/**
|
||||
* 参数键名
|
||||
*/
|
||||
@Schema(description = "参数键名")
|
||||
@ApiModelProperty("参数键名")
|
||||
private String configKey;
|
||||
|
||||
/**
|
||||
* 系统内置（1是 0否）
|
||||
*/
|
||||
@Schema(description = "系统内置（1是 0否）")
|
||||
@ApiModelProperty("系统内置（1是 0否）")
|
||||
private Integer configType;
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
package cn.fateverse.admin.query;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
@@ -13,16 +13,16 @@ public class DictDataQuery {
|
||||
/**
|
||||
* 字典类型
|
||||
*/
|
||||
@Schema(description = "字典名称",required = true)
|
||||
@ApiModelProperty(value = "字典名称",required = true)
|
||||
private String dictType;
|
||||
/**
|
||||
* 字典标签
|
||||
*/
|
||||
@Schema(description = "字典标签")
|
||||
@ApiModelProperty("字典标签")
|
||||
private String dictLabel;
|
||||
/**
|
||||
* 状态（1正常 0停用）
|
||||
*/
|
||||
@Schema(description = "帐号状态（1正常 0停用）")
|
||||
@ApiModelProperty("帐号状态（1正常 0停用）")
|
||||
private String state;
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package cn.fateverse.admin.query;
|
||||
|
||||
import cn.fateverse.common.core.entity.QueryTime;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
@@ -14,18 +14,18 @@ public class DictTypeQuery extends QueryTime {
|
||||
/**
|
||||
* 字典名称
|
||||
*/
|
||||
@Schema(description = "字典名称")
|
||||
@ApiModelProperty("字典名称")
|
||||
private String dictName;
|
||||
/**
|
||||
* 字典类型
|
||||
*/
|
||||
@Schema(description = "字典类型")
|
||||
@ApiModelProperty("字典类型")
|
||||
private String dictType;
|
||||
|
||||
/**
|
||||
* 帐号状态（1正常 0停用）
|
||||
*/
|
||||
@Schema(description = "帐号状态（1正常 0停用）")
|
||||
@ApiModelProperty("帐号状态（1正常 0停用）")
|
||||
private String state;
|
||||
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package cn.fateverse.admin.query;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
@@ -12,12 +12,12 @@ import lombok.Data;
|
||||
@ApiModel("接口开关Query")
|
||||
public class MappingSwitchQuery {
|
||||
|
||||
@Schema(description = "应用名称")
|
||||
@ApiModelProperty("应用名称")
|
||||
private String applicationName;
|
||||
|
||||
@Schema(description = "类别名称")
|
||||
@ApiModelProperty("类别名称")
|
||||
private String className;
|
||||
|
||||
@Schema(description = "方法名称")
|
||||
@ApiModelProperty("方法名称")
|
||||
private String methodName;
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package cn.fateverse.admin.query;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
@@ -17,18 +17,18 @@ public class PostQuery {
|
||||
/**
|
||||
* 岗位编码
|
||||
*/
|
||||
@Schema(description = "岗位编码")
|
||||
@ApiModelProperty("岗位编码")
|
||||
private String postCode;
|
||||
|
||||
/**
|
||||
* 岗位名称
|
||||
*/
|
||||
@Schema(description = "岗位名称")
|
||||
@ApiModelProperty("岗位名称")
|
||||
private String postName;
|
||||
|
||||
/**
|
||||
* 状态（1正常 0停用）
|
||||
*/
|
||||
@Schema(description = "状态（1正常 0停用）")
|
||||
@ApiModelProperty("状态（1正常 0停用）")
|
||||
private String state;
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@ package cn.fateverse.admin.query;
|
||||
|
||||
import cn.fateverse.common.core.entity.QueryTime;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
@@ -15,17 +15,17 @@ public class RoleQuery extends QueryTime {
|
||||
/**
|
||||
* 权限字符
|
||||
*/
|
||||
@Schema(description = "角色名称")
|
||||
@ApiModelProperty("角色名称")
|
||||
private String roleName;
|
||||
|
||||
/**
|
||||
* 权限字符
|
||||
*/
|
||||
@Schema(description = "权限字符")
|
||||
@ApiModelProperty("权限字符")
|
||||
private String roleKey;
|
||||
/**
|
||||
* 帐号状态（1正常 0停用）
|
||||
*/
|
||||
@Schema(description = "帐号状态（1正常 0停用）")
|
||||
@ApiModelProperty("帐号状态（1正常 0停用）")
|
||||
private String state;
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@ package cn.fateverse.admin.query;
|
||||
|
||||
import cn.fateverse.common.core.entity.QueryTime;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
@@ -16,25 +16,25 @@ public class UserQuery extends QueryTime {
|
||||
/**
|
||||
* 部门ID
|
||||
*/
|
||||
@Schema(description = "部门ID")
|
||||
@ApiModelProperty("部门ID")
|
||||
private Long deptId;
|
||||
|
||||
/**
|
||||
* 用户账号
|
||||
*/
|
||||
@Schema(description = "用户账号")
|
||||
@ApiModelProperty("用户账号")
|
||||
private String userName;
|
||||
|
||||
/**
|
||||
* 手机号码
|
||||
*/
|
||||
@Schema(description = "手机号码")
|
||||
@ApiModelProperty("手机号码")
|
||||
private String phoneNumber;
|
||||
|
||||
/**
|
||||
* 帐号状态（1正常 0停用）
|
||||
*/
|
||||
@Schema(description = "帐号状态（1正常 0停用）")
|
||||
@ApiModelProperty("帐号状态（1正常 0停用）")
|
||||
private String state;
|
||||
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ package cn.fateverse.admin.vo;
|
||||
import cn.fateverse.admin.entity.Config;
|
||||
import cn.fateverse.common.core.annotaion.Excel;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
@@ -25,41 +25,41 @@ public class ConfigVo {
|
||||
/**
|
||||
* 参数主键
|
||||
*/
|
||||
@Schema(description = "参数主键")
|
||||
@ApiModelProperty("参数主键")
|
||||
private Integer configId;
|
||||
|
||||
/**
|
||||
* 参数名称
|
||||
*/
|
||||
@Schema(description = "参数名称")
|
||||
@ApiModelProperty("参数名称")
|
||||
@Excel("参数名称")
|
||||
private String configName;
|
||||
|
||||
/**
|
||||
* 参数键名
|
||||
*/
|
||||
@Schema(description = "参数键名")
|
||||
@ApiModelProperty("参数键名")
|
||||
@Excel("参数键名")
|
||||
private String configKey;
|
||||
|
||||
/**
|
||||
* 参数键值
|
||||
*/
|
||||
@Schema(description = "参数键值")
|
||||
@ApiModelProperty("参数键值")
|
||||
@Excel("参数键值")
|
||||
private String configValue;
|
||||
|
||||
/**
|
||||
* 系统内置（1是 0否）
|
||||
*/
|
||||
@Schema(description = "系统内置（1是 0否）")
|
||||
@ApiModelProperty("系统内置（1是 0否）")
|
||||
@Excel("系统内置（1是 0否）")
|
||||
private Integer configType;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@Schema(description = "备注")
|
||||
@ApiModelProperty("备注")
|
||||
@Excel("备注")
|
||||
private String remark;
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ package cn.fateverse.admin.vo;
|
||||
|
||||
import cn.fateverse.admin.entity.DictData;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
@@ -23,34 +23,34 @@ public class DictDataSimpVo {
|
||||
/**
|
||||
* 字典标签
|
||||
*/
|
||||
@Schema(description = "字典标签")
|
||||
@ApiModelProperty("字典标签")
|
||||
@NotNull(message = "字典标签不能为空!")
|
||||
private String label;
|
||||
/**
|
||||
* 字典键值
|
||||
*/
|
||||
@Schema(description = "字典键值")
|
||||
@ApiModelProperty("字典键值")
|
||||
@NotNull(message = "字典键值不能为空!")
|
||||
private String value;
|
||||
/**
|
||||
* 样式属性（其他样式扩展）
|
||||
*/
|
||||
@Schema(description = "样式属性（其他样式扩展）")
|
||||
@ApiModelProperty("样式属性（其他样式扩展）")
|
||||
private Boolean isType;
|
||||
/**
|
||||
* 表格回显样式
|
||||
*/
|
||||
@Schema(description = "表格回显样式")
|
||||
@ApiModelProperty("表格回显样式")
|
||||
private String listClass;
|
||||
/**
|
||||
* 字典显示主题(ui框架时)or文字颜色(自定义颜色时)
|
||||
*/
|
||||
@Schema(description = "字典显示主题(ui框架时)or文字颜色(自定义颜色时)")
|
||||
@ApiModelProperty("字典显示主题(ui框架时)or文字颜色(自定义颜色时)")
|
||||
private String theme;
|
||||
/**
|
||||
* 是否默认（Y是 N否）
|
||||
*/
|
||||
@Schema(description = "是否默认（Y是 N否）")
|
||||
@ApiModelProperty("是否默认（Y是 N否）")
|
||||
private Integer isDefault;
|
||||
|
||||
|
||||
|
||||
@@ -1,13 +1,12 @@
|
||||
package cn.fateverse.admin.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.Date;
|
||||
|
||||
|
||||
@@ -29,52 +28,52 @@ public class DictDataVo implements Serializable {
|
||||
/**
|
||||
* 字典排序
|
||||
*/
|
||||
@Schema(description = "字典排序")
|
||||
@ApiModelProperty("字典排序")
|
||||
private Integer dictSort;
|
||||
/**
|
||||
* 字典标签
|
||||
*/
|
||||
@Schema(description = "字典标签")
|
||||
@ApiModelProperty("字典标签")
|
||||
private String dictLabel;
|
||||
/**
|
||||
* 字典键值
|
||||
*/
|
||||
@Schema(description = "字典键值")
|
||||
@ApiModelProperty("字典键值")
|
||||
private String dictValue;
|
||||
/**
|
||||
* 字典类型
|
||||
*/
|
||||
@Schema(description = "字典类型")
|
||||
@ApiModelProperty("字典类型")
|
||||
private String dictType;
|
||||
/**
|
||||
* 样式属性（其他样式扩展）
|
||||
*/
|
||||
@Schema(description = "样式属性（其他样式扩展）")
|
||||
@ApiModelProperty("样式属性（其他样式扩展）")
|
||||
private Boolean isType;
|
||||
/**
|
||||
* 表格回显样式
|
||||
*/
|
||||
@Schema(description = "表格回显样式")
|
||||
@ApiModelProperty("表格回显样式")
|
||||
private String listClass;
|
||||
/**
|
||||
* 字典显示主题(ui框架时)or文字颜色(自定义颜色时)
|
||||
*/
|
||||
@Schema(description = "字典显示主题(ui框架时)or文字颜色(自定义颜色时)")
|
||||
@ApiModelProperty("字典显示主题(ui框架时)or文字颜色(自定义颜色时)")
|
||||
private String theme;
|
||||
/**
|
||||
* 是否默认（Y是 N否）
|
||||
*/
|
||||
@Schema(description = "是否默认（Y是 N否）")
|
||||
@ApiModelProperty("是否默认（Y是 N否）")
|
||||
private Integer isDefault;
|
||||
/**
|
||||
* 状态（1正常 0停用）
|
||||
*/
|
||||
@Schema(description = "状态（1正常 0停用）")
|
||||
@ApiModelProperty(value = "状态（1正常 0停用）")
|
||||
private String state;
|
||||
|
||||
|
||||
@Schema(description = "创建时间")
|
||||
private LocalDateTime createTime;
|
||||
@ApiModelProperty(value = "创建时间")
|
||||
private Date createTime;
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@ package cn.fateverse.admin.vo;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
|
||||
@@ -19,29 +19,29 @@ public class DictTypeVo {
|
||||
/**
|
||||
* 字典id
|
||||
*/
|
||||
@Schema(description = "字典id")
|
||||
@ApiModelProperty("字典id")
|
||||
private Long dictId;
|
||||
/**
|
||||
* 字典名称
|
||||
*/
|
||||
@Schema(description = "字典名称")
|
||||
@ApiModelProperty("字典名称")
|
||||
private String dictName;
|
||||
/**
|
||||
* 字典类型
|
||||
*/
|
||||
@Schema(description = "字典类型")
|
||||
@ApiModelProperty("字典类型")
|
||||
private String dictType;
|
||||
|
||||
/**
|
||||
* 帐号状态（1正常 0停用）
|
||||
*/
|
||||
@Schema(description = "帐号状态（1正常 0停用）")
|
||||
@ApiModelProperty("帐号状态（1正常 0停用）")
|
||||
private String state;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
@Schema(description = "创建时间")
|
||||
@ApiModelProperty("创建时间")
|
||||
private LocalDateTime createTime;
|
||||
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ package cn.fateverse.admin.vo;
|
||||
import cn.fateverse.admin.entity.IpBack;
|
||||
import cn.fateverse.common.core.annotaion.Excel;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
@@ -24,19 +24,19 @@ public class IpBackVo {
|
||||
/**
|
||||
* 主键id
|
||||
*/
|
||||
@Schema(description = "主键id")
|
||||
@ApiModelProperty("主键id")
|
||||
@Excel("id")
|
||||
private Long id;
|
||||
/**
|
||||
* ip地址
|
||||
*/
|
||||
@Schema(description = "ip地址")
|
||||
@ApiModelProperty("ip地址")
|
||||
@Excel("ip地址")
|
||||
private String ipAddr;
|
||||
/**
|
||||
* ip类型 ipv4 ipv6
|
||||
*/
|
||||
@Schema(description = "ip类型 ipv4 ipv6")
|
||||
@ApiModelProperty("ip类型 ipv4 ipv6")
|
||||
@Excel("ip类型 ipv4 ipv6")
|
||||
private String type;
|
||||
/**
|
||||
@@ -45,7 +45,7 @@ public class IpBackVo {
|
||||
@Excel("备注信息")
|
||||
private String remark;
|
||||
|
||||
@Schema(description = "创建时间")
|
||||
@ApiModelProperty("创建时间")
|
||||
@Excel("创建时间")
|
||||
private LocalDateTime createTime;
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package cn.fateverse.admin.vo;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
@@ -25,48 +25,48 @@ public class MenuSimpVo {
|
||||
/**
|
||||
* 菜单ID
|
||||
*/
|
||||
@Schema(description = "菜单ID")
|
||||
@ApiModelProperty("菜单ID")
|
||||
private Long menuId;
|
||||
|
||||
/**
|
||||
* 菜单名称
|
||||
*/
|
||||
@Schema(description = "菜单名称")
|
||||
@ApiModelProperty("菜单名称")
|
||||
private String menuName;
|
||||
|
||||
/**
|
||||
* 菜单图标
|
||||
*/
|
||||
@Schema(description = "菜单图标")
|
||||
@ApiModelProperty("菜单图标")
|
||||
private String icon;
|
||||
|
||||
/**
|
||||
* 显示顺序
|
||||
*/
|
||||
@Schema(description = "显示顺序")
|
||||
@ApiModelProperty("显示顺序")
|
||||
private Integer orderNum;
|
||||
|
||||
|
||||
@Schema(description = "显示顺序")
|
||||
@ApiModelProperty("显示顺序")
|
||||
private String menuType;
|
||||
|
||||
/**
|
||||
* 权限字符串
|
||||
*/
|
||||
@Schema(description = "权限字符串")
|
||||
@ApiModelProperty("权限字符串")
|
||||
@Size(min = 0, max = 100, message = "权限标识长度不能超过100个字符")
|
||||
private String perms;
|
||||
|
||||
/**
|
||||
* 组件路径
|
||||
*/
|
||||
@Schema(description = "组件路径")
|
||||
@ApiModelProperty("组件路径")
|
||||
private String component;
|
||||
|
||||
/**
|
||||
* 菜单状态（0显示 1隐藏）
|
||||
*/
|
||||
@Schema(description = "菜单状态（0显示 1隐藏）")
|
||||
@ApiModelProperty("菜单状态（0显示 1隐藏）")
|
||||
private String state;
|
||||
|
||||
/**
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package cn.fateverse.admin.vo;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
@@ -18,87 +18,87 @@ public class MenuVo implements Serializable {
|
||||
/**
|
||||
* 菜单ID
|
||||
*/
|
||||
@Schema(description = "菜单ID")
|
||||
@ApiModelProperty("菜单ID")
|
||||
private Long menuId;
|
||||
|
||||
/**
|
||||
* 菜单名称
|
||||
*/
|
||||
@Schema(description = "菜单名称")
|
||||
@ApiModelProperty("菜单名称")
|
||||
private String menuName;
|
||||
|
||||
/**
|
||||
* 父菜单ID
|
||||
*/
|
||||
@Schema(description = "父菜单ID")
|
||||
@ApiModelProperty("父菜单ID")
|
||||
private Long parentId;
|
||||
|
||||
/**
|
||||
* 显示顺序
|
||||
*/
|
||||
@Schema(description = "显示顺序")
|
||||
@ApiModelProperty("显示顺序")
|
||||
private Integer orderNum;
|
||||
|
||||
/**
|
||||
* 路由地址
|
||||
*/
|
||||
@Schema(description = "路由地址")
|
||||
@ApiModelProperty("路由地址")
|
||||
private String path;
|
||||
|
||||
@Schema(description = "路径参数")
|
||||
@ApiModelProperty("路径参数")
|
||||
private String pathParams;
|
||||
|
||||
/**
|
||||
* 组件路径
|
||||
*/
|
||||
@Schema(description = "组件路径")
|
||||
@ApiModelProperty("组件路径")
|
||||
private String component;
|
||||
|
||||
/**
|
||||
* 是否为外链（0是 1否）
|
||||
*/
|
||||
@Schema(description = "是否为外链（0是 1否）")
|
||||
@ApiModelProperty("是否为外链（0是 1否）")
|
||||
private Boolean isFrame;
|
||||
|
||||
/**
|
||||
* 是否缓存（0缓存 1不缓存）
|
||||
*/
|
||||
@Schema(description = "是否缓存（0缓存 1不缓存）")
|
||||
@ApiModelProperty("是否缓存（0缓存 1不缓存）")
|
||||
private Boolean isCache;
|
||||
|
||||
@Schema(description = "不重定向")
|
||||
@ApiModelProperty("不重定向")
|
||||
private Boolean noRedirect;
|
||||
|
||||
@Schema(description = "面包屑")
|
||||
@ApiModelProperty("面包屑")
|
||||
private Boolean breadcrumb;
|
||||
/**
|
||||
* 类型（D目录 M菜单 B按钮）
|
||||
*/
|
||||
@Schema(description = "类型（D目录 M菜单 B按钮）")
|
||||
@ApiModelProperty("类型（D目录 M菜单 B按钮）")
|
||||
private String menuType;
|
||||
|
||||
/**
|
||||
* 显示状态（0显示 1隐藏）
|
||||
*/
|
||||
@Schema(description = "显示状态（0显示 1隐藏）")
|
||||
@ApiModelProperty("显示状态（0显示 1隐藏）")
|
||||
private String visible;
|
||||
|
||||
/**
|
||||
* 菜单状态（0显示 1隐藏）
|
||||
*/
|
||||
@Schema(description = "菜单状态（0显示 1隐藏）")
|
||||
@ApiModelProperty("菜单状态（0显示 1隐藏）")
|
||||
private String state;
|
||||
|
||||
/**
|
||||
* 权限字符串
|
||||
*/
|
||||
@Schema(description = "权限字符串")
|
||||
@ApiModelProperty("权限字符串")
|
||||
private String perms;
|
||||
|
||||
/**
|
||||
* 菜单图标
|
||||
*/
|
||||
@Schema(description = "菜单图标")
|
||||
@ApiModelProperty("菜单图标")
|
||||
private String icon;
|
||||
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@ package cn.fateverse.admin.vo;
|
||||
|
||||
import cn.fateverse.common.core.entity.OptionTree;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
|
||||
@@ -18,9 +18,9 @@ import java.util.Set;
|
||||
@ApiModel("角色修改时菜单返回实体")
|
||||
public class OptionMenuVo {
|
||||
|
||||
@Schema(description = "已选择的")
|
||||
@ApiModelProperty("已选择的")
|
||||
private Set<Long> checked;
|
||||
@Schema(description = "菜单选择option")
|
||||
@ApiModelProperty("菜单选择option")
|
||||
private List<OptionTree> menuOption;
|
||||
|
||||
}
|
||||
|
||||
@@ -3,12 +3,11 @@ package cn.fateverse.admin.vo;
|
||||
import cn.fateverse.admin.entity.Post;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotNull;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
@@ -23,30 +22,30 @@ public class PostVo {
|
||||
/**
|
||||
* 岗位ID
|
||||
*/
|
||||
@Schema(description = "岗位ID")
|
||||
@ApiModelProperty("岗位ID")
|
||||
private Long postId;
|
||||
/**
|
||||
* 岗位编码
|
||||
*/
|
||||
@Schema(description = "岗位编码")
|
||||
@ApiModelProperty("岗位编码")
|
||||
@NotNull(message = "岗位编码不能为空!")
|
||||
private String postCode;
|
||||
/**
|
||||
* 岗位名称
|
||||
*/
|
||||
@Schema(description = "岗位名称")
|
||||
@ApiModelProperty("岗位名称")
|
||||
@NotNull(message = "岗位名称不能为空!")
|
||||
private String postName;
|
||||
/**
|
||||
* 显示顺序
|
||||
*/
|
||||
@Schema(description = "显示顺序")
|
||||
@ApiModelProperty("显示顺序")
|
||||
@NotNull(message = "显示顺序不能为空!")
|
||||
private Integer postSort;
|
||||
/**
|
||||
* 状态（1正常 0停用）
|
||||
*/
|
||||
@Schema(description = "状态（1正常 0停用）")
|
||||
@ApiModelProperty("状态（1正常 0停用）")
|
||||
@NotNull(message = "状态不能为空!")
|
||||
private String state;
|
||||
|
||||
@@ -54,7 +53,7 @@ public class PostVo {
|
||||
* 创建时间
|
||||
*/
|
||||
@JsonFormat(locale = "zh",timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
private LocalDateTime createTime;
|
||||
private Date createTime;
|
||||
|
||||
public static PostVo toPostVo(Post post){
|
||||
return PostVo.builder()
|
||||
|
||||
@@ -2,13 +2,12 @@ package cn.fateverse.admin.vo;
|
||||
|
||||
import cn.fateverse.common.core.entity.Role;
|
||||
import com.fasterxml.jackson.annotation.JsonInclude;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.Date;
|
||||
import java.util.Set;
|
||||
|
||||
@@ -23,46 +22,46 @@ import java.util.Set;
|
||||
@NoArgsConstructor
|
||||
public class RoleVo {
|
||||
|
||||
@Schema(description = "角色id")
|
||||
@ApiModelProperty("角色id")
|
||||
private Long roleId;
|
||||
|
||||
@Schema(description = "角色名称")
|
||||
@ApiModelProperty("角色名称")
|
||||
private String roleName;
|
||||
|
||||
|
||||
@Schema(description = "角色权限字符串")
|
||||
@ApiModelProperty("角色权限字符串")
|
||||
private String roleKey;
|
||||
|
||||
@Schema(description = "角色排序")
|
||||
@ApiModelProperty("角色排序")
|
||||
private Integer roleSort;
|
||||
|
||||
/**
|
||||
* 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限）
|
||||
*/
|
||||
@Schema(description = "数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限）")
|
||||
@ApiModelProperty("数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限）")
|
||||
private String dataScope;
|
||||
|
||||
/**
|
||||
* 角色状态（1正常 0停用）
|
||||
*/
|
||||
@Schema(description = "角色状态（1正常 0停用）")
|
||||
@ApiModelProperty("角色状态（1正常 0停用）")
|
||||
private String state;
|
||||
|
||||
/**
|
||||
* 菜单组
|
||||
*/
|
||||
@Schema(description = "菜单组")
|
||||
@ApiModelProperty("菜单组")
|
||||
@JsonInclude(JsonInclude.Include.NON_NULL)
|
||||
private Set<Long> menuIds;
|
||||
|
||||
/**
|
||||
* 部门组（数据权限）
|
||||
*/
|
||||
@Schema(description = "部门组（数据权限）")
|
||||
@ApiModelProperty("部门组（数据权限）")
|
||||
@JsonInclude(JsonInclude.Include.NON_NULL)
|
||||
private Long[] deptIds;
|
||||
private LocalDateTime createTime;
|
||||
private LocalDateTime updateTime;
|
||||
private Date createTime;
|
||||
private Date updateTime;
|
||||
|
||||
public static RoleVo toRoleVo(Role role){
|
||||
return RoleVo.builder()
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package cn.fateverse.admin.vo;
|
||||
|
||||
import cn.fateverse.common.core.entity.Dept;
|
||||
import cn.fateverse.common.core.entity.Role;
|
||||
import cn.fateverse.admin.entity.Role;
|
||||
import cn.fateverse.admin.entity.Dept;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
package cn.fateverse.admin.vo;
|
||||
|
||||
import cn.fateverse.admin.entity.User;
|
||||
import cn.fateverse.common.core.entity.Option;
|
||||
import cn.fateverse.common.core.entity.User;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
|
||||
@@ -17,18 +17,18 @@ import java.util.List;
|
||||
@Builder
|
||||
@ApiModel("用户详细信息")
|
||||
public class UserDetailVo {
|
||||
@Schema(description = "用户基本细腻系")
|
||||
@ApiModelProperty("用户基本细腻系")
|
||||
private User user;
|
||||
|
||||
@Schema(description = "用户所在的岗位")
|
||||
@ApiModelProperty("用户所在的岗位")
|
||||
private List<Long> postIds;
|
||||
|
||||
@Schema(description = "岗位option选择数组")
|
||||
@ApiModelProperty("岗位option选择数组")
|
||||
private List<Option> postList;
|
||||
|
||||
@Schema(description = "用户所拥有的的角色信息")
|
||||
@ApiModelProperty("用户所拥有的的角色信息")
|
||||
private List<Long> roleIds;
|
||||
|
||||
@Schema(description = "角色option选择数组")
|
||||
@ApiModelProperty("角色option选择数组")
|
||||
private List<Option> roleList;
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package cn.fateverse.admin.vo;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
@@ -18,13 +18,13 @@ public class UserVo implements Serializable {
|
||||
/**
|
||||
* 用户ID
|
||||
*/
|
||||
@Schema(description = "用户ID")
|
||||
@ApiModelProperty("用户ID")
|
||||
private Long userId;
|
||||
|
||||
/**
|
||||
* 部门名称
|
||||
*/
|
||||
@Schema(description = "部门名称")
|
||||
@ApiModelProperty("部门名称")
|
||||
private String deptName;
|
||||
|
||||
private Long leaderDeptId;
|
||||
@@ -34,7 +34,7 @@ public class UserVo implements Serializable {
|
||||
/**
|
||||
* 用户账号
|
||||
*/
|
||||
@Schema(description = "用户账号")
|
||||
@ApiModelProperty("用户账号")
|
||||
private String userName;
|
||||
|
||||
private String avatar;
|
||||
@@ -48,25 +48,25 @@ public class UserVo implements Serializable {
|
||||
/**
|
||||
* 用户昵称
|
||||
*/
|
||||
@Schema(description = "用户昵称")
|
||||
@ApiModelProperty("用户昵称")
|
||||
private String nickName;
|
||||
|
||||
/**
|
||||
* 手机号码
|
||||
*/
|
||||
@Schema(description = "手机号码")
|
||||
@ApiModelProperty("手机号码")
|
||||
private String phoneNumber;
|
||||
|
||||
/**
|
||||
* 帐号状态（1正常 0停用）
|
||||
*/
|
||||
@Schema(description = "帐号状态（1正常 0停用）")
|
||||
@ApiModelProperty("帐号状态（1正常 0停用）")
|
||||
private String state;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
@Schema(description = "创建时间")
|
||||
@ApiModelProperty("创建时间")
|
||||
private Date createTime;
|
||||
|
||||
}
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package cn.fateverse.admin.controller;
|
||||
|
||||
import cn.fateverse.admin.dto.RoleDto;
|
||||
import cn.fateverse.common.core.entity.Role;
|
||||
import cn.fateverse.common.core.entity.User;
|
||||
import cn.fateverse.admin.entity.Role;
|
||||
import cn.fateverse.admin.entity.User;
|
||||
import cn.fateverse.admin.query.RoleQuery;
|
||||
import cn.fateverse.admin.vo.RoleVo;
|
||||
import cn.fateverse.common.core.entity.IdWrapper;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package cn.fateverse.admin.dubbo;
|
||||
|
||||
import cn.fateverse.common.core.entity.Role;
|
||||
import cn.fateverse.admin.entity.Role;
|
||||
import cn.fateverse.admin.mapper.RoleMapper;
|
||||
import cn.fateverse.admin.query.RoleQuery;
|
||||
import org.apache.dubbo.config.annotation.DubboService;
|
||||
|
||||
@@ -1,10 +1,9 @@
|
||||
package cn.fateverse.admin.dubbo;
|
||||
|
||||
import cn.fateverse.admin.entity.User;
|
||||
import cn.fateverse.admin.service.UserService;
|
||||
import cn.fateverse.admin.vo.UserVo;
|
||||
import cn.fateverse.common.core.entity.User;
|
||||
import cn.fateverse.common.core.exception.CustomException;
|
||||
import cn.fateverse.common.security.dubbo.DubboUserSearchService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.dubbo.config.annotation.DubboService;
|
||||
|
||||
@@ -16,7 +15,7 @@ import java.util.List;
|
||||
*/
|
||||
@Slf4j
|
||||
@DubboService
|
||||
public class DubboUserServiceImpl implements DubboUserService, DubboUserSearchService {
|
||||
public class DubboUserServiceImpl implements DubboUserService {
|
||||
|
||||
private final UserService userService;
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package cn.fateverse.admin.entity.dto;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import cn.fateverse.common.decrypt.annotation.EncryptField;
|
||||
import lombok.Data;
|
||||
|
||||
@@ -19,7 +19,7 @@ public class MappingSwitchDto {
|
||||
* key作为唯一编号
|
||||
*/
|
||||
@NotBlank(message = "唯一编号不能为空")
|
||||
@Schema(description = "唯一编号不能为空")
|
||||
@ApiModelProperty("唯一编号不能为空")
|
||||
@EncryptField
|
||||
private String key;
|
||||
|
||||
@@ -27,7 +27,7 @@ public class MappingSwitchDto {
|
||||
* 当前方法的状态,true为正常放行,false为关闭
|
||||
*/
|
||||
@NotNull(message = "状态不能为空")
|
||||
@Schema(description = "当前方法的状态,true为正常放行,false为关闭")
|
||||
@ApiModelProperty("当前方法的状态,true为正常放行,false为关闭")
|
||||
private Boolean state;
|
||||
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@ package cn.fateverse.admin.entity.vo;
|
||||
import cn.fateverse.common.decrypt.annotation.EncryptField;
|
||||
import cn.fateverse.common.security.entity.MappingSwitchInfo;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
|
||||
@@ -24,66 +24,66 @@ public class MappingSwitchVo {
|
||||
* key作为唯一编号
|
||||
*/
|
||||
@EncryptField
|
||||
@Schema(description = "key作为唯一编号")
|
||||
@ApiModelProperty("key作为唯一编号")
|
||||
private String key;
|
||||
|
||||
/**
|
||||
* 应用名称
|
||||
*/
|
||||
@Schema(description = "应用名称")
|
||||
@ApiModelProperty("应用名称")
|
||||
private String applicationName;
|
||||
|
||||
/**
|
||||
* 类名
|
||||
*/
|
||||
@Schema(description = "类名")
|
||||
@ApiModelProperty("类名")
|
||||
private String className;
|
||||
|
||||
/**
|
||||
* 方法名称
|
||||
*/
|
||||
@Schema(description = "方法名称")
|
||||
@ApiModelProperty("方法名称")
|
||||
private String methodName;
|
||||
|
||||
/**
|
||||
* 描述MappingSwitch注解的value可以为空
|
||||
*/
|
||||
@Schema(description = "描述MappingSwitch注解的value可以为空")
|
||||
@ApiModelProperty("描述MappingSwitch注解的value可以为空")
|
||||
private String description;
|
||||
|
||||
/**
|
||||
* HandlerMethod中的uri
|
||||
*/
|
||||
@Schema(description = "HandlerMethod中的uri")
|
||||
@ApiModelProperty("HandlerMethod中的uri")
|
||||
private Set<String> uris;
|
||||
|
||||
/**
|
||||
* 当前开关类型
|
||||
*/
|
||||
@Schema(description = "当前开关类型")
|
||||
@ApiModelProperty("当前开关类型")
|
||||
private String type;
|
||||
|
||||
/**
|
||||
* 当前方法请求类型
|
||||
*/
|
||||
@Schema(description = "当前方法请求类型")
|
||||
@ApiModelProperty("当前方法请求类型")
|
||||
private Set<String> httpMethods;
|
||||
|
||||
/**
|
||||
* 当前方法的状态,true为正常放行,false为关闭
|
||||
*/
|
||||
@Schema(description = "当前方法的状态,true为正常放行,false为关闭")
|
||||
@ApiModelProperty("当前方法的状态,true为正常放行,false为关闭")
|
||||
private Boolean state;
|
||||
|
||||
/**
|
||||
* 操作时间
|
||||
*/
|
||||
@Schema(description = "变更时间")
|
||||
@ApiModelProperty("变更时间")
|
||||
private Date operTime;
|
||||
/**
|
||||
* 操作人员
|
||||
*/
|
||||
@Schema(description = "操作人员")
|
||||
@ApiModelProperty("操作人员")
|
||||
private String operName;
|
||||
|
||||
public static MappingSwitchVo toMappingSwitchVo(MappingSwitchInfo mappingSwitchInfo) {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package cn.fateverse.admin.mapper;
|
||||
|
||||
import cn.fateverse.common.core.entity.Role;
|
||||
import cn.fateverse.admin.entity.Role;
|
||||
import cn.fateverse.admin.query.RoleQuery;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
|
||||
@@ -2,11 +2,8 @@ package cn.fateverse.admin.mapper;
|
||||
|
||||
import cn.fateverse.admin.query.UserQuery;
|
||||
import cn.fateverse.admin.vo.UserVo;
|
||||
import cn.fateverse.common.core.entity.User;
|
||||
import cn.fateverse.common.core.entity.UserBase;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
@@ -46,7 +43,7 @@ public interface UserMapper extends BaseMapper<UserBase> {
|
||||
* @param roleId 角色id
|
||||
* @return 表格数据信息
|
||||
*/
|
||||
IPage<UserVo> selectUserListByExcludeRoleId(@Param("page") IPage<UserVo> page, @Param("roleId") Long roleId, @Param("userName") String userName, @Param("phoneNumber") String phoneNumber);
|
||||
List<UserVo> selectUserListByExcludeRoleId(@Param("roleId") Long roleId, @Param("userName") String userName, @Param("phoneNumber") String phoneNumber);
|
||||
|
||||
|
||||
/**
|
||||
@@ -57,7 +54,7 @@ public interface UserMapper extends BaseMapper<UserBase> {
|
||||
* @param phoneNumber 手机号码
|
||||
* @return 用户列表
|
||||
*/
|
||||
IPage<UserVo> selectUserListByExcludePostId(@Param("page") IPage<UserVo> page, @Param("postId") Long postId, @Param("userName") String userName, @Param("phoneNumber") String phoneNumber);
|
||||
List<UserVo> selectUserListByExcludePostId(@Param("postId") Long postId, @Param("userName") String userName, @Param("phoneNumber") String phoneNumber);
|
||||
|
||||
|
||||
/**
|
||||
|
||||
@@ -6,7 +6,6 @@ import cn.fateverse.admin.vo.UserChooseVo;
|
||||
import cn.fateverse.admin.vo.UserDetailVo;
|
||||
import cn.fateverse.admin.vo.UserVo;
|
||||
import cn.fateverse.common.core.entity.User;
|
||||
import cn.fateverse.common.core.entity.UserBase;
|
||||
import cn.fateverse.common.core.result.page.TableDataInfo;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
|
||||
@@ -16,7 +15,7 @@ import java.util.List;
|
||||
* @author Clay
|
||||
* @date 2022/10/30
|
||||
*/
|
||||
public interface UserService extends IService<UserBase> {
|
||||
public interface UserService extends IService<User> {
|
||||
|
||||
/**
|
||||
* 通过用户名查询用户信息
|
||||
|
||||
@@ -9,6 +9,7 @@ import cn.fateverse.admin.mapper.DictDataMapper;
|
||||
import cn.fateverse.admin.service.DictCacheService;
|
||||
import cn.fateverse.admin.service.DictDataService;
|
||||
import cn.fateverse.common.core.entity.Option;
|
||||
import cn.fateverse.common.core.exception.CustomException;
|
||||
import cn.fateverse.common.core.result.page.TableDataInfo;
|
||||
import cn.fateverse.common.mybatis.utils.PageUtils;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package cn.fateverse.admin.service.impl;
|
||||
|
||||
import cn.fateverse.admin.dto.MenuDto;
|
||||
import cn.fateverse.common.core.entity.User;
|
||||
import cn.fateverse.admin.entity.User;
|
||||
import cn.fateverse.admin.vo.MenuSimpVo;
|
||||
import cn.fateverse.admin.vo.MenuVo;
|
||||
import cn.fateverse.admin.vo.OptionMenuVo;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package cn.fateverse.admin.service.impl;
|
||||
|
||||
import cn.fateverse.admin.dto.RoleDto;
|
||||
import cn.fateverse.common.core.entity.Role;
|
||||
import cn.fateverse.admin.entity.Role;
|
||||
import cn.fateverse.admin.query.RoleQuery;
|
||||
import cn.fateverse.admin.vo.RoleVo;
|
||||
import cn.fateverse.admin.entity.RoleMenu;
|
||||
|
||||
@@ -11,7 +11,6 @@ import cn.fateverse.admin.vo.UserChooseVo;
|
||||
import cn.fateverse.admin.vo.UserDetailVo;
|
||||
import cn.fateverse.admin.vo.UserVo;
|
||||
import cn.fateverse.common.core.entity.Dept;
|
||||
import cn.fateverse.common.core.entity.Role;
|
||||
import cn.fateverse.common.core.entity.User;
|
||||
import cn.fateverse.common.core.entity.UserBase;
|
||||
import cn.fateverse.common.core.exception.CustomException;
|
||||
@@ -21,10 +20,7 @@ import cn.fateverse.common.core.utils.ObjectUtils;
|
||||
import cn.fateverse.common.mybatisplus.utils.PageUtils;
|
||||
import cn.fateverse.common.security.utils.SecurityUtils;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
@@ -41,16 +37,29 @@ import java.util.stream.Collectors;
|
||||
*/
|
||||
@Slf4j
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class UserServiceImpl extends ServiceImpl<UserMapper, UserBase>
|
||||
implements UserService {
|
||||
|
||||
private final UserMapper userMapper;
|
||||
|
||||
private final UserRoleMapper userRoleMapper;
|
||||
|
||||
private final UserPostMapper userPostMapper;
|
||||
|
||||
private final RoleMapper roleMapper;
|
||||
|
||||
private final DeptMapper deptMapper;
|
||||
|
||||
public UserServiceImpl(UserMapper userMapper,
|
||||
UserRoleMapper userRoleMapper,
|
||||
UserPostMapper userPostMapper,
|
||||
RoleMapper roleMapper, DeptMapper deptMapper) {
|
||||
this.userMapper = userMapper;
|
||||
this.userRoleMapper = userRoleMapper;
|
||||
this.userPostMapper = userPostMapper;
|
||||
this.roleMapper = roleMapper;
|
||||
this.deptMapper = deptMapper;
|
||||
}
|
||||
|
||||
@Override
|
||||
public User searchByUserName(String username) {
|
||||
@@ -151,9 +160,10 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, UserBase>
|
||||
|
||||
@Override
|
||||
public TableDataInfo<UserVo> searchUserListByExcludeRoleId(Long roleId, String userName, String phoneNumber) {
|
||||
Page<UserVo> page = PageUtils.getPage();
|
||||
IPage<UserVo> mapperPage = userMapper.selectUserListByExcludeRoleId(page, roleId, userName, phoneNumber);
|
||||
return PageUtils.convertDataTable(mapperPage);
|
||||
PageUtils.startPage();
|
||||
List<UserVo> list = userMapper.selectUserListByExcludeRoleId(roleId, userName, phoneNumber);
|
||||
Long total = PageUtils.getTotal(list);
|
||||
return PageUtils.convertDataTable(list, total);
|
||||
}
|
||||
|
||||
|
||||
@@ -187,9 +197,10 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, UserBase>
|
||||
|
||||
@Override
|
||||
public TableDataInfo<UserVo> searchUserListByExcludePostId(Long postId, String userName, String phoneNumber) {
|
||||
IPage<UserVo> page = PageUtils.getPage();
|
||||
IPage<UserVo> mapperPage = userMapper.selectUserListByExcludePostId(page, postId, userName, phoneNumber);
|
||||
return PageUtils.convertDataTable(mapperPage);
|
||||
PageUtils.startPage();
|
||||
List<UserVo> list = userMapper.selectUserListByExcludePostId(postId, userName, phoneNumber);
|
||||
Long total = PageUtils.getTotal(list);
|
||||
return PageUtils.convertDataTable(list, total);
|
||||
}
|
||||
|
||||
|
||||
@@ -255,16 +266,15 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, UserBase>
|
||||
|
||||
@Override
|
||||
public TableDataInfo<UserVo> searchUserListByExcludeDeptId(Long deptId, String userName, String phoneNumber) {
|
||||
// PageUtils.startPage();
|
||||
// Dept dept = deptMapper.selectById(deptId);
|
||||
// if (null == dept) {
|
||||
// throw new CustomException("当前部门不存在");
|
||||
// }
|
||||
//// dept.getAncestors()
|
||||
// List<UserVo> list = userMapper.searchUserListByExcludeDeptId(deptId, userName, phoneNumber);
|
||||
// Long total = PageUtils.getTotal(list);
|
||||
// return PageUtils.convertDataTable(list, total);
|
||||
return PageUtils.emptyTable();
|
||||
PageUtils.startPage();
|
||||
Dept dept = deptMapper.selectById(deptId);
|
||||
if (null == dept) {
|
||||
throw new CustomException("当前部门不存在");
|
||||
}
|
||||
// dept.getAncestors()
|
||||
List<UserVo> list = userMapper.searchUserListByExcludeDeptId(deptId, userName, phoneNumber);
|
||||
Long total = PageUtils.getTotal(list);
|
||||
return PageUtils.convertDataTable(list, total);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -413,6 +423,4 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, UserBase>
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -50,11 +50,6 @@
|
||||
<groupId>cn.fateverse</groupId>
|
||||
<artifactId>common-file</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>cn.fateverse</groupId>
|
||||
<artifactId>admin-api</artifactId>
|
||||
</dependency>
|
||||
|
||||
</dependencies>
|
||||
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package cn.fateverse.auth.entity;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
@@ -16,26 +16,26 @@ public class LoginBody {
|
||||
/**
|
||||
* 用户名
|
||||
*/
|
||||
@Schema(description = "用户名")
|
||||
@ApiModelProperty("用户名")
|
||||
@NotBlank(message = "用户名不能为空")
|
||||
private String username;
|
||||
|
||||
/**
|
||||
* 用户密码
|
||||
*/
|
||||
@Schema(description = "用户密码")
|
||||
@ApiModelProperty("用户密码")
|
||||
@NotBlank(message = "密码不能为空")
|
||||
private String password;
|
||||
/**
|
||||
* 验证码uuid
|
||||
*/
|
||||
@Schema(description = "验证码uuid")
|
||||
@ApiModelProperty("验证码uuid")
|
||||
@NotBlank(message = "验证码uuid")
|
||||
private String uuid;
|
||||
/**
|
||||
* 验证码
|
||||
*/
|
||||
@Schema(description = "验证码")
|
||||
@ApiModelProperty("验证码")
|
||||
@NotBlank(message = "验证码不能为空")
|
||||
private String code;
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package cn.fateverse.auth.entity;
|
||||
|
||||
import cn.fateverse.common.core.entity.User;
|
||||
import cn.fateverse.admin.entity.User;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
package cn.fateverse.auth.service;
|
||||
|
||||
import cn.fateverse.common.core.entity.User;
|
||||
import cn.fateverse.admin.dubbo.DubboUserService;
|
||||
import cn.fateverse.common.core.enums.UserState;
|
||||
import cn.fateverse.common.core.exception.CustomException;
|
||||
import cn.fateverse.common.core.utils.ObjectUtils;
|
||||
import cn.fateverse.common.core.entity.LoginUser;
|
||||
import cn.fateverse.common.security.dubbo.DubboUserSearchService;
|
||||
import cn.fateverse.admin.entity.User;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.dubbo.config.annotation.DubboReference;
|
||||
import org.springframework.security.core.userdetails.UserDetails;
|
||||
@@ -22,7 +22,7 @@ import org.springframework.stereotype.Component;
|
||||
public class UserDetailsServiceImpl implements UserDetailsService {
|
||||
|
||||
@DubboReference
|
||||
private DubboUserSearchService userService;
|
||||
private DubboUserService userService;
|
||||
|
||||
|
||||
@Override
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
package cn.fateverse.auth.service.impl;
|
||||
|
||||
import cn.fateverse.auth.entity.UserInfo;
|
||||
import cn.fateverse.common.core.entity.Role;
|
||||
import cn.fateverse.common.core.entity.User;
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import cn.fateverse.admin.dubbo.DubboMenuService;
|
||||
import cn.fateverse.admin.dubbo.DubboUserService;
|
||||
import cn.fateverse.admin.vo.RouterVo;
|
||||
import cn.fateverse.auth.entity.LoginBody;
|
||||
import cn.fateverse.auth.service.LoginService;
|
||||
import cn.fateverse.admin.entity.Role;
|
||||
import cn.fateverse.admin.entity.User;
|
||||
import cn.fateverse.common.core.constant.CacheConstants;
|
||||
import cn.fateverse.common.core.constant.DateConstants;
|
||||
import cn.fateverse.common.core.exception.CustomException;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package cn.fateverse.auth.service.impl;
|
||||
|
||||
import cn.fateverse.admin.dubbo.DubboMenuService;
|
||||
import cn.fateverse.admin.entity.User;
|
||||
import cn.fateverse.common.core.entity.LoginUser;
|
||||
import cn.fateverse.common.core.entity.User;
|
||||
import org.apache.dubbo.config.annotation.DubboReference;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package cn.fateverse.code.entity;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
@@ -15,41 +15,41 @@ public class ApiClass {
|
||||
/**
|
||||
* 类id
|
||||
*/
|
||||
@Schema(description = "类id")
|
||||
@ApiModelProperty("类id")
|
||||
private String classId;
|
||||
/**
|
||||
* 模块id
|
||||
*/
|
||||
@Schema(description = "模块id")
|
||||
@ApiModelProperty("模块id")
|
||||
private String moduleId;
|
||||
/**
|
||||
* 类名
|
||||
*/
|
||||
@Schema(description = "类名")
|
||||
@ApiModelProperty("类名")
|
||||
private String className;
|
||||
/**
|
||||
* 类描述
|
||||
*/
|
||||
@Schema(description = "类描述")
|
||||
@ApiModelProperty("类描述")
|
||||
private String classDescribe;
|
||||
/**
|
||||
* 包名
|
||||
*/
|
||||
@Schema(description = "包名")
|
||||
@ApiModelProperty("包名")
|
||||
private String packageName;
|
||||
/**
|
||||
* 作者
|
||||
*/
|
||||
@Schema(description = "作者")
|
||||
@ApiModelProperty("作者")
|
||||
private String author;
|
||||
/**
|
||||
* 电子邮件
|
||||
*/
|
||||
@Schema(description = "电子邮件")
|
||||
@ApiModelProperty("电子邮件")
|
||||
private String email;
|
||||
/**
|
||||
* 前缀
|
||||
*/
|
||||
@Schema(description = "前缀")
|
||||
@ApiModelProperty("前缀")
|
||||
private String prefix;
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package cn.fateverse.code.entity;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
@@ -15,52 +15,52 @@ public class InterTable {
|
||||
/**
|
||||
* id
|
||||
*/
|
||||
@Schema(description = "id")
|
||||
@ApiModelProperty("id")
|
||||
private String interId;
|
||||
/**
|
||||
* 模块id
|
||||
*/
|
||||
@Schema(description = "模块id")
|
||||
@ApiModelProperty("模块id")
|
||||
private String moduleId;
|
||||
/**
|
||||
* 类id
|
||||
*/
|
||||
@Schema(description = "类id")
|
||||
@ApiModelProperty("类id")
|
||||
private String classId;
|
||||
/**
|
||||
* 接口名称
|
||||
*/
|
||||
@Schema(description = "接口名称")
|
||||
@ApiModelProperty("接口名称")
|
||||
private String itName;
|
||||
/**
|
||||
* 描述
|
||||
*/
|
||||
@Schema(description = "描述")
|
||||
@ApiModelProperty("描述")
|
||||
private String itDescribe;
|
||||
/**
|
||||
* 是否设置许可
|
||||
*/
|
||||
@Schema(description = "是否设置许可")
|
||||
@ApiModelProperty("是否设置许可")
|
||||
private String isPermission;
|
||||
/**
|
||||
* 请求路径
|
||||
*/
|
||||
@Schema(description = "请求路径")
|
||||
@ApiModelProperty("请求路径")
|
||||
private String reqUrl;
|
||||
/**
|
||||
* 请求方式
|
||||
*/
|
||||
@Schema(description = "请求方式")
|
||||
@ApiModelProperty("请求方式")
|
||||
private String method;
|
||||
/**
|
||||
* 是否生成
|
||||
*/
|
||||
@Schema(description = "是否生成")
|
||||
@ApiModelProperty("是否生成")
|
||||
private String isGenerate;
|
||||
/**
|
||||
* 类型(1,工作台,2流程)
|
||||
*/
|
||||
@Schema(description = "类型(1,工作台,2流程)")
|
||||
@ApiModelProperty("类型(1,工作台,2流程)")
|
||||
private String type;
|
||||
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ package cn.fateverse.code.entity;
|
||||
|
||||
import cn.fateverse.common.core.entity.BaseEntity;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
@@ -17,16 +17,16 @@ public class Module extends BaseEntity {
|
||||
/**
|
||||
* 模块id
|
||||
*/
|
||||
@Schema(description = "模块id")
|
||||
@ApiModelProperty("模块id")
|
||||
private Long modeId;
|
||||
/**
|
||||
* 模块名称
|
||||
*/
|
||||
@Schema(description = "模块名称")
|
||||
@ApiModelProperty("模块名称")
|
||||
private String modeName;
|
||||
/**
|
||||
* 模块描述
|
||||
*/
|
||||
@Schema(description = "模块描述")
|
||||
@ApiModelProperty("模块描述")
|
||||
private String modeDescribe;
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@ package cn.fateverse.code.entity;
|
||||
|
||||
import cn.fateverse.common.core.entity.BaseEntity;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
@@ -16,66 +16,66 @@ public class RelTable extends BaseEntity {
|
||||
/**
|
||||
* 关联表id
|
||||
*/
|
||||
@Schema(description = "关联表id")
|
||||
@ApiModelProperty("关联表id")
|
||||
private Long relTableId;
|
||||
/**
|
||||
* 主表id
|
||||
*/
|
||||
@Schema(description = "主表id")
|
||||
@ApiModelProperty("主表id")
|
||||
private Long tableId;
|
||||
/**
|
||||
* 关联子表表名
|
||||
*/
|
||||
@Schema(description = "关联子表表名")
|
||||
@ApiModelProperty("关联子表表名")
|
||||
private String relName;
|
||||
/**
|
||||
* 子表简称
|
||||
*/
|
||||
@Schema(description = "子表简称")
|
||||
@ApiModelProperty("子表简称")
|
||||
private String relAs;
|
||||
/**
|
||||
* 父表名称
|
||||
*/
|
||||
@Schema(description = "父表名称")
|
||||
@ApiModelProperty("父表名称")
|
||||
private String tableName;
|
||||
/**
|
||||
* 父表名简称
|
||||
*/
|
||||
@Schema(description = "父表名简称")
|
||||
@ApiModelProperty("父表名简称")
|
||||
private String tableAs;
|
||||
/**
|
||||
* 表描述
|
||||
*/
|
||||
@Schema(description = "表描述")
|
||||
@ApiModelProperty("表描述")
|
||||
private String relComment;
|
||||
/**
|
||||
* 关联子表的字段
|
||||
*/
|
||||
@Schema(description = "关联子表的字段")
|
||||
@ApiModelProperty("关联子表的字段")
|
||||
private String relColumn;
|
||||
/**
|
||||
* 关联父表字段
|
||||
*/
|
||||
@Schema(description = "关联父表字段")
|
||||
@ApiModelProperty("关联父表字段")
|
||||
private String tableColumn;
|
||||
/**
|
||||
* 实体类名称(子表)
|
||||
*/
|
||||
@Schema(description = "实体类名称(子表)")
|
||||
@ApiModelProperty("实体类名称(子表)")
|
||||
private String relClass;
|
||||
/**
|
||||
* 实体类名称(子表)小写
|
||||
*/
|
||||
@Schema(description = "实体类名称(子表)小写")
|
||||
@ApiModelProperty("实体类名称(子表)小写")
|
||||
private String relClassLower;
|
||||
/**
|
||||
* 关联类型
|
||||
*/
|
||||
@Schema(description = "关联类型")
|
||||
@ApiModelProperty("关联类型")
|
||||
private String queryType;
|
||||
/**
|
||||
* 排序
|
||||
*/
|
||||
@Schema(description = "排序")
|
||||
@ApiModelProperty("排序")
|
||||
private String sort;
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@ package cn.fateverse.code.entity;
|
||||
|
||||
import cn.fateverse.common.core.entity.BaseEntity;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
@@ -16,67 +16,67 @@ public class RelTableColumn extends BaseEntity {
|
||||
/**
|
||||
* 子表字段id
|
||||
*/
|
||||
@Schema(description = "子表字段id")
|
||||
@ApiModelProperty("子表字段id")
|
||||
private Long relColumnId;
|
||||
/**
|
||||
* 归属表编号
|
||||
*/
|
||||
@Schema(description = "归属表编号")
|
||||
@ApiModelProperty("归属表编号")
|
||||
private Long relTableId;
|
||||
/**
|
||||
* 列名称
|
||||
*/
|
||||
@Schema(description = "列名称")
|
||||
@ApiModelProperty("列名称")
|
||||
private String columnName;
|
||||
/**
|
||||
* 列描述
|
||||
*/
|
||||
@Schema(description = "列描述")
|
||||
@ApiModelProperty("列描述")
|
||||
private String columnComment;
|
||||
/**
|
||||
* 列类型
|
||||
*/
|
||||
@Schema(description = "列类型")
|
||||
@ApiModelProperty("列类型")
|
||||
private String columnType;
|
||||
/**
|
||||
* JAVA类型
|
||||
*/
|
||||
@Schema(description = "JAVA类型")
|
||||
@ApiModelProperty("JAVA类型")
|
||||
private String javaType;
|
||||
/**
|
||||
* JAVA字段名
|
||||
*/
|
||||
@Schema(description = "JAVA字段名")
|
||||
@ApiModelProperty("JAVA字段名")
|
||||
private String javaField;
|
||||
/**
|
||||
* 是否列表字段（1是）
|
||||
*/
|
||||
@Schema(description = "是否列表字段（1是）")
|
||||
@ApiModelProperty("是否列表字段（1是）")
|
||||
private String isList;
|
||||
/**
|
||||
* 是否查询字段（1是）
|
||||
*/
|
||||
@Schema(description = "是否查询字段（1是）")
|
||||
@ApiModelProperty("是否查询字段（1是）")
|
||||
private String isQuery;
|
||||
/**
|
||||
* 查询方式（等于、不等于、大于、小于、范围）
|
||||
*/
|
||||
@Schema(description = "查询方式（等于、不等于、大于、小于、范围）")
|
||||
@ApiModelProperty("查询方式（等于、不等于、大于、小于、范围）")
|
||||
private String queryType;
|
||||
/**
|
||||
* 显示类型（文本框、文本域、下拉框、复选框、单选框、日期控件）
|
||||
*/
|
||||
@Schema(description = "显示类型（文本框、文本域、下拉框、复选框、单选框、日期控件）")
|
||||
@ApiModelProperty("显示类型（文本框、文本域、下拉框、复选框、单选框、日期控件）")
|
||||
private String htmlType;
|
||||
/**
|
||||
* 字典类型
|
||||
*/
|
||||
@Schema(description = "字典类型")
|
||||
@ApiModelProperty("字典类型")
|
||||
private String dictType;
|
||||
/**
|
||||
* 排序
|
||||
*/
|
||||
@Schema(description = "排序")
|
||||
@ApiModelProperty("排序")
|
||||
private String sort;
|
||||
|
||||
}
|
||||
|
||||
@@ -6,7 +6,7 @@ import cn.fateverse.code.enums.DynamicSourceEnum;
|
||||
import cn.fateverse.code.enums.FrontTemplateEnum;
|
||||
import cn.fateverse.common.core.entity.BaseEntity;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
@@ -26,101 +26,101 @@ public class Table extends BaseEntity {
|
||||
/**
|
||||
* 编号
|
||||
*/
|
||||
@Schema(description = "编号")
|
||||
@ApiModelProperty("编号")
|
||||
private Long tableId;
|
||||
|
||||
private Long parentMenuId;
|
||||
/**
|
||||
* 数据源id
|
||||
*/
|
||||
@Schema(description = "数据源id")
|
||||
@ApiModelProperty("数据源id")
|
||||
private Long dataSourceId;
|
||||
|
||||
@Schema(description = "数据源类型")
|
||||
@ApiModelProperty("数据源类型")
|
||||
private DynamicSourceEnum dataSourceType;
|
||||
|
||||
/**
|
||||
* 表名称
|
||||
*/
|
||||
@Schema(description = "表名称")
|
||||
@ApiModelProperty("表名称")
|
||||
private String tableName;
|
||||
|
||||
/**
|
||||
* 表描述
|
||||
*/
|
||||
@Schema(description = "表描述")
|
||||
@ApiModelProperty("表描述")
|
||||
private String tableComment;
|
||||
|
||||
/**
|
||||
* 关联子表的表名
|
||||
*/
|
||||
@Schema(description = "关联子表的表名")
|
||||
@ApiModelProperty("关联子表的表名")
|
||||
private String subTableName;
|
||||
|
||||
/**
|
||||
* 子表关联的外键名
|
||||
*/
|
||||
@Schema(description = "子表关联的外键名")
|
||||
@ApiModelProperty("子表关联的外键名")
|
||||
private String subTableFkName;
|
||||
|
||||
/**
|
||||
* 实体类名称
|
||||
*/
|
||||
@Schema(description = "实体类名称")
|
||||
@ApiModelProperty("实体类名称")
|
||||
private String className;
|
||||
|
||||
/**
|
||||
* 使用的模板（crud单表操作 tree树表操作）
|
||||
*/
|
||||
@Schema(description = "使用的模板")
|
||||
@ApiModelProperty("使用的模板")
|
||||
private String tplCategory;
|
||||
|
||||
/**
|
||||
* 生成包路径
|
||||
*/
|
||||
@Schema(description = "生成包路径")
|
||||
@ApiModelProperty("生成包路径")
|
||||
private String packageName;
|
||||
|
||||
/**
|
||||
* 生成模块名
|
||||
*/
|
||||
@Schema(description = "生成模块名")
|
||||
@ApiModelProperty("生成模块名")
|
||||
private String moduleName;
|
||||
|
||||
/**
|
||||
* 生成服务名
|
||||
*/
|
||||
@Schema(description = "生成服务名")
|
||||
@ApiModelProperty("生成服务名")
|
||||
private String serviceName;
|
||||
|
||||
/**
|
||||
* 生成业务名
|
||||
*/
|
||||
@Schema(description = "生成业务名")
|
||||
@ApiModelProperty("生成业务名")
|
||||
private String businessName;
|
||||
|
||||
/**
|
||||
* 生成功能名
|
||||
*/
|
||||
@Schema(description = "生成功能名")
|
||||
@ApiModelProperty("生成功能名")
|
||||
private String functionName;
|
||||
|
||||
/**
|
||||
* 生成功能作者
|
||||
*/
|
||||
@Schema(description = "生成功能作者")
|
||||
@ApiModelProperty("生成功能作者")
|
||||
private String functionAuthor;
|
||||
|
||||
@Schema(description = "后端模板 0: mybatis 1: mybatispuls ")
|
||||
@ApiModelProperty("后端模板 0: mybatis 1: mybatispuls ")
|
||||
private BackTemplateEnum backTemplate;
|
||||
|
||||
@Schema(description = "前端模板 0: vue 1: react")
|
||||
@ApiModelProperty("前端模板 0: vue 1: react")
|
||||
private FrontTemplateEnum frontTemplate;
|
||||
|
||||
/**
|
||||
* 其它生成选项
|
||||
*/
|
||||
@Schema(description = "其它生成选项")
|
||||
@ApiModelProperty("其它生成选项")
|
||||
private String options;
|
||||
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ import cn.fateverse.common.core.annotaion.EnableAutoField;
|
||||
import cn.fateverse.common.core.entity.BaseEntity;
|
||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.springframework.util.ObjectUtils;
|
||||
@@ -22,108 +22,108 @@ public class TableColumn extends BaseEntity {
|
||||
/**
|
||||
* 编号
|
||||
*/
|
||||
@Schema(description = "编号")
|
||||
@ApiModelProperty("编号")
|
||||
private Long columnId;
|
||||
/**
|
||||
* 归属表编号
|
||||
*/
|
||||
@Schema(description = "归属表编号")
|
||||
@ApiModelProperty("归属表编号")
|
||||
private Long tableId;
|
||||
/**
|
||||
* 列名称
|
||||
*/
|
||||
@Schema(description = "列名称")
|
||||
@ApiModelProperty("列名称")
|
||||
private String columnName;
|
||||
/**
|
||||
* 列描述
|
||||
*/
|
||||
@Schema(description = "列描述")
|
||||
@ApiModelProperty("列描述")
|
||||
private String columnComment;
|
||||
/**
|
||||
* 列类型
|
||||
*/
|
||||
@Schema(description = "列类型")
|
||||
@ApiModelProperty("列类型")
|
||||
private String columnType;
|
||||
|
||||
@Schema(description = "列长度")
|
||||
@ApiModelProperty("列长度")
|
||||
private Integer columnLength;
|
||||
|
||||
@Schema(description = "列精度")
|
||||
@ApiModelProperty("列精度")
|
||||
private Integer columnScale;
|
||||
/**
|
||||
* JAVA类型
|
||||
*/
|
||||
@Schema(description = "JAVA类型")
|
||||
@ApiModelProperty("JAVA类型")
|
||||
private String javaType;
|
||||
/**
|
||||
* JAVA字段名
|
||||
*/
|
||||
@Schema(description = "JAVA字段名")
|
||||
@ApiModelProperty("JAVA字段名")
|
||||
private String javaField;
|
||||
/**
|
||||
* 是否主键（1是）
|
||||
*/
|
||||
@Schema(description = "是否主键（1是）")
|
||||
@ApiModelProperty("是否主键（1是）")
|
||||
private String isPk;
|
||||
/**
|
||||
* 是否自增（1是）
|
||||
*/
|
||||
@Schema(description = "是否自增（1是）")
|
||||
@ApiModelProperty("是否自增（1是）")
|
||||
private String isIncrement;
|
||||
/**
|
||||
* 是否必填（1是）
|
||||
*/
|
||||
@Schema(description = "是否必填（1是）")
|
||||
@ApiModelProperty("是否必填（1是）")
|
||||
private String isRequired;
|
||||
/**
|
||||
* 是否为插入字段（1是）
|
||||
*/
|
||||
@Schema(description = "是否为插入字段（1是）")
|
||||
@ApiModelProperty("是否为插入字段（1是）")
|
||||
private String isInsert;
|
||||
/**
|
||||
* 是否编辑字段（1是）
|
||||
*/
|
||||
@Schema(description = "是否编辑字段（1是）")
|
||||
@ApiModelProperty("是否编辑字段（1是）")
|
||||
private String isEdit;
|
||||
/**
|
||||
* 是否列表字段（1是）
|
||||
*/
|
||||
@Schema(description = "是否列表字段（1是）")
|
||||
@ApiModelProperty("是否列表字段（1是）")
|
||||
private String isList;
|
||||
/**
|
||||
* 是否查询字段（1是）
|
||||
*/
|
||||
@Schema(description = "是否查询字段（1是）")
|
||||
@ApiModelProperty("是否查询字段（1是）")
|
||||
private String isQuery;
|
||||
/**
|
||||
* 是否正则(1 否)
|
||||
*/
|
||||
@Schema(description = "是否正则(1 否)")
|
||||
@ApiModelProperty("是否正则(1 否)")
|
||||
private Long isRegular;
|
||||
/**
|
||||
* 正则表达式内容
|
||||
*/
|
||||
@Schema(description = "正则表达式内容")
|
||||
@ApiModelProperty("正则表达式内容")
|
||||
private String regular;
|
||||
/**
|
||||
* 查询方式（等于、不等于、大于、小于、范围）
|
||||
*/
|
||||
@Schema(description = "查询方式（等于、不等于、大于、小于、范围）")
|
||||
@ApiModelProperty("查询方式（等于、不等于、大于、小于、范围）")
|
||||
private String queryType;
|
||||
/**
|
||||
* 显示类型（文本框、文本域、下拉框、复选框、单选框、日期控件）
|
||||
*/
|
||||
@Schema(description = "显示类型（文本框、文本域、下拉框、复选框、单选框、日期控件）")
|
||||
@ApiModelProperty("显示类型（文本框、文本域、下拉框、复选框、单选框、日期控件）")
|
||||
private String htmlType;
|
||||
/**
|
||||
* 字典类型
|
||||
*/
|
||||
@Schema(description = "字典类型")
|
||||
@ApiModelProperty("字典类型")
|
||||
private String dictType;
|
||||
/**
|
||||
* 排序
|
||||
*/
|
||||
@Schema(description = "排序")
|
||||
@ApiModelProperty("排序")
|
||||
private String sort;
|
||||
|
||||
/**
|
||||
|
||||
@@ -3,7 +3,7 @@ package cn.fateverse.code.entity.dto;
|
||||
import cn.fateverse.code.entity.CodeDataSource;
|
||||
import cn.fateverse.code.enums.DynamicSourceEnum;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
@@ -29,64 +29,64 @@ public class DataSourceDto {
|
||||
/**
|
||||
* 数据源id
|
||||
*/
|
||||
@Schema(description = "数据源id")
|
||||
@ApiModelProperty("数据源id")
|
||||
private Long dsId;
|
||||
|
||||
/**
|
||||
* 数据源名称
|
||||
*/
|
||||
@Schema(description = "数据源名称")
|
||||
@ApiModelProperty("数据源名称")
|
||||
@NotBlank(message = "数据源名称不能为空")
|
||||
private String dsName;
|
||||
|
||||
/**
|
||||
* 数据源用户名
|
||||
*/
|
||||
@Schema(description = "数据源用户名")
|
||||
@ApiModelProperty("数据源用户名")
|
||||
@NotBlank(message = "数据源用户名")
|
||||
private String username;
|
||||
|
||||
/**
|
||||
* 数据源密码
|
||||
*/
|
||||
@Schema(description = "数据源密码")
|
||||
@ApiModelProperty("数据源密码")
|
||||
private String password;
|
||||
|
||||
/**
|
||||
* 数据源主机
|
||||
*/
|
||||
@Schema(description = "数据源主机")
|
||||
@ApiModelProperty("数据源主机")
|
||||
private String host;
|
||||
|
||||
/**
|
||||
* 数据源主机端口
|
||||
*/
|
||||
@Schema(description = "数据源主机端口")
|
||||
@ApiModelProperty("数据源主机端口")
|
||||
private Integer port;
|
||||
|
||||
/**
|
||||
* 数据源类型
|
||||
*/
|
||||
@Schema(description = "数据源类型")
|
||||
@ApiModelProperty("数据源类型")
|
||||
@NotNull(message = "数据源类型不能为空")
|
||||
private DynamicSourceEnum type;
|
||||
|
||||
/**
|
||||
* 数据库名称
|
||||
*/
|
||||
@Schema(description = "数据库名称")
|
||||
@ApiModelProperty("数据库名称")
|
||||
private String dbName;
|
||||
|
||||
/**
|
||||
* 数据库连接地址
|
||||
*/
|
||||
@Schema(description = "数据库连接地址")
|
||||
@ApiModelProperty("数据库连接地址")
|
||||
private String jdbcUrl;
|
||||
|
||||
/**
|
||||
* 数据源类型 (1:主机 2:jdbc连接url)
|
||||
*/
|
||||
@Schema(description = "数据源类型 (1:主机 2:jdbc连接url)")
|
||||
@ApiModelProperty("数据源类型 (1:主机 2:jdbc连接url)")
|
||||
@Max(value = 2, message = "参数不合法")
|
||||
@Min(value = 1, message = "参数不合法")
|
||||
private Integer confType;
|
||||
|
||||
@@ -2,7 +2,7 @@ package cn.fateverse.code.entity.dto;
|
||||
|
||||
import cn.fateverse.code.entity.Regular;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
@@ -21,34 +21,34 @@ public class RegularDto {
|
||||
/**
|
||||
* id
|
||||
*/
|
||||
@Schema(description = "id")
|
||||
@ApiModelProperty("id")
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 正则名称
|
||||
*/
|
||||
@Schema(description = "正则名称")
|
||||
@ApiModelProperty("正则名称")
|
||||
@NotBlank(message = "正则名称不能为空!")
|
||||
private String name;
|
||||
|
||||
/**
|
||||
* 正则内容
|
||||
*/
|
||||
@Schema(description = "正则内容")
|
||||
@ApiModelProperty("正则内容")
|
||||
@NotBlank(message = "正则内容不能为空!")
|
||||
private String regular;
|
||||
|
||||
/**
|
||||
* 验证内容
|
||||
*/
|
||||
@Schema(description = "验证内容")
|
||||
@ApiModelProperty("验证内容")
|
||||
@NotBlank(message = "验证内容不能为空!")
|
||||
private String validation;
|
||||
|
||||
/**
|
||||
* 是否启用 1:启动 2:关闭
|
||||
*/
|
||||
@Schema(description = "是否启用 1:启动 0:关闭")
|
||||
@ApiModelProperty("是否启用 1:启动 0:关闭")
|
||||
@NotNull(message = "是否启用不能为空!")
|
||||
private String enable;
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package cn.fateverse.code.entity.query;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
|
||||
@@ -13,7 +13,7 @@ public class DataSourceQuery {
|
||||
/**
|
||||
* 数据源名称
|
||||
*/
|
||||
@Schema(description = "数据源名称")
|
||||
@ApiModelProperty("数据源名称")
|
||||
private String dsName;
|
||||
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package cn.fateverse.code.entity.query;
|
||||
|
||||
import cn.fateverse.common.core.entity.QueryTime;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
@@ -23,13 +23,13 @@ public class DynamicTable extends QueryTime {
|
||||
/**
|
||||
* 表名称
|
||||
*/
|
||||
@Schema(description = "表名称")
|
||||
@ApiModelProperty("表名称")
|
||||
private String tableName;
|
||||
|
||||
/**
|
||||
* 表注释
|
||||
*/
|
||||
@Schema(description = "表注释")
|
||||
@ApiModelProperty("表注释")
|
||||
private String tableComment;
|
||||
|
||||
private Date createTime;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package cn.fateverse.code.entity.query;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
@@ -21,18 +21,18 @@ public class RegularQuery {
|
||||
/**
|
||||
* 正则名称
|
||||
*/
|
||||
@Schema(description = "正则名称")
|
||||
@ApiModelProperty("正则名称")
|
||||
private String name;
|
||||
|
||||
/**
|
||||
* 正则内容
|
||||
*/
|
||||
@Schema(description = "正则内容")
|
||||
@ApiModelProperty("正则内容")
|
||||
private String regular;
|
||||
|
||||
/**
|
||||
* 是否启用 1:启动 2:关闭
|
||||
*/
|
||||
@Schema(description = "是否启用 1:启动 0:关闭")
|
||||
@ApiModelProperty("是否启用 1:启动 0:关闭")
|
||||
private Integer enable;
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@ package cn.fateverse.code.entity.query;
|
||||
|
||||
import cn.fateverse.common.core.entity.QueryTime;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
@@ -22,21 +22,21 @@ public class TableQuery extends QueryTime {
|
||||
/**
|
||||
* 数据源id
|
||||
*/
|
||||
@Schema(description = "数据源id")
|
||||
@ApiModelProperty("数据源id")
|
||||
private Long dataSourceId;
|
||||
|
||||
/**
|
||||
* 表名称
|
||||
*/
|
||||
@Schema(description = "表名称")
|
||||
@ApiModelProperty("表名称")
|
||||
private String tableName;
|
||||
|
||||
/**
|
||||
* 表描述
|
||||
*/
|
||||
@Schema(description = "表描述")
|
||||
@ApiModelProperty("表描述")
|
||||
private String tableComment;
|
||||
|
||||
@Schema(description = "数据类型")
|
||||
@ApiModelProperty("数据类型")
|
||||
private String dataSourceType;
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@ package cn.fateverse.code.entity.vo;
|
||||
import cn.fateverse.code.entity.CodeDataSource;
|
||||
import cn.fateverse.common.core.annotaion.Excel;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
@@ -28,68 +28,68 @@ public class DataSourceVo implements Serializable {
|
||||
/**
|
||||
* 数据源id
|
||||
*/
|
||||
@Schema(description = "数据源id")
|
||||
@ApiModelProperty("数据源id")
|
||||
private Long dsId;
|
||||
|
||||
/**
|
||||
* 数据源名称
|
||||
*/
|
||||
@Schema(description = "数据源名称")
|
||||
@ApiModelProperty("数据源名称")
|
||||
@Excel("数据源名称")
|
||||
private String dsName;
|
||||
|
||||
/**
|
||||
* 数据源用户名
|
||||
*/
|
||||
@Schema(description = "数据源用户名")
|
||||
@ApiModelProperty("数据源用户名")
|
||||
@Excel("数据源用户名")
|
||||
private String username;
|
||||
|
||||
/**
|
||||
* 数据源密码
|
||||
*/
|
||||
@Schema(description = "数据源密码")
|
||||
@ApiModelProperty("数据源密码")
|
||||
@Excel("数据源密码")
|
||||
private String password;
|
||||
|
||||
/**
|
||||
* 数据源主机
|
||||
*/
|
||||
@Schema(description = "数据源主机")
|
||||
@ApiModelProperty("数据源主机")
|
||||
@Excel("数据源主机")
|
||||
private String host;
|
||||
|
||||
/**
|
||||
* 数据源主机端口
|
||||
*/
|
||||
@Schema(description = "数据源主机端口")
|
||||
@ApiModelProperty("数据源主机端口")
|
||||
@Excel("数据源主机端口")
|
||||
private Integer port;
|
||||
|
||||
/**
|
||||
* 数据源类型
|
||||
*/
|
||||
@Schema(description = "数据源类型")
|
||||
@ApiModelProperty("数据源类型")
|
||||
@Excel("数据源类型")
|
||||
private String dsType;
|
||||
|
||||
/**
|
||||
* 数据库名称
|
||||
*/
|
||||
@Schema(description = "数据库名称")
|
||||
@ApiModelProperty("数据库名称")
|
||||
@Excel("数据库名称")
|
||||
private String dbName;
|
||||
|
||||
/**
|
||||
* 数据库连接地址
|
||||
*/
|
||||
@Schema(description = "数据库连接地址")
|
||||
@ApiModelProperty("数据库连接地址")
|
||||
@Excel("数据库连接地址")
|
||||
private String jdbcUrl;
|
||||
/**
|
||||
* 数据源类型 (1:主机 2:jdbc连接url)
|
||||
*/
|
||||
@Schema(description = "数据源类型 (1:主机 2:jdbc连接url)")
|
||||
@ApiModelProperty("数据源类型 (1:主机 2:jdbc连接url)")
|
||||
@Max(value = 2, message = "参数不合法")
|
||||
@Min(value = 1, message = "参数不合法")
|
||||
@Excel("数据源类型")
|
||||
|
||||
@@ -3,7 +3,7 @@ package cn.fateverse.code.entity.vo;
|
||||
import cn.fateverse.code.entity.Regular;
|
||||
import cn.fateverse.common.core.annotaion.Excel;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
@@ -27,33 +27,33 @@ public class RegularVo {
|
||||
/**
|
||||
* id
|
||||
*/
|
||||
@Schema(description = "id")
|
||||
@ApiModelProperty("id")
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 正则名称
|
||||
*/
|
||||
@Schema(description = "正则名称")
|
||||
@ApiModelProperty("正则名称")
|
||||
@Excel("正则名称")
|
||||
private String name;
|
||||
|
||||
/**
|
||||
* 正则内容
|
||||
*/
|
||||
@Schema(description = "正则内容")
|
||||
@ApiModelProperty("正则内容")
|
||||
@Excel("正则内容")
|
||||
private String regular;
|
||||
|
||||
/**
|
||||
* 验证内容
|
||||
*/
|
||||
@Schema(description = "验证内容")
|
||||
@ApiModelProperty("验证内容")
|
||||
private String validation;
|
||||
|
||||
/**
|
||||
* 是否启用 1:启动 2:关闭
|
||||
*/
|
||||
@Schema(description = "是否启用 1:启动 2:关闭")
|
||||
@ApiModelProperty("是否启用 1:启动 2:关闭")
|
||||
@Excel(value = "是否启用",dictType = "regular_enable")
|
||||
private String enable;
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ package cn.fateverse.code.entity.vo;
|
||||
|
||||
import cn.fateverse.common.core.annotaion.Excel;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
@@ -24,34 +24,34 @@ public class TableVo {
|
||||
/**
|
||||
* 编号
|
||||
*/
|
||||
@Schema(description = "编号")
|
||||
@ApiModelProperty("编号")
|
||||
@Excel("编号")
|
||||
private Long tableId;
|
||||
|
||||
/**
|
||||
* 数据源id
|
||||
*/
|
||||
@Schema(description = "数据源id")
|
||||
@ApiModelProperty("数据源id")
|
||||
@Excel("数据源id")
|
||||
private Long dataSourceId;
|
||||
|
||||
/**
|
||||
* 表名称
|
||||
*/
|
||||
@Schema(description = "表名称")
|
||||
@ApiModelProperty("表名称")
|
||||
@Excel("表名称")
|
||||
private String tableName;
|
||||
|
||||
/**
|
||||
* 表描述
|
||||
*/
|
||||
@Schema(description = "表描述")
|
||||
@ApiModelProperty("表描述")
|
||||
@Excel("表描述")
|
||||
private String tableComment;
|
||||
/**
|
||||
* 实体类名称
|
||||
*/
|
||||
@Schema(description = "实体类名称")
|
||||
@ApiModelProperty("实体类名称")
|
||||
@Excel("实体类名称")
|
||||
private String className;
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ package ${packageName}.entity.dto;
|
||||
|
||||
import ${packageName}.entity.${ClassName};
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
#if($table.isRequired())
|
||||
import javax.validation.constraints.NotNull;
|
||||
@@ -28,7 +28,7 @@ public class ${ClassName}Dto {
|
||||
/**
|
||||
* ${pkColumn.columnComment}
|
||||
*/
|
||||
@Schema(description = "${pkColumn.columnComment}")
|
||||
@ApiModelProperty("${pkColumn.columnComment}")
|
||||
private $pkColumn.javaType $pkColumn.javaField;
|
||||
#foreach ($column in $columns)
|
||||
#if($column.from())
|
||||
@@ -42,7 +42,7 @@ public class ${ClassName}Dto {
|
||||
#if($column.isRegular())
|
||||
@Pattern(regexp = "${column.regular}",message = "${column.columnComment}格式错误!")
|
||||
#end
|
||||
@Schema(description = "${column.columnComment}")
|
||||
@ApiModelProperty("${column.columnComment}")
|
||||
private $column.javaType $column.javaField;
|
||||
#end
|
||||
#end
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package ${packageName}.entity.query;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
@@ -29,7 +29,7 @@ public class ${ClassName}Query {
|
||||
/**
|
||||
* $column.columnComment
|
||||
*/
|
||||
@Schema(description = "${column.columnComment}")
|
||||
@ApiModelProperty("${column.columnComment}")
|
||||
#if($column.javaType.equals("Date"))
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
#end
|
||||
@@ -39,7 +39,7 @@ public class ${ClassName}Query {
|
||||
/**
|
||||
* $column.columnComment 开始
|
||||
*/
|
||||
@Schema(description = "${column.columnComment}开始")
|
||||
@ApiModelProperty("${column.columnComment}开始")
|
||||
#if($column.javaType.equals("Date"))
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
#end
|
||||
@@ -48,7 +48,7 @@ public class ${ClassName}Query {
|
||||
/**
|
||||
* $column.columnComment 结束
|
||||
*/
|
||||
@Schema(description = "${column.columnComment}结束")
|
||||
@ApiModelProperty("${column.columnComment}结束")
|
||||
#if($column.javaType.equals("Date"))
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
#end
|
||||
|
||||
@@ -3,7 +3,7 @@ package ${packageName}.entity.vo;
|
||||
import ${packageName}.entity.${ClassName};
|
||||
import cn.fateverse.common.core.annotaion.Excel;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
@@ -29,7 +29,7 @@ public class ${ClassName}Vo {
|
||||
/**
|
||||
* ${pkColumn.columnComment}
|
||||
*/
|
||||
@Schema(description = "${pkColumn.columnComment}")
|
||||
@ApiModelProperty("${pkColumn.columnComment}")
|
||||
private $pkColumn.javaType $pkColumn.javaField;
|
||||
#foreach ($column in $columns)
|
||||
#if($column.list())
|
||||
@@ -37,7 +37,7 @@ public class ${ClassName}Vo {
|
||||
/**
|
||||
* $column.columnComment
|
||||
*/
|
||||
@Schema(description = "${column.columnComment}")
|
||||
@ApiModelProperty("${column.columnComment}")
|
||||
@Excel("${column.columnComment}")
|
||||
private $column.javaType $column.javaField;
|
||||
#end
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package cn.fateverse.common.core.entity;
|
||||
|
||||
import cn.fateverse.admin.entity.User;
|
||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
<artifactId>common-dubbo</artifactId>
|
||||
|
||||
<properties>
|
||||
<dubbo.version>3.1.0</dubbo.version>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
</properties>
|
||||
<dependencies>
|
||||
@@ -47,6 +48,7 @@
|
||||
<dependency>
|
||||
<groupId>org.apache.dubbo</groupId>
|
||||
<artifactId>dubbo-spring-boot-starter</artifactId>
|
||||
<version>${dubbo.version}</version>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>com.alibaba.fastjson2</groupId>
|
||||
|
||||
@@ -48,10 +48,6 @@
|
||||
<groupId>cn.fateverse</groupId>
|
||||
<artifactId>common-core</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>cn.fateverse</groupId>
|
||||
<artifactId>common-security</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
</project>
|
||||
@@ -4,7 +4,6 @@ import cn.fateverse.common.core.annotaion.EnableAutoField;
|
||||
import cn.fateverse.common.core.entity.BaseEntity;
|
||||
import cn.fateverse.common.core.enums.MethodEnum;
|
||||
import cn.fateverse.common.core.utils.AutoSetValueUtils;
|
||||
import cn.fateverse.common.security.utils.SecurityUtils;
|
||||
import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
|
||||
import org.apache.ibatis.reflection.MetaObject;
|
||||
|
||||
|
||||
@@ -3,7 +3,6 @@ package cn.fateverse.common.mybatisplus.utils;
|
||||
import cn.fateverse.common.core.entity.PageInfo;
|
||||
import cn.fateverse.common.core.result.page.TableDataInfo;
|
||||
import cn.fateverse.common.core.utils.TableSupport;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
|
||||
import java.util.ArrayList;
|
||||
@@ -27,22 +26,12 @@ public class PageUtils {
|
||||
* @param <R> 需要转换的对象类型
|
||||
* @return 转换后的对象
|
||||
*/
|
||||
public static <T, R> TableDataInfo<T> convertDataTable(IPage<R> page, Function<R, T> map) {
|
||||
public static <T, R> TableDataInfo<T> convertDataTable(Page<R> page, Function<R, T> map) {
|
||||
List<T> convertList = page.getRecords().stream().map(map).collect(Collectors.toList());
|
||||
return convertDataTable(convertList, page.getTotal());
|
||||
}
|
||||
|
||||
|
||||
public static <T> TableDataInfo<T> convertDataTable(IPage<T> page) {
|
||||
return convertDataTable(page.getRecords(), page.getTotal());
|
||||
}
|
||||
|
||||
|
||||
public static <T> TableDataInfo<T> emptyTable() {
|
||||
return convertDataTable(new ArrayList<>(), 0L);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 转换为TableDataInfo对象
|
||||
*
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
package cn.fateverse.common.security.dubbo;
|
||||
|
||||
import cn.fateverse.common.core.entity.User;
|
||||
|
||||
public interface DubboUserSearchService {
|
||||
/**
|
||||
* 通过用户名查询用户信息
|
||||
*
|
||||
* @param username 用户名称
|
||||
* @return 用户信息
|
||||
*/
|
||||
User getUserByUsername(String username);
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
package cn.fateverse.query.entity;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
@@ -14,13 +14,13 @@ public class DynamicTable {
|
||||
/**
|
||||
* 表名称
|
||||
*/
|
||||
@Schema(description = "表名称")
|
||||
@ApiModelProperty("表名称")
|
||||
private String tableName;
|
||||
|
||||
/**
|
||||
* 表注释
|
||||
*/
|
||||
@Schema(description = "表注释")
|
||||
@ApiModelProperty("表注释")
|
||||
private String tableComment;
|
||||
|
||||
private Date createTime;
|
||||
|
||||
@@ -4,7 +4,7 @@ import cn.fateverse.query.entity.DataAdapter;
|
||||
import cn.fateverse.query.enums.DataAdapterSource;
|
||||
import cn.fateverse.query.enums.DataAdapterType;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
@@ -20,31 +20,31 @@ public class DataAdapterDto {
|
||||
/**
|
||||
* 数据适配器id
|
||||
*/
|
||||
@Schema(description = "数据适配器id")
|
||||
@ApiModelProperty("数据适配器id")
|
||||
private Long adapterId;
|
||||
|
||||
/**
|
||||
* 适配器名称
|
||||
*/
|
||||
@Schema(description = "适配器名称")
|
||||
@ApiModelProperty("适配器名称")
|
||||
private String adapterName;
|
||||
|
||||
/**
|
||||
* 数据适配器代码类型 Java or Js
|
||||
*/
|
||||
@Schema(description = "数据适配器代码类型 Java or Js")
|
||||
@ApiModelProperty("数据适配器代码类型 Java or Js")
|
||||
private DataAdapterType type;
|
||||
|
||||
/**
|
||||
* 适配器代码
|
||||
*/
|
||||
@Schema(description = "适配器代码")
|
||||
@ApiModelProperty("适配器代码")
|
||||
private String code;
|
||||
|
||||
/**
|
||||
* 模拟数据 strng类型的json字符串
|
||||
*/
|
||||
@Schema(description = "模拟数据 strng类型的json字符串")
|
||||
@ApiModelProperty("模拟数据 strng类型的json字符串")
|
||||
private String mockData;
|
||||
|
||||
public DataAdapter toDataAdapter() {
|
||||
|
||||
@@ -5,7 +5,7 @@ import cn.fateverse.query.enums.DynamicSourceEnum;
|
||||
import com.alibaba.fastjson2.JSON;
|
||||
import com.alibaba.fastjson2.JSONObject;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
@@ -24,76 +24,76 @@ public class DataSourceManageDto {
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@Schema(description = "主键")
|
||||
@ApiModelProperty("主键")
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 数据源名称
|
||||
*/
|
||||
@Schema(description = "数据源名称")
|
||||
@ApiModelProperty("数据源名称")
|
||||
@NotBlank(message = "数据源名称不能为空!")
|
||||
private String dsName;
|
||||
|
||||
/**
|
||||
* 数据源密码
|
||||
*/
|
||||
@Schema(description = "数据源用户名")
|
||||
@ApiModelProperty("数据源用户名")
|
||||
@NotBlank(message = "数据源用户名不能为空!")
|
||||
private String username;
|
||||
|
||||
/**
|
||||
* 数据源密码
|
||||
*/
|
||||
@Schema(description = "数据源密码")
|
||||
@ApiModelProperty("数据源密码")
|
||||
private String password;
|
||||
|
||||
/**
|
||||
* 数据源服务地址
|
||||
*/
|
||||
@Schema(description = "数据源服务地址")
|
||||
@ApiModelProperty("数据源服务地址")
|
||||
private String host;
|
||||
|
||||
/**
|
||||
* 数据源端口
|
||||
*/
|
||||
@Schema(description = "数据源端口")
|
||||
@ApiModelProperty("数据源端口")
|
||||
private Long port;
|
||||
|
||||
private String args;
|
||||
|
||||
@Schema(description = "服务名称")
|
||||
@ApiModelProperty("服务名称")
|
||||
private JSONObject params;
|
||||
|
||||
/**
|
||||
* 数据源类型,匹配java枚举
|
||||
*/
|
||||
@Schema(description = "数据源类型,匹配java枚举")
|
||||
@ApiModelProperty("数据源类型,匹配java枚举")
|
||||
@NotNull(message = "数据源类型不能为空!")
|
||||
private DynamicSourceEnum type;
|
||||
|
||||
/**
|
||||
* 数据库名称
|
||||
*/
|
||||
@Schema(description = "数据库名称")
|
||||
@ApiModelProperty("数据库名称")
|
||||
private String dbName;
|
||||
|
||||
/**
|
||||
* 配置类型
|
||||
*/
|
||||
@Schema(description = "数据源类型")
|
||||
@ApiModelProperty("数据源类型")
|
||||
@NotNull(message = "配置类型不能为空!")
|
||||
private Integer configType;
|
||||
|
||||
/**
|
||||
* 数据源连接类型
|
||||
*/
|
||||
@Schema(description = "数据源连接类型")
|
||||
@ApiModelProperty("数据源连接类型")
|
||||
private String url;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@Schema(description = "备注")
|
||||
@ApiModelProperty("备注")
|
||||
private String remark;
|
||||
|
||||
public DataSourceManage toQueryDataSource() {
|
||||
|
||||
@@ -2,7 +2,7 @@ package cn.fateverse.query.entity.dto;
|
||||
|
||||
import cn.fateverse.query.entity.DynamicEcharts;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
@@ -18,31 +18,31 @@ public class DynamicEchartsDto {
|
||||
/**
|
||||
* echarts主键
|
||||
*/
|
||||
@Schema(description = "echarts主键")
|
||||
@ApiModelProperty("echarts主键")
|
||||
private Long echartsId;
|
||||
|
||||
/**
|
||||
* 数据适配器id,可以选择或者直接创建
|
||||
*/
|
||||
@Schema(description = "数据适配器id,可以选择或者直接创建")
|
||||
@ApiModelProperty("数据适配器id,可以选择或者直接创建")
|
||||
private Long adapterId;
|
||||
|
||||
/**
|
||||
* echarts名称
|
||||
*/
|
||||
@Schema(description = "echarts名称")
|
||||
@ApiModelProperty("echarts名称")
|
||||
private String echartsName;
|
||||
|
||||
/**
|
||||
* echarts配置数据
|
||||
*/
|
||||
@Schema(description = "echarts配置数据")
|
||||
@ApiModelProperty("echarts配置数据")
|
||||
private String echartsConfig;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@Schema(description = "备注")
|
||||
@ApiModelProperty("备注")
|
||||
private String remark;
|
||||
|
||||
public DynamicEcharts toDynamicEcharts() {
|
||||
|
||||
@@ -7,7 +7,7 @@ import cn.fateverse.query.enums.DataAdapterType;
|
||||
import cn.fateverse.query.enums.PortalEnum;
|
||||
import cn.fateverse.query.enums.PortalPremEnum;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import org.springframework.web.bind.annotation.RequestMethod;
|
||||
|
||||
@@ -28,58 +28,58 @@ public class PortalDto {
|
||||
/**
|
||||
* 主键id
|
||||
*/
|
||||
@Schema(description = "主键id")
|
||||
@ApiModelProperty("主键id")
|
||||
private String portalId;
|
||||
|
||||
/**
|
||||
* 自定义查询id
|
||||
*/
|
||||
@Schema(description = "自定义查询id")
|
||||
@ApiModelProperty("自定义查询id")
|
||||
private Long queryId;
|
||||
|
||||
/**
|
||||
* 数据适配器id
|
||||
*/
|
||||
@Schema(description = "数据适配器id")
|
||||
@ApiModelProperty("数据适配器id")
|
||||
private Long adapterId;
|
||||
|
||||
/**
|
||||
* 接口名称
|
||||
*/
|
||||
@Schema(description = "接口名称")
|
||||
@ApiModelProperty("接口名称")
|
||||
@NotBlank(message = "接口名称不能为空")
|
||||
private String portalName;
|
||||
|
||||
/**
|
||||
* 权限类型
|
||||
*/
|
||||
@Schema(description = "权限类型")
|
||||
@ApiModelProperty("权限类型")
|
||||
@NotNull(message = "权限类型不能为空")
|
||||
private PortalPremEnum permissionType;
|
||||
|
||||
/**
|
||||
* 接口类型
|
||||
*/
|
||||
@Schema(description = "接口类型")
|
||||
@ApiModelProperty("接口类型")
|
||||
@NotNull(message = "接口类型不能为空")
|
||||
private PortalEnum type;
|
||||
|
||||
|
||||
@Schema(description = "请求类型")
|
||||
@ApiModelProperty("请求类型")
|
||||
@NotBlank(message = "请求类型不能为空")
|
||||
private String requestMethod;
|
||||
|
||||
@NotNull(message = "是否创建数据适配器不能为空!")
|
||||
private Boolean createDataAdapter;
|
||||
|
||||
@Schema(description = "请求地址")
|
||||
@ApiModelProperty("请求地址")
|
||||
private String url;
|
||||
|
||||
@Schema(description = "请求类型")
|
||||
@ApiModelProperty("请求类型")
|
||||
private String contentType;
|
||||
|
||||
|
||||
@Schema(description = "接口请求方法类型")
|
||||
@ApiModelProperty("接口请求方法类型")
|
||||
private String interfaceRequestMethod;
|
||||
|
||||
/**
|
||||
@@ -90,26 +90,26 @@ public class PortalDto {
|
||||
/**
|
||||
* 系统暴露地址
|
||||
*/
|
||||
@Schema(description = "系统暴露地址")
|
||||
@ApiModelProperty("系统暴露地址")
|
||||
@NotBlank(message = "系统暴露地址不能为空")
|
||||
private String path;
|
||||
|
||||
/**
|
||||
* 状态
|
||||
*/
|
||||
@Schema(description = "状态")
|
||||
@ApiModelProperty("状态")
|
||||
private Integer state;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@Schema(description = "备注")
|
||||
@ApiModelProperty("备注")
|
||||
private String remark;
|
||||
|
||||
@Schema(description = "适配器代码类型")
|
||||
@ApiModelProperty("适配器代码类型")
|
||||
private DataAdapterType adapterCodeType;
|
||||
|
||||
@Schema(description = "映射关系")
|
||||
@ApiModelProperty("映射关系")
|
||||
private List<PortalMapping> mappings;
|
||||
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ package cn.fateverse.query.entity.dto;
|
||||
import cn.fateverse.query.entity.Table;
|
||||
import cn.fateverse.query.enums.DynamicSourceEnum;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
@@ -19,31 +19,31 @@ public class TableDto {
|
||||
/**
|
||||
* 表id
|
||||
*/
|
||||
@Schema(description = "表id")
|
||||
@ApiModelProperty("表id")
|
||||
private Long tableId;
|
||||
|
||||
/**
|
||||
* 数据源id
|
||||
*/
|
||||
@Schema(description = "数据源id")
|
||||
@ApiModelProperty("数据源id")
|
||||
private Long dataSourceId;
|
||||
|
||||
/**
|
||||
* 数据源类型
|
||||
*/
|
||||
@Schema(description = "数据源类型")
|
||||
@ApiModelProperty("数据源类型")
|
||||
private DynamicSourceEnum dataSourceType;
|
||||
|
||||
/**
|
||||
* 表格名称
|
||||
*/
|
||||
@Schema(description = "表格名称")
|
||||
@ApiModelProperty("表格名称")
|
||||
private String tableName;
|
||||
|
||||
/**
|
||||
* 表格注释
|
||||
*/
|
||||
@Schema(description = "表格注释")
|
||||
@ApiModelProperty("表格注释")
|
||||
private String tableComment;
|
||||
|
||||
public Table toTable() {
|
||||
|
||||
@@ -3,7 +3,7 @@ package cn.fateverse.query.entity.dto;
|
||||
import cn.fateverse.common.decrypt.annotation.EncryptField;
|
||||
import cn.fateverse.query.entity.UniQuery;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
@@ -28,56 +28,56 @@ public class UniQueryDto {
|
||||
/**
|
||||
* 自定义查询id
|
||||
*/
|
||||
@Schema(description = "自定义查询id")
|
||||
@ApiModelProperty("自定义查询id")
|
||||
@EncryptField
|
||||
private String id;
|
||||
|
||||
@Schema(description = "数据源id")
|
||||
@ApiModelProperty("数据源id")
|
||||
@NotNull(message = "重要参数不能为空")
|
||||
private Long dataSourceId;
|
||||
|
||||
/**
|
||||
* 名称
|
||||
*/
|
||||
@Schema(description = "名称")
|
||||
@ApiModelProperty("名称")
|
||||
@NotBlank(message = "名称不能为空")
|
||||
private String uqName;
|
||||
|
||||
/**
|
||||
* sql语句
|
||||
*/
|
||||
@Schema(description = "sql语句")
|
||||
@ApiModelProperty("sql语句")
|
||||
private String uqSql;
|
||||
|
||||
/**
|
||||
* 描述
|
||||
*/
|
||||
@Schema(description = "描述")
|
||||
@ApiModelProperty("描述")
|
||||
@NotBlank(message = "描述不能为空")
|
||||
private String uqDescribe;
|
||||
|
||||
/**
|
||||
* 发布
|
||||
*/
|
||||
@Schema(description = "发布")
|
||||
@ApiModelProperty("发布")
|
||||
private Boolean publish;
|
||||
|
||||
/**
|
||||
* 预览:1,已预览 ,2 未预览
|
||||
*/
|
||||
@Schema(description = "预览:1,已预览 ,2 未预览")
|
||||
@ApiModelProperty("预览:1,已预览 ,2 未预览")
|
||||
private Boolean preview;
|
||||
|
||||
/**
|
||||
* top图json数据
|
||||
*/
|
||||
@Schema(description = "top图json数据")
|
||||
@ApiModelProperty("top图json数据")
|
||||
private String topJson;
|
||||
|
||||
/**
|
||||
* 类型 1:普通 2:top图
|
||||
*/
|
||||
@Schema(description = "类型 1:普通 2:top图")
|
||||
@ApiModelProperty("类型 1:普通 2:top图")
|
||||
private Integer type;
|
||||
|
||||
public Long getId() {
|
||||
|
||||
@@ -2,7 +2,7 @@ package cn.fateverse.query.entity.query;
|
||||
|
||||
import cn.fateverse.query.enums.DataAdapterType;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
@@ -22,13 +22,13 @@ public class DataAdapterQuery {
|
||||
/**
|
||||
* 适配器名称
|
||||
*/
|
||||
@Schema(description = "适配器名称")
|
||||
@ApiModelProperty("适配器名称")
|
||||
private String adapterName;
|
||||
|
||||
/**
|
||||
* 数据适配器代码类型 Java or Js
|
||||
*/
|
||||
@Schema(description = "数据适配器代码类型 Java or Js")
|
||||
@ApiModelProperty("数据适配器代码类型 Java or Js")
|
||||
private DataAdapterType type;
|
||||
|
||||
private Boolean common;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package cn.fateverse.query.entity.query;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
@@ -21,18 +21,18 @@ public class DataSourceManageQuery {
|
||||
/**
|
||||
* 数据源名称
|
||||
*/
|
||||
@Schema(description = "数据源名称")
|
||||
@ApiModelProperty("数据源名称")
|
||||
private String dsName;
|
||||
|
||||
/**
|
||||
* 数据库名称
|
||||
*/
|
||||
@Schema(description = "数据库名称")
|
||||
@ApiModelProperty("数据库名称")
|
||||
private String dbName;
|
||||
|
||||
/**
|
||||
* 数据源类型
|
||||
*/
|
||||
@Schema(description = "数据源类型")
|
||||
@ApiModelProperty("数据源类型")
|
||||
private Integer configType;
|
||||
}
|
||||
@@ -1,7 +1,7 @@
|
||||
package cn.fateverse.query.entity.query;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
@@ -21,12 +21,12 @@ public class DynamicEchartsQuery {
|
||||
/**
|
||||
* echart名称
|
||||
*/
|
||||
@Schema(description = "echarts名称")
|
||||
@ApiModelProperty("echarts名称")
|
||||
private String echartsName;
|
||||
|
||||
/**
|
||||
* 是否发布
|
||||
*/
|
||||
@Schema(description = "是否发布")
|
||||
@ApiModelProperty("是否发布")
|
||||
private Boolean publish;
|
||||
}
|
||||
@@ -1,7 +1,7 @@
|
||||
package cn.fateverse.query.entity.query;
|
||||
|
||||
import cn.fateverse.common.core.entity.QueryTime;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
@@ -14,13 +14,13 @@ public class DynamicTableQuery extends QueryTime {
|
||||
/**
|
||||
* 表名称
|
||||
*/
|
||||
@Schema(description = "表名称")
|
||||
@ApiModelProperty("表名称")
|
||||
private String tableName;
|
||||
|
||||
/**
|
||||
* 表注释
|
||||
*/
|
||||
@Schema(description = "表注释")
|
||||
@ApiModelProperty("表注释")
|
||||
private String tableComment;
|
||||
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@ package cn.fateverse.query.entity.query;
|
||||
import cn.fateverse.query.enums.PortalEnum;
|
||||
import cn.fateverse.query.enums.PortalPremEnum;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
@@ -23,25 +23,25 @@ public class PortalQuery {
|
||||
/**
|
||||
* 接口名称
|
||||
*/
|
||||
@Schema(description = "接口名称")
|
||||
@ApiModelProperty("接口名称")
|
||||
private String portalName;
|
||||
|
||||
/**
|
||||
* 权限类型
|
||||
*/
|
||||
@Schema(description = "权限类型")
|
||||
@ApiModelProperty("权限类型")
|
||||
private PortalPremEnum permissionType;
|
||||
|
||||
/**
|
||||
* 接口类型
|
||||
*/
|
||||
@Schema(description = "接口类型")
|
||||
@ApiModelProperty("接口类型")
|
||||
private PortalEnum type;
|
||||
|
||||
/**
|
||||
* 系统暴露地址
|
||||
*/
|
||||
@Schema(description = "系统暴露地址")
|
||||
@ApiModelProperty("系统暴露地址")
|
||||
private String path;
|
||||
|
||||
private Integer state;
|
||||
|
||||
@@ -2,7 +2,7 @@ package cn.fateverse.query.entity.query;
|
||||
|
||||
import cn.fateverse.common.core.entity.QueryTime;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
@@ -21,21 +21,21 @@ public class TableQuery extends QueryTime {
|
||||
/**
|
||||
* 数据源id
|
||||
*/
|
||||
@Schema(description = "数据源id")
|
||||
@ApiModelProperty("数据源id")
|
||||
private Long dataSourceId;
|
||||
|
||||
/**
|
||||
* 表名称
|
||||
*/
|
||||
@Schema(description = "表名称")
|
||||
@ApiModelProperty("表名称")
|
||||
private String tableName;
|
||||
|
||||
/**
|
||||
* 表描述
|
||||
*/
|
||||
@Schema(description = "表描述")
|
||||
@ApiModelProperty("表描述")
|
||||
private String tableComment;
|
||||
|
||||
@Schema(description = "数据类型")
|
||||
@ApiModelProperty("数据类型")
|
||||
private String dataSourceType;
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package cn.fateverse.query.entity.query;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
@@ -21,27 +21,27 @@ public class UniQueryQuery {
|
||||
/**
|
||||
* 名称
|
||||
*/
|
||||
@Schema(description = "名称")
|
||||
@ApiModelProperty("名称")
|
||||
private String uqName;
|
||||
|
||||
/**
|
||||
* 发布
|
||||
*/
|
||||
@Schema(description = "发布")
|
||||
@ApiModelProperty("发布")
|
||||
private Integer publish;
|
||||
|
||||
/**
|
||||
* 预览:1,已预览 ,2 未预览
|
||||
*/
|
||||
@Schema(description = "预览:1,已预览 ,2 未预览")
|
||||
@ApiModelProperty("预览:1,已预览 ,2 未预览")
|
||||
private Boolean preview;
|
||||
|
||||
/**
|
||||
* 类型 1:普通 2:top图
|
||||
*/
|
||||
@Schema(description = "类型 1:普通 2:top图")
|
||||
@ApiModelProperty("类型 1:普通 2:top图")
|
||||
private Integer type;
|
||||
|
||||
@Schema(description = "数据源id")
|
||||
@ApiModelProperty("数据源id")
|
||||
private Long dataSourceId;
|
||||
}
|
||||
|
||||
@@ -6,7 +6,7 @@ import cn.fateverse.common.core.annotaion.Excel;
|
||||
import cn.fateverse.query.enums.DataAdapterSource;
|
||||
import cn.fateverse.query.enums.DataAdapterType;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
@@ -30,35 +30,35 @@ public class DataAdapterVo {
|
||||
/**
|
||||
* 数据适配器id
|
||||
*/
|
||||
@Schema(description = "数据适配器id")
|
||||
@ApiModelProperty("数据适配器id")
|
||||
@EncryptField
|
||||
private Long adapterId;
|
||||
|
||||
/**
|
||||
* 适配器名称
|
||||
*/
|
||||
@Schema(description = "适配器名称")
|
||||
@ApiModelProperty("适配器名称")
|
||||
@Excel("适配器名称")
|
||||
private String adapterName;
|
||||
|
||||
/**
|
||||
* 数据适配器代码类型 Java or Js
|
||||
*/
|
||||
@Schema(description = "数据适配器代码类型 Java or Js")
|
||||
@ApiModelProperty("数据适配器代码类型 Java or Js")
|
||||
@Excel("数据适配器代码类型 Java or Js")
|
||||
private DataAdapterType type;
|
||||
|
||||
/**
|
||||
* 适配器代码
|
||||
*/
|
||||
@Schema(description = "适配器代码")
|
||||
@ApiModelProperty("适配器代码")
|
||||
@Excel("适配器代码")
|
||||
private String code;
|
||||
|
||||
/**
|
||||
* 模拟数据 strng类型的json字符串
|
||||
*/
|
||||
@Schema(description = "模拟数据 strng类型的json字符串")
|
||||
@ApiModelProperty("模拟数据 strng类型的json字符串")
|
||||
@Excel("模拟数据 strng类型的json字符串")
|
||||
private String mockData;
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@ import cn.fateverse.common.core.annotaion.Excel;
|
||||
import com.alibaba.fastjson2.JSONObject;
|
||||
import com.fasterxml.jackson.annotation.JsonInclude;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
@@ -29,20 +29,20 @@ public class DataSourceManageVo {
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@Schema(description = "主键")
|
||||
@ApiModelProperty("主键")
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 数据源名称
|
||||
*/
|
||||
@Schema(description = "数据源名称")
|
||||
@ApiModelProperty("数据源名称")
|
||||
@Excel("数据源名称")
|
||||
private String dsName;
|
||||
|
||||
/**
|
||||
* 数据源密码
|
||||
*/
|
||||
@Schema(description = "数据源用户名称")
|
||||
@ApiModelProperty("数据源用户名称")
|
||||
@Excel("数据源用户名称")
|
||||
private String username;
|
||||
|
||||
@@ -61,28 +61,28 @@ public class DataSourceManageVo {
|
||||
/**
|
||||
* 数据源类型,匹配java枚举
|
||||
*/
|
||||
@Schema(description = "数据源类型,匹配java枚举")
|
||||
@ApiModelProperty("数据源类型,匹配java枚举")
|
||||
@Excel("数据源类型,匹配java枚举")
|
||||
private DynamicSourceEnum type;
|
||||
|
||||
/**
|
||||
* 数据库名称
|
||||
*/
|
||||
@Schema(description = "数据库名称")
|
||||
@ApiModelProperty("数据库名称")
|
||||
@Excel("数据库名称")
|
||||
private String dbName;
|
||||
|
||||
/**
|
||||
* 数据源类型
|
||||
*/
|
||||
@Schema(description = "数据源类型")
|
||||
@ApiModelProperty("数据源类型")
|
||||
@Excel("数据源类型")
|
||||
private Integer configType;
|
||||
|
||||
/**
|
||||
* 数据源连接类型
|
||||
*/
|
||||
@Schema(description = "数据源连接类型")
|
||||
@ApiModelProperty("数据源连接类型")
|
||||
@Excel("数据源连接类型")
|
||||
private String url;
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ package cn.fateverse.query.entity.vo;
|
||||
import cn.fateverse.query.entity.DynamicEcharts;
|
||||
import cn.fateverse.common.core.annotaion.Excel;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
@@ -27,40 +27,40 @@ public class DynamicEchartsVo {
|
||||
/**
|
||||
* echarts主键
|
||||
*/
|
||||
@Schema(description = "echarts主键")
|
||||
@ApiModelProperty("echarts主键")
|
||||
private Long echartsId;
|
||||
|
||||
/**
|
||||
* 数据适配器id,可以选择或者直接创建
|
||||
*/
|
||||
@Schema(description = "数据适配器id,可以选择或者直接创建")
|
||||
@ApiModelProperty("数据适配器id,可以选择或者直接创建")
|
||||
private String adapterName;
|
||||
|
||||
/**
|
||||
* echart名称
|
||||
*/
|
||||
@Schema(description = "echarts名称")
|
||||
@ApiModelProperty("echarts名称")
|
||||
@Excel("echarts名称")
|
||||
private String echartsName;
|
||||
|
||||
/**
|
||||
* echart配置数据
|
||||
*/
|
||||
@Schema(description = "echarts配置数据")
|
||||
@ApiModelProperty("echarts配置数据")
|
||||
@Excel("echartss配置数据")
|
||||
private String echartsConfig;
|
||||
|
||||
/**
|
||||
* 是否发布
|
||||
*/
|
||||
@Schema(description = "是否发布")
|
||||
@ApiModelProperty("是否发布")
|
||||
@Excel("是否发布")
|
||||
private Boolean publish;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@Schema(description = "备注")
|
||||
@ApiModelProperty("备注")
|
||||
@Excel("备注")
|
||||
private String remark;
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@ import cn.fateverse.query.enums.DataAdapterType;
|
||||
import cn.fateverse.query.enums.PortalEnum;
|
||||
import cn.fateverse.query.enums.PortalPremEnum;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
@@ -29,7 +29,7 @@ public class SimplePortalVo {
|
||||
/**
|
||||
* 主键id
|
||||
*/
|
||||
@Schema(description = "主键id")
|
||||
@ApiModelProperty("主键id")
|
||||
@EncryptField
|
||||
private String portalId;
|
||||
|
||||
@@ -37,37 +37,37 @@ public class SimplePortalVo {
|
||||
/**
|
||||
* 自定义查询id
|
||||
*/
|
||||
@Schema(description = "自定义查询id")
|
||||
@ApiModelProperty("自定义查询id")
|
||||
private Long queryId;
|
||||
|
||||
|
||||
/**
|
||||
* 数据适配器id
|
||||
*/
|
||||
@Schema(description = "数据适配器id")
|
||||
@ApiModelProperty("数据适配器id")
|
||||
private Long adapterId;
|
||||
|
||||
/**
|
||||
* 接口名称
|
||||
*/
|
||||
@Schema(description = "接口名称")
|
||||
@ApiModelProperty("接口名称")
|
||||
@Excel("接口名称")
|
||||
private String portalName;
|
||||
|
||||
/**
|
||||
* 自定查询名称
|
||||
*/
|
||||
@Schema(description = "自定查询名称")
|
||||
@ApiModelProperty("自定查询名称")
|
||||
@Excel("自定查询名称")
|
||||
private String queryName;
|
||||
|
||||
@Schema(description = "自定查询类型 1:sql 2:topo图")
|
||||
@ApiModelProperty("自定查询类型 1:sql 2:topo图")
|
||||
private Integer queryType;
|
||||
|
||||
/**
|
||||
* 数据适配器名称
|
||||
*/
|
||||
@Schema(description = "数据适配器类型")
|
||||
@ApiModelProperty("数据适配器类型")
|
||||
@Excel("数据适配器类型")
|
||||
private DataAdapterType adapterCodeType;
|
||||
|
||||
@@ -78,49 +78,49 @@ public class SimplePortalVo {
|
||||
/**
|
||||
* 权限类型
|
||||
*/
|
||||
@Schema(description = "权限类型")
|
||||
@ApiModelProperty("权限类型")
|
||||
@Excel("权限类型")
|
||||
private PortalPremEnum permissionType;
|
||||
|
||||
/**
|
||||
* 接口类型
|
||||
*/
|
||||
@Schema(description = "接口类型")
|
||||
@ApiModelProperty("接口类型")
|
||||
@Excel("接口类型")
|
||||
private PortalEnum type;
|
||||
|
||||
/**
|
||||
* 系统暴露地址
|
||||
*/
|
||||
@Schema(description = "系统暴露地址")
|
||||
@ApiModelProperty("系统暴露地址")
|
||||
@Excel("系统暴露地址")
|
||||
private String path;
|
||||
|
||||
/**
|
||||
* 状态
|
||||
*/
|
||||
@Schema(description = "状态 0: 创建 1: 发布 2:内部使用(例如提供echarts单独使用)")
|
||||
@ApiModelProperty("状态 0: 创建 1: 发布 2:内部使用(例如提供echarts单独使用)")
|
||||
@Excel("状态")
|
||||
private Integer state;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
@Schema(description = "创建时间")
|
||||
@ApiModelProperty("创建时间")
|
||||
@Excel("创建时间")
|
||||
private Date createTime;
|
||||
|
||||
/**
|
||||
* 更新者
|
||||
*/
|
||||
@Schema(description = "更新时间")
|
||||
@ApiModelProperty("更新时间")
|
||||
@Excel("更新时间")
|
||||
private Date updateTime;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@Schema(description = "备注")
|
||||
@ApiModelProperty("备注")
|
||||
@Excel("备注")
|
||||
private String remark;
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ package cn.fateverse.query.entity.vo;
|
||||
import cn.fateverse.common.decrypt.annotation.EncryptField;
|
||||
import cn.fateverse.query.entity.UniColumn;
|
||||
import cn.fateverse.query.entity.UniCon;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
@@ -33,13 +33,13 @@ public class SqlInfoVo {
|
||||
/**
|
||||
* 名称
|
||||
*/
|
||||
@Schema(description = "名称")
|
||||
@ApiModelProperty("名称")
|
||||
private String uqName;
|
||||
|
||||
/**
|
||||
* 描述
|
||||
*/
|
||||
@Schema(description = "描述")
|
||||
@ApiModelProperty("描述")
|
||||
private String uqDescribe;
|
||||
|
||||
private Long menuId;
|
||||
|
||||
@@ -3,7 +3,7 @@ package cn.fateverse.query.entity.vo;
|
||||
import cn.fateverse.query.entity.Table;
|
||||
import cn.fateverse.query.enums.DynamicSourceEnum;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
@@ -27,37 +27,37 @@ public class TableVo {
|
||||
/**
|
||||
* 表id
|
||||
*/
|
||||
@Schema(description = "表id")
|
||||
@ApiModelProperty("表id")
|
||||
private Long tableId;
|
||||
|
||||
/**
|
||||
* 数据源id
|
||||
*/
|
||||
@Schema(description = "数据源id")
|
||||
@ApiModelProperty("数据源id")
|
||||
private Long dataSourceId;
|
||||
|
||||
/**
|
||||
* 数据源类型
|
||||
*/
|
||||
@Schema(description = "数据源类型")
|
||||
@ApiModelProperty("数据源类型")
|
||||
private DynamicSourceEnum dataSourceType;
|
||||
|
||||
/**
|
||||
* 表格名称
|
||||
*/
|
||||
@Schema(description = "表格名称")
|
||||
@ApiModelProperty("表格名称")
|
||||
private String tableName;
|
||||
|
||||
/**
|
||||
* 表格注释
|
||||
*/
|
||||
@Schema(description = "表格注释")
|
||||
@ApiModelProperty("表格注释")
|
||||
private String tableComment;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
@Schema(description = "创建时间")
|
||||
@ApiModelProperty("创建时间")
|
||||
private Date createTime;
|
||||
|
||||
public static TableVo toTableVo(Table table) {
|
||||
|
||||
@@ -3,7 +3,7 @@ package cn.fateverse.query.entity.vo;
|
||||
import cn.fateverse.common.decrypt.annotation.EncryptField;
|
||||
import cn.fateverse.query.entity.UniQuery;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
@@ -27,7 +27,7 @@ public class UniQueryVo {
|
||||
/**
|
||||
* 自定义查询id
|
||||
*/
|
||||
@Schema(description = "主键")
|
||||
@ApiModelProperty("主键")
|
||||
@EncryptField
|
||||
private String id;
|
||||
|
||||
@@ -37,43 +37,43 @@ public class UniQueryVo {
|
||||
/**
|
||||
* 名称
|
||||
*/
|
||||
@Schema(description = "名称")
|
||||
@ApiModelProperty("名称")
|
||||
private String uqName;
|
||||
|
||||
/**
|
||||
* sql语句
|
||||
*/
|
||||
@Schema(description = "sql语句")
|
||||
@ApiModelProperty("sql语句")
|
||||
private String uqSql;
|
||||
|
||||
/**
|
||||
* 描述
|
||||
*/
|
||||
@Schema(description = "描述")
|
||||
@ApiModelProperty("描述")
|
||||
private String uqDescribe;
|
||||
|
||||
/**
|
||||
* 发布
|
||||
*/
|
||||
@Schema(description = "发布")
|
||||
@ApiModelProperty("发布")
|
||||
private Boolean publish;
|
||||
|
||||
/**
|
||||
* 预览:1,已预览 ,2 未预览
|
||||
*/
|
||||
@Schema(description = "预览:1,已预览 ,2 未预览")
|
||||
@ApiModelProperty("预览:1,已预览 ,2 未预览")
|
||||
private Boolean preview;
|
||||
|
||||
/**
|
||||
* top图json数据
|
||||
*/
|
||||
@Schema(description = "top图json数据")
|
||||
@ApiModelProperty("top图json数据")
|
||||
private String topJson;
|
||||
|
||||
/**
|
||||
* 类型 1:普通 2:top图
|
||||
*/
|
||||
@Schema(description = "类型 1:普通 2:top图")
|
||||
@ApiModelProperty("类型 1:普通 2:top图")
|
||||
private Integer type;
|
||||
|
||||
private Date createTime;
|
||||
|
||||
@@ -2,7 +2,7 @@ package cn.fateverse.notice.dto;
|
||||
|
||||
import cn.fateverse.notice.enums.ActionEnums;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotNull;
|
||||
@@ -17,36 +17,36 @@ import java.util.List;
|
||||
@ApiModel("公告发送实体")
|
||||
public class NoticeDto implements Serializable {
|
||||
|
||||
@Schema(description = "公告标题")
|
||||
@ApiModelProperty("公告标题")
|
||||
@NotNull(message = "公告标题不能为空")
|
||||
private String noticeTitle;
|
||||
|
||||
@Schema(description = "公告类型（1通知 2公告）")
|
||||
@ApiModelProperty("公告类型（1通知 2公告）")
|
||||
@NotNull(message = "公告类型不能为空")
|
||||
private String noticeType;
|
||||
|
||||
@Schema(description = "发送类型,用户:user,用户数组:user,角色:role,部门:dept,全发:all")
|
||||
@ApiModelProperty("发送类型,用户:user,用户数组:user,角色:role,部门:dept,全发:all")
|
||||
@NotNull(message = "发送类型不能为空")
|
||||
private String sendType;
|
||||
|
||||
private ActionEnums action;
|
||||
|
||||
@Schema(description = "发送类型的id")
|
||||
@ApiModelProperty("发送类型的id")
|
||||
@NotNull(message = "发送对象id不能为空")
|
||||
private List<Long> senderIds;
|
||||
|
||||
@Schema(description = "公告内容")
|
||||
@ApiModelProperty("公告内容")
|
||||
private String noticeContent;
|
||||
|
||||
@Schema(description = "内容类型: html,text 等")
|
||||
@ApiModelProperty("内容类型: html,text 等")
|
||||
@NotNull(message = "内容类型不能为空")
|
||||
private String contentType;
|
||||
|
||||
@Schema(description = "发送群组")
|
||||
@ApiModelProperty("发送群组")
|
||||
@NotNull(message = "消息发送群组不能为空")
|
||||
private String cluster;
|
||||
|
||||
@Schema(description = "公告备注")
|
||||
@ApiModelProperty("公告备注")
|
||||
private String remark;
|
||||
|
||||
}
|
||||
|
||||
@@ -56,10 +56,6 @@
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-reactor-netty</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>cn.fateverse</groupId>
|
||||
<artifactId>admin-api</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package cn.fateverse.notice.entity.query;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
@@ -11,22 +11,22 @@ import lombok.Data;
|
||||
@Data
|
||||
public class NoticeQuery {
|
||||
|
||||
@Schema(description = "公告标题")
|
||||
@ApiModelProperty("公告标题")
|
||||
private String noticeTitle;
|
||||
|
||||
@Schema(description = "公告类型（1通知 2公告）")
|
||||
@ApiModelProperty("公告类型（1通知 2公告）")
|
||||
private String noticeType;
|
||||
|
||||
@Schema(description = "发送类型,用户,用户数组,角色,部门,全发")
|
||||
@ApiModelProperty("发送类型,用户,用户数组,角色,部门,全发")
|
||||
private String sendType;
|
||||
|
||||
@Schema(description = "内容类型: html,text等")
|
||||
@ApiModelProperty("内容类型: html,text等")
|
||||
private String contentType;
|
||||
|
||||
@Schema(description = "公告状态（0正常 1关闭）")
|
||||
@ApiModelProperty("公告状态（0正常 1关闭）")
|
||||
private String state;
|
||||
|
||||
@Schema(description = "群组")
|
||||
@ApiModelProperty("群组")
|
||||
private String cluster;
|
||||
|
||||
@JsonIgnore
|
||||
|
||||
@@ -2,11 +2,11 @@ package cn.fateverse.notice.entity.vo;
|
||||
|
||||
import cn.fateverse.notice.entity.Notice;
|
||||
import com.fasterxml.jackson.annotation.JsonInclude;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
@@ -19,36 +19,36 @@ public class NoticeVo {
|
||||
|
||||
private Long noticeId;
|
||||
|
||||
@Schema(description = "公告标题")
|
||||
@ApiModelProperty("公告标题")
|
||||
private String noticeTitle;
|
||||
|
||||
@Schema(description = "公告类型（1通知 2公告）")
|
||||
@ApiModelProperty("公告类型（1通知 2公告）")
|
||||
private String noticeType;
|
||||
|
||||
@Schema(description = "发送类型,用户,用户数组,角色,部门,全发")
|
||||
@ApiModelProperty("发送类型,用户,用户数组,角色,部门,全发")
|
||||
private String sendType;
|
||||
|
||||
@JsonInclude(JsonInclude.Include.NON_NULL)
|
||||
@Schema(description = "发送类型对应的信息")
|
||||
@ApiModelProperty("发送类型对应的信息")
|
||||
private List<String> senders;
|
||||
|
||||
@JsonInclude(JsonInclude.Include.NON_NULL)
|
||||
private String noticeContent;
|
||||
|
||||
@Schema(description = "内容类型: html,text等")
|
||||
@ApiModelProperty("内容类型: html,text等")
|
||||
private String contentType;
|
||||
|
||||
@Schema(description = "公告状态（0正常 1关闭）")
|
||||
@ApiModelProperty("公告状态（0正常 1关闭）")
|
||||
private String state;
|
||||
|
||||
@Schema(description = "群组")
|
||||
@ApiModelProperty("群组")
|
||||
private String cluster;
|
||||
|
||||
@Schema(description = "创建人")
|
||||
@ApiModelProperty("创建人")
|
||||
private Object createBy;
|
||||
|
||||
@Schema(description = "创建时间")
|
||||
private LocalDateTime createTime;
|
||||
@ApiModelProperty("创建时间")
|
||||
private Date createTime;
|
||||
|
||||
public static NoticeVo toNoticeVo(Notice notice){
|
||||
return NoticeVo.builder()
|
||||
|
||||
@@ -6,7 +6,7 @@ import cn.fateverse.notice.entity.NoticeMq;
|
||||
import cn.fateverse.notice.enums.ActionEnums;
|
||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||
import com.fasterxml.jackson.annotation.JsonInclude;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
@@ -24,23 +24,23 @@ public class NotifyVo {
|
||||
|
||||
private Long noticeId;
|
||||
|
||||
@Schema(description = "公告标题")
|
||||
@ApiModelProperty("公告标题")
|
||||
private String noticeTitle;
|
||||
|
||||
@Schema(description = "公告类型（1通知 2公告）")
|
||||
@ApiModelProperty("公告类型（1通知 2公告）")
|
||||
private String noticeType;
|
||||
|
||||
@JsonInclude(JsonInclude.Include.NON_NULL)
|
||||
private String noticeContent;
|
||||
|
||||
@Schema(description = "消息阅读状态")
|
||||
@ApiModelProperty("消息阅读状态")
|
||||
@JsonInclude(JsonInclude.Include.NON_NULL)
|
||||
private String state;
|
||||
|
||||
@JsonIgnore
|
||||
private ActionEnums action;
|
||||
|
||||
@Schema(description = "群组")
|
||||
@ApiModelProperty("群组")
|
||||
private String cluster;
|
||||
|
||||
public static NotifyVo toNotifyVo(Notice notice) {
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user