diff --git a/.gitignore b/.gitignore index e8a6d93fe3ea35e5edf85b70d8b2b80568d5c2c6..f1be357203477c2fa118548b408b82abb951d158 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,7 @@ rebel.xml /.factorypath /.springBeans + + +d/\springbootv2-log +d:\springbootv2-log \ No newline at end of file diff --git "a/d:\\springbootv2-log/springbootv2.log" "b/d:\\springbootv2-log/springbootv2.log" deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/src/main/java/com/fc/test/dao/model/SysAreaModel.java b/src/main/java/com/fc/test/dao/model/SysAreaModel.java index 999a4fb417cbdb26f972c28b51311cd6effcce87..e8bd96f170aa2bac0a97ef6226049396274ff6e0 100644 --- a/src/main/java/com/fc/test/dao/model/SysAreaModel.java +++ b/src/main/java/com/fc/test/dao/model/SysAreaModel.java @@ -1,10 +1,12 @@ package com.fc.test.dao.model; import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import java.time.LocalDateTime; import java.io.Serializable; - -import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -15,71 +17,52 @@ import lombok.experimental.Accessors; *
* * @author pencilso - * @since 2020-04-22 + * @since 2020-04-23 */ @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) @TableName("t_sys_area") +@ApiModel(value="SysAreaModel对象", description="地区设置") public class SysAreaModel implements Serializable { private static final long serialVersionUID = 1L; - /** - * 区代码 - */ + @ApiModelProperty(value = "自增列") + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @ApiModelProperty(value = "区代码") private String areaCode; - /** - * 父级市代码 - */ + @ApiModelProperty(value = "父级市代码") private String cityCode; - /** - * 市名称 - */ + @ApiModelProperty(value = "市名称") private String areaName; - /** - * 简称 - */ + @ApiModelProperty(value = "简称") private String shortName; - /** - * 经度 - */ + @ApiModelProperty(value = "经度") private String lng; - /** - * 纬度 - */ + @ApiModelProperty(value = "纬度") private String lat; - /** - * 排序 - */ + @ApiModelProperty(value = "排序") private Integer sort; - /** - * 创建时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + @ApiModelProperty(value = "创建时间") private LocalDateTime gmtCreate; - /** - * 修改时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + @ApiModelProperty(value = "修改时间") private LocalDateTime gmtModified; - /** - * 备注 - */ + @ApiModelProperty(value = "备注") private String memo; - /** - * 状态 - */ + @ApiModelProperty(value = "状态") private Integer dataState; diff --git a/src/main/java/com/fc/test/dao/model/SysCityModel.java b/src/main/java/com/fc/test/dao/model/SysCityModel.java index c13977a762c1c53bc5eb33307e29c10b5fa5c48e..4ea3788e0170fb5f72510b539e392531c701db9d 100644 --- a/src/main/java/com/fc/test/dao/model/SysCityModel.java +++ b/src/main/java/com/fc/test/dao/model/SysCityModel.java @@ -1,10 +1,12 @@ package com.fc.test.dao.model; import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import java.time.LocalDateTime; import java.io.Serializable; - -import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -15,71 +17,52 @@ import lombok.experimental.Accessors; * * * @author pencilso - * @since 2020-04-22 + * @since 2020-04-23 */ @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) @TableName("t_sys_city") +@ApiModel(value="SysCityModel对象", description="城市设置") public class SysCityModel implements Serializable { private static final long serialVersionUID = 1L; - /** - * 市代码 - */ + @ApiModelProperty(value = "自增列") + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @ApiModelProperty(value = "市代码") private String cityCode; - /** - * 市名称 - */ + @ApiModelProperty(value = "市名称") private String cityName; - /** - * 简称 - */ + @ApiModelProperty(value = "简称") private String shortName; - /** - * 省代码 - */ + @ApiModelProperty(value = "省代码") private String provinceCode; - /** - * 经度 - */ + @ApiModelProperty(value = "经度") private String lng; - /** - * 纬度 - */ + @ApiModelProperty(value = "纬度") private String lat; - /** - * 排序 - */ + @ApiModelProperty(value = "排序") private Integer sort; - /** - * 创建时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + @ApiModelProperty(value = "创建时间") private LocalDateTime gmtCreate; - /** - * 修改时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + @ApiModelProperty(value = "修改时间") private LocalDateTime gmtModified; - /** - * 备注 - */ + @ApiModelProperty(value = "备注") private String memo; - /** - * 状态 - */ + @ApiModelProperty(value = "状态") private Integer dataState; diff --git a/src/main/java/com/fc/test/dao/model/SysDatasModel.java b/src/main/java/com/fc/test/dao/model/SysDatasModel.java index 02702135f6c6923fb82fc868b4af6f894fcd8e47..c7aa7290aa74c4905e35d6fba89c4beec721cc8b 100644 --- a/src/main/java/com/fc/test/dao/model/SysDatasModel.java +++ b/src/main/java/com/fc/test/dao/model/SysDatasModel.java @@ -1,9 +1,9 @@ package com.fc.test.dao.model; import com.baomidou.mybatisplus.annotation.TableName; - import java.io.Serializable; - +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -14,24 +14,24 @@ import lombok.experimental.Accessors; * * * @author pencilso - * @since 2020-04-22 + * @since 2020-04-23 */ @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) @TableName("t_sys_datas") +@ApiModel(value="SysDatasModel对象", description="文件表存储表") public class SysDatasModel implements Serializable { private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") private String id; - /** - * 文件地址 - */ + + @ApiModelProperty(value = "文件地址") private String filePath; - /** - * 后缀 - */ + @ApiModelProperty(value = "后缀") private String fileSuffix; diff --git a/src/main/java/com/fc/test/dao/model/SysDepartmentModel.java b/src/main/java/com/fc/test/dao/model/SysDepartmentModel.java index 49d4c65311c9e529eec6f8d9d1143300224f7b09..1ec2c61b3bc6b3f2334b810ce1e9b433bce6b4af 100644 --- a/src/main/java/com/fc/test/dao/model/SysDepartmentModel.java +++ b/src/main/java/com/fc/test/dao/model/SysDepartmentModel.java @@ -1,9 +1,11 @@ package com.fc.test.dao.model; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import java.io.Serializable; - +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -16,54 +18,43 @@ import lombok.experimental.Accessors; * * * @author pencilso - * @since 2020-04-22 + * @since 2020-04-23 */ @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) @TableName("t_sys_department") -@AllArgsConstructor +@ApiModel(value="SysDepartmentModel对象", description="部门表") @NoArgsConstructor +@AllArgsConstructor public class SysDepartmentModel implements Serializable { private static final long serialVersionUID = 1L; + @ApiModelProperty(value = "id") + @TableId(value = "id", type = IdType.AUTO) private Integer id; - /** - * 父id - */ + + @ApiModelProperty(value = "父id") private String parentId; - /** - * 部门名称 - */ + @ApiModelProperty(value = "部门名称") private String deptName; - /** - * 部门负责人 - */ + @ApiModelProperty(value = "部门负责人") private String leader; - /** - * 电话 - */ + @ApiModelProperty(value = "电话") private String phone; - /** - * 邮箱 - */ + @ApiModelProperty(value = "邮箱") private String email; - /** - * 状态 - */ + @ApiModelProperty(value = "状态") private Integer status; - /** - * 排序 - */ + @ApiModelProperty(value = "排序") private Integer orderNum; - @TableField(exist = false) private Integer childCount; } diff --git a/src/main/java/com/fc/test/dao/model/SysDictDataModel.java b/src/main/java/com/fc/test/dao/model/SysDictDataModel.java index e8c265594918cdf6f81f554f061d985a5e670184..6501d5e41e9e7dda0df5ca622f58883a5157d6f3 100644 --- a/src/main/java/com/fc/test/dao/model/SysDictDataModel.java +++ b/src/main/java/com/fc/test/dao/model/SysDictDataModel.java @@ -3,6 +3,8 @@ package com.fc.test.dao.model; import com.baomidou.mybatisplus.annotation.TableName; import java.time.LocalDateTime; import java.io.Serializable; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -13,79 +15,57 @@ import lombok.experimental.Accessors; * * * @author pencilso - * @since 2020-04-22 + * @since 2020-04-23 */ @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) @TableName("t_sys_dict_data") +@ApiModel(value="SysDictDataModel对象", description="字典数据表") public class SysDictDataModel implements Serializable { private static final long serialVersionUID = 1L; - /** - * 字典排序 - */ + @ApiModelProperty(value = "主键") + private String id; + + @ApiModelProperty(value = "字典排序") private Integer dictSort; - /** - * 字典标签 - */ + @ApiModelProperty(value = "字典标签") private String dictLabel; - /** - * 字典键值 - */ + @ApiModelProperty(value = "字典键值") private String dictValue; - /** - * 字典类型 - */ + @ApiModelProperty(value = "字典类型") private String dictType; - /** - * 样式属性(其他样式扩展) - */ + @ApiModelProperty(value = "样式属性(其他样式扩展)") private String cssClass; - /** - * 表格回显样式 - */ + @ApiModelProperty(value = "表格回显样式") private String listClass; - /** - * 是否默认(Y是 N否) - */ + @ApiModelProperty(value = "是否默认(Y是 N否)") private String isDefault; - /** - * 状态(0正常 1停用) - */ + @ApiModelProperty(value = "状态(0正常 1停用)") private String status; - /** - * 创建者 - */ + @ApiModelProperty(value = "创建者") private String createBy; - /** - * 创建时间 - */ + @ApiModelProperty(value = "创建时间") private LocalDateTime createTime; - /** - * 更新者 - */ + @ApiModelProperty(value = "更新者") private String updateBy; - /** - * 更新时间 - */ + @ApiModelProperty(value = "更新时间") private LocalDateTime updateTime; - /** - * 备注 - */ + @ApiModelProperty(value = "备注") private String remark; diff --git a/src/main/java/com/fc/test/dao/model/SysDictTypeModel.java b/src/main/java/com/fc/test/dao/model/SysDictTypeModel.java index a6f3c106d1d10ea9cd6dab0bb0f472ef1f7d3330..6424bc0e1c8459e893137c7b990a74e0bc96d2c7 100644 --- a/src/main/java/com/fc/test/dao/model/SysDictTypeModel.java +++ b/src/main/java/com/fc/test/dao/model/SysDictTypeModel.java @@ -3,6 +3,8 @@ package com.fc.test.dao.model; import com.baomidou.mybatisplus.annotation.TableName; import java.time.LocalDateTime; import java.io.Serializable; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -13,54 +15,42 @@ import lombok.experimental.Accessors; * * * @author pencilso - * @since 2020-04-22 + * @since 2020-04-23 */ @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) @TableName("t_sys_dict_type") +@ApiModel(value="SysDictTypeModel对象", description="字典类型表") public class SysDictTypeModel implements Serializable { private static final long serialVersionUID = 1L; - /** - * 字典名称 - */ + @ApiModelProperty(value = "主键") + private String id; + + @ApiModelProperty(value = "字典名称") private String dictName; - /** - * 字典类型 - */ + @ApiModelProperty(value = "字典类型") private String dictType; - /** - * 状态(0正常 1停用) - */ + @ApiModelProperty(value = "状态(0正常 1停用)") private String status; - /** - * 创建者 - */ + @ApiModelProperty(value = "创建者") private String createBy; - /** - * 创建时间 - */ + @ApiModelProperty(value = "创建时间") private LocalDateTime createTime; - /** - * 更新者 - */ + @ApiModelProperty(value = "更新者") private String updateBy; - /** - * 更新时间 - */ + @ApiModelProperty(value = "更新时间") private LocalDateTime updateTime; - /** - * 备注 - */ + @ApiModelProperty(value = "备注") private String remark; diff --git a/src/main/java/com/fc/test/dao/model/SysEmailModel.java b/src/main/java/com/fc/test/dao/model/SysEmailModel.java index a7d5172bf5818ddd13a449121ed0dce84866c693..12832293928cdccdf6121c96c979819c475694c9 100644 --- a/src/main/java/com/fc/test/dao/model/SysEmailModel.java +++ b/src/main/java/com/fc/test/dao/model/SysEmailModel.java @@ -3,6 +3,8 @@ package com.fc.test.dao.model; import com.baomidou.mybatisplus.annotation.TableName; import java.time.LocalDateTime; import java.io.Serializable; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -13,44 +15,36 @@ import lombok.experimental.Accessors; * * * @author pencilso - * @since 2020-04-22 + * @since 2020-04-23 */ @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) @TableName("t_sys_email") +@ApiModel(value="SysEmailModel对象", description="电子邮件") public class SysEmailModel implements Serializable { private static final long serialVersionUID = 1L; - /** - * 接收人电子邮件 - */ + @ApiModelProperty(value = "主键") + private String id; + + @ApiModelProperty(value = "接收人电子邮件") private String receiversEmail; - /** - * 邮件标题 - */ + @ApiModelProperty(value = "邮件标题") private String title; - /** - * 内容 - */ + @ApiModelProperty(value = "内容") private String content; - /** - * 发送人id - */ + @ApiModelProperty(value = "发送人id") private String sendUserId; - /** - * 发送人账号 - */ + @ApiModelProperty(value = "发送人账号") private String sendUserName; - /** - * 创建时间 - */ + @ApiModelProperty(value = "创建时间") private LocalDateTime createTime; diff --git a/src/main/java/com/fc/test/dao/model/SysFileDataModel.java b/src/main/java/com/fc/test/dao/model/SysFileDataModel.java index 4b82aee2b224fec39fafea4964cb927b170db1f8..7179a96aa27745d0ee907d8ded41d0dab5bf4bfe 100644 --- a/src/main/java/com/fc/test/dao/model/SysFileDataModel.java +++ b/src/main/java/com/fc/test/dao/model/SysFileDataModel.java @@ -1,9 +1,9 @@ package com.fc.test.dao.model; import com.baomidou.mybatisplus.annotation.TableName; - import java.io.Serializable; - +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -14,24 +14,24 @@ import lombok.experimental.Accessors; * * * @author pencilso - * @since 2020-04-22 + * @since 2020-04-23 */ @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) @TableName("t_sys_file_data") +@ApiModel(value="SysFileDataModel对象", description="文件数据外键绑定表") public class SysFileDataModel implements Serializable { private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") private String id; - /** - * 数据id - */ + + @ApiModelProperty(value = "数据id") private String dataId; - /** - * 文件id - */ + @ApiModelProperty(value = "文件id") private String fileId; diff --git a/src/main/java/com/fc/test/dao/model/SysFileModel.java b/src/main/java/com/fc/test/dao/model/SysFileModel.java index abdad6f301bfce7b4ef187d4d62b69b91f3a83e5..bd2c9d3896282cd47baf4acf89485db78b11ec68 100644 --- a/src/main/java/com/fc/test/dao/model/SysFileModel.java +++ b/src/main/java/com/fc/test/dao/model/SysFileModel.java @@ -5,7 +5,8 @@ import java.time.LocalDateTime; import java.io.Serializable; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -16,52 +17,39 @@ import lombok.experimental.Accessors; * * * @author pencilso - * @since 2020-04-22 + * @since 2020-04-23 */ @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) @TableName("t_sys_file") +@ApiModel(value="SysFileModel对象", description="文件信息表") public class SysFileModel implements Serializable { private static final long serialVersionUID = 1L; + @ApiModelProperty(value = "主键") private String id; - /** - * 图片名字 - */ + + @ApiModelProperty(value = "图片名字") private String fileName; - /** - * 创建人id - */ + @ApiModelProperty(value = "创建人id") private String createUserId; - /** - * 创建人名字 - */ + @ApiModelProperty(value = "创建人名字") private String createUserName; - /** - * 创建时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建时间") private Date createTime; - /** - * 修改人 - */ + @ApiModelProperty(value = "修改人") private String updateUserId; - /** - * 修改人名字 - */ + @ApiModelProperty(value = "修改人名字") private String updateUserName; - /** - * 修改时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "修改时间") private Date updateTime; diff --git a/src/main/java/com/fc/test/dao/model/SysInterUrlModel.java b/src/main/java/com/fc/test/dao/model/SysInterUrlModel.java index c54c41f388a732210803b5751ac1fc9f4765095d..3f21b8e468f46b23c311ba30d7c600b383ea2aa6 100644 --- a/src/main/java/com/fc/test/dao/model/SysInterUrlModel.java +++ b/src/main/java/com/fc/test/dao/model/SysInterUrlModel.java @@ -2,6 +2,8 @@ package com.fc.test.dao.model; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -12,29 +14,27 @@ import lombok.experimental.Accessors; * * * @author pencilso - * @since 2020-04-22 + * @since 2020-04-23 */ @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) @TableName("t_sys_inter_url") +@ApiModel(value="SysInterUrlModel对象", description="拦截url表") public class SysInterUrlModel implements Serializable { private static final long serialVersionUID = 1L; - /** - * 拦截名称 - */ + @ApiModelProperty(value = "主键") + private String id; + + @ApiModelProperty(value = "拦截名称") private String interName; - /** - * 拦截url - */ + @ApiModelProperty(value = "拦截url") private String url; - /** - * 类型 - */ + @ApiModelProperty(value = "类型") private Integer type; diff --git a/src/main/java/com/fc/test/dao/model/SysNoticeModel.java b/src/main/java/com/fc/test/dao/model/SysNoticeModel.java index c5da23b935cdfd23d780d832736f5d88e4b230f6..f2c72f2d7e46d3a29cdc23b29ff10d7129886324 100644 --- a/src/main/java/com/fc/test/dao/model/SysNoticeModel.java +++ b/src/main/java/com/fc/test/dao/model/SysNoticeModel.java @@ -3,6 +3,8 @@ package com.fc.test.dao.model; import com.baomidou.mybatisplus.annotation.TableName; import java.time.LocalDateTime; import java.io.Serializable; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -13,47 +15,36 @@ import lombok.experimental.Accessors; * * * @author pencilso - * @since 2020-04-22 + * @since 2020-04-23 */ @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) @TableName("t_sys_notice") +@ApiModel(value="SysNoticeModel对象", description="公告") public class SysNoticeModel implements Serializable { private static final long serialVersionUID = 1L; - /** - * 主键ID - */ + + @ApiModelProperty(value = "主键") private String id; - /** - * 标题 - */ + + @ApiModelProperty(value = "标题") private String title; - /** - * 内容 - */ + @ApiModelProperty(value = "内容") private String content; - /** - * 类型 - */ + @ApiModelProperty(value = "类型") private Integer type; - /** - * 创建人id - */ + @ApiModelProperty(value = "创建人id") private String createId; - /** - * 创建人name - */ + @ApiModelProperty(value = "创建人name") private String createUsername; - /** - * 发信时间 - */ + @ApiModelProperty(value = "发信时间") private LocalDateTime createTime; diff --git a/src/main/java/com/fc/test/dao/model/SysNoticeUserModel.java b/src/main/java/com/fc/test/dao/model/SysNoticeUserModel.java index 77da600ce668c0c877e5fa014a5ebadb5ae6a63e..acca9aee849effd589e3bbffe425cdb646ed205d 100644 --- a/src/main/java/com/fc/test/dao/model/SysNoticeUserModel.java +++ b/src/main/java/com/fc/test/dao/model/SysNoticeUserModel.java @@ -2,6 +2,8 @@ package com.fc.test.dao.model; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -12,29 +14,27 @@ import lombok.experimental.Accessors; * * * @author pencilso - * @since 2020-04-22 + * @since 2020-04-23 */ @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) @TableName("t_sys_notice_user") +@ApiModel(value="SysNoticeUserModel对象", description="公告_用户外键") public class SysNoticeUserModel implements Serializable { private static final long serialVersionUID = 1L; - /** - * 公告id - */ + @ApiModelProperty(value = "主键") + private String id; + + @ApiModelProperty(value = "公告id") private String noticeId; - /** - * 用户id - */ + @ApiModelProperty(value = "用户id") private String userId; - /** - * 0未阅读 1 阅读 - */ + @ApiModelProperty(value = "0未阅读 1 阅读") private Integer state; diff --git a/src/main/java/com/fc/test/dao/model/SysOperLogModel.java b/src/main/java/com/fc/test/dao/model/SysOperLogModel.java index 806231c03f73c1e66a40ea8d7d7953cfcfbbb8b5..b9eff271ad44e11e78a448f3c8b8195931b0fcfe 100644 --- a/src/main/java/com/fc/test/dao/model/SysOperLogModel.java +++ b/src/main/java/com/fc/test/dao/model/SysOperLogModel.java @@ -5,6 +5,8 @@ import java.time.LocalDate; import java.io.Serializable; import java.util.Date; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -15,46 +17,37 @@ import lombok.experimental.Accessors; * * * @author pencilso - * @since 2020-04-22 + * @since 2020-04-23 */ @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) @TableName("t_sys_oper_log") +@ApiModel(value="SysOperLogModel对象", description="日志记录表") public class SysOperLogModel implements Serializable { private static final long serialVersionUID = 1L; - /** - * 标题 - */ + private String id; + + @ApiModelProperty(value = "标题") private String title; - /** - * 方法 - */ + @ApiModelProperty(value = "方法") private String method; - /** - * 操作人 - */ + @ApiModelProperty(value = "操作人") private String operName; - /** - * url - */ + @ApiModelProperty(value = "url") private String operUrl; - /** - * 参数 - */ + @ApiModelProperty(value = "参数") private String operParam; private String errorMsg; - /** - * 操作时间 - */ + @ApiModelProperty(value = "操作时间") private Date operTime; diff --git a/src/main/java/com/fc/test/dao/model/SysPermissionModel.java b/src/main/java/com/fc/test/dao/model/SysPermissionModel.java index 21230f1323517d78e755fb61e79c64fdd2a61099..8ef5a4e942de3e73ca6e90cd2798a52f7175610e 100644 --- a/src/main/java/com/fc/test/dao/model/SysPermissionModel.java +++ b/src/main/java/com/fc/test/dao/model/SysPermissionModel.java @@ -1,10 +1,9 @@ package com.fc.test.dao.model; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; - import java.io.Serializable; - +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -15,70 +14,49 @@ import lombok.experimental.Accessors; * * * @author pencilso - * @since 2020-04-22 + * @since 2020-04-23 */ @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) @TableName("t_sys_permission") +@ApiModel(value="SysPermissionModel对象", description="权限表") public class SysPermissionModel implements Serializable { private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "id") private String id; - /** - * 权限名称 - */ + + @ApiModelProperty(value = "权限名称") private String name; - /** - * 权限描述 - */ + @ApiModelProperty(value = "权限描述") private String descripion; - /** - * 授权链接 - */ + @ApiModelProperty(value = "授权链接") private String url; - /** - * 是否跳转 0 不跳转 1跳转 - */ + @ApiModelProperty(value = "是否跳转 0 不跳转 1跳转") private Integer isBlank; - /** - * 父节点id - */ + @ApiModelProperty(value = "父节点id") private String pid; - /** - * 权限标识 - */ + @ApiModelProperty(value = "权限标识") private String perms; - /** - * 类型 0:目录 1:菜单 2:按钮 - */ + @ApiModelProperty(value = "类型 0:目录 1:菜单 2:按钮") private Integer type; - /** - * 菜单图标 - */ + @ApiModelProperty(value = "菜单图标") private String icon; - /** - * 排序 - */ + @ApiModelProperty(value = "排序") private Integer orderNum; - /** - * 是否可见 - */ + @ApiModelProperty(value = "是否可见") private Integer visible; - - /** - * 该字段不在数据库 - */ - @TableField(exist = false) private Integer childCount; } diff --git a/src/main/java/com/fc/test/dao/model/SysPermissionRoleModel.java b/src/main/java/com/fc/test/dao/model/SysPermissionRoleModel.java index f30c4be0941c976b59f25904c67daaa2842eed0c..63b30e2ae16f29364b351653ebc0edeb31ffb88d 100644 --- a/src/main/java/com/fc/test/dao/model/SysPermissionRoleModel.java +++ b/src/main/java/com/fc/test/dao/model/SysPermissionRoleModel.java @@ -2,7 +2,8 @@ package com.fc.test.dao.model; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; - +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -15,26 +16,25 @@ import lombok.experimental.Accessors; * * * @author pencilso - * @since 2020-04-22 + * @since 2020-04-23 */ @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) @TableName("t_sys_permission_role") -@AllArgsConstructor +@ApiModel(value="SysPermissionRoleModel对象", description="角色权限中间表") @NoArgsConstructor +@AllArgsConstructor public class SysPermissionRoleModel implements Serializable { private static final long serialVersionUID = 1L; + private String id; - /** - * 角色id - */ + + @ApiModelProperty(value = "角色id") private String roleId; - /** - * 权限id - */ + @ApiModelProperty(value = "权限id") private String permissionId; diff --git a/src/main/java/com/fc/test/dao/model/SysPositionModel.java b/src/main/java/com/fc/test/dao/model/SysPositionModel.java index 221d66a6d3ec8084c7003e6193fd672ded908055..fcd1a2d0aacbbfd95feb44c3a685b9ec81ab9c32 100644 --- a/src/main/java/com/fc/test/dao/model/SysPositionModel.java +++ b/src/main/java/com/fc/test/dao/model/SysPositionModel.java @@ -2,6 +2,8 @@ package com.fc.test.dao.model; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -12,29 +14,27 @@ import lombok.experimental.Accessors; * * * @author pencilso - * @since 2020-04-22 + * @since 2020-04-23 */ @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) @TableName("t_sys_position") +@ApiModel(value="SysPositionModel对象", description="岗位表") public class SysPositionModel implements Serializable { private static final long serialVersionUID = 1L; - /** - * 岗位名称 - */ + @ApiModelProperty(value = "主键") + private String id; + + @ApiModelProperty(value = "岗位名称") private String postName; - /** - * 排序 - */ + @ApiModelProperty(value = "排序") private Integer orderNum; - /** - * 状态 - */ + @ApiModelProperty(value = "状态") private Integer status; diff --git a/src/main/java/com/fc/test/dao/model/SysProvinceModel.java b/src/main/java/com/fc/test/dao/model/SysProvinceModel.java index 26529af191c5bde48af5fdaf100ebc6a5386ea61..f9dfc69a4c135b623d79d823b6779e214661888d 100644 --- a/src/main/java/com/fc/test/dao/model/SysProvinceModel.java +++ b/src/main/java/com/fc/test/dao/model/SysProvinceModel.java @@ -1,8 +1,12 @@ package com.fc.test.dao.model; import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import java.time.LocalDateTime; import java.io.Serializable; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -13,64 +17,49 @@ import lombok.experimental.Accessors; * * * @author pencilso - * @since 2020-04-22 + * @since 2020-04-23 */ @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) @TableName("t_sys_province") +@ApiModel(value="SysProvinceModel对象", description="省份表") public class SysProvinceModel implements Serializable { private static final long serialVersionUID = 1L; - /** - * 省份代码 - */ + @ApiModelProperty(value = "自增列") + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @ApiModelProperty(value = "省份代码") private String provinceCode; - /** - * 省份名称 - */ + @ApiModelProperty(value = "省份名称") private String provinceName; - /** - * 简称 - */ + @ApiModelProperty(value = "简称") private String shortName; - /** - * 经度 - */ + @ApiModelProperty(value = "经度") private String lng; - /** - * 纬度 - */ + @ApiModelProperty(value = "纬度") private String lat; - /** - * 排序 - */ + @ApiModelProperty(value = "排序") private Integer sort; - /** - * 创建时间 - */ + @ApiModelProperty(value = "创建时间") private LocalDateTime gmtCreate; - /** - * 修改时间 - */ + @ApiModelProperty(value = "修改时间") private LocalDateTime gmtModified; - /** - * 备注 - */ + @ApiModelProperty(value = "备注") private String memo; - /** - * 状态 - */ + @ApiModelProperty(value = "状态") private Integer dataState; diff --git a/src/main/java/com/fc/test/dao/model/SysQuartzJobLogModel.java b/src/main/java/com/fc/test/dao/model/SysQuartzJobLogModel.java index c219050390e6ed1468b01f3db117e4a24f0a99cc..5cc2f15b2d892e74a509bb49fe61d8bbf2716279 100644 --- a/src/main/java/com/fc/test/dao/model/SysQuartzJobLogModel.java +++ b/src/main/java/com/fc/test/dao/model/SysQuartzJobLogModel.java @@ -5,6 +5,8 @@ import java.time.LocalDateTime; import java.io.Serializable; import java.util.Date; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -15,54 +17,42 @@ import lombok.experimental.Accessors; * * * @author pencilso - * @since 2020-04-22 + * @since 2020-04-23 */ @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) @TableName("t_sys_quartz_job_log") +@ApiModel(value="SysQuartzJobLogModel对象", description="定时任务调度日志表") public class SysQuartzJobLogModel implements Serializable { private static final long serialVersionUID = 1L; - /** - * 任务名称 - */ + @ApiModelProperty(value = "主键") + private String id; + + @ApiModelProperty(value = "任务名称") private String jobName; - /** - * 任务组名 - */ + @ApiModelProperty(value = "任务组名") private String jobGroup; - /** - * 调用目标字符串 - */ + @ApiModelProperty(value = "调用目标字符串") private String invokeTarget; - /** - * 日志信息 - */ + @ApiModelProperty(value = "日志信息") private String jobMessage; - /** - * 执行状态(0正常 1失败) - */ + @ApiModelProperty(value = "执行状态(0正常 1失败)") private Integer status; - /** - * 异常信息 - */ + @ApiModelProperty(value = "异常信息") private String exceptionInfo; - /** - * 开始时间 - */ + @ApiModelProperty(value = "开始时间") private Date startTime; - /** - * 结束时间 - */ + @ApiModelProperty(value = "结束时间") private Date endTime; diff --git a/src/main/java/com/fc/test/dao/model/SysQuartzJobModel.java b/src/main/java/com/fc/test/dao/model/SysQuartzJobModel.java index c831f69e4c86bd5b136b4db0d3e31bd932b7a1bb..e557d6230deaeb27bb485a90a970e0d5ba31ee20 100644 --- a/src/main/java/com/fc/test/dao/model/SysQuartzJobModel.java +++ b/src/main/java/com/fc/test/dao/model/SysQuartzJobModel.java @@ -2,6 +2,8 @@ package com.fc.test.dao.model; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -12,49 +14,39 @@ import lombok.experimental.Accessors; * * * @author pencilso - * @since 2020-04-22 + * @since 2020-04-23 */ @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) @TableName("t_sys_quartz_job") +@ApiModel(value="SysQuartzJobModel对象", description="定时任务调度表") public class SysQuartzJobModel implements Serializable { private static final long serialVersionUID = 1L; -private String id; - /** - * 任务名称 - */ + + @ApiModelProperty(value = "日志id") + private String id; + + @ApiModelProperty(value = "任务名称") private String jobName; - /** - * 任务组名 - */ + @ApiModelProperty(value = "任务组名") private String jobGroup; - /** - * 调用目标字符串 - */ + @ApiModelProperty(value = "调用目标字符串") private String invokeTarget; - /** - * cron执行表达式 - */ + @ApiModelProperty(value = "cron执行表达式") private String cronExpression; - /** - * cron计划策略 - */ + @ApiModelProperty(value = "cron计划策略") private String misfirePolicy; - /** - * 是否并发执行(0允许 1禁止) - */ + @ApiModelProperty(value = "是否并发执行(0允许 1禁止)") private String concurrent; - /** - * 任务状态(0正常 1暂停) - */ + @ApiModelProperty(value = "任务状态(0正常 1暂停)") private Integer status; diff --git a/src/main/java/com/fc/test/dao/model/SysRoleModel.java b/src/main/java/com/fc/test/dao/model/SysRoleModel.java index d0297bb32687575c8768a9ae4b6e8f5a68e13009..27956d0c4f59243821bfdfd087519c0b49d8da08 100644 --- a/src/main/java/com/fc/test/dao/model/SysRoleModel.java +++ b/src/main/java/com/fc/test/dao/model/SysRoleModel.java @@ -1,9 +1,9 @@ package com.fc.test.dao.model; import com.baomidou.mybatisplus.annotation.TableName; - import java.io.Serializable; - +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -16,21 +16,23 @@ import lombok.experimental.Accessors; * * * @author pencilso - * @since 2020-04-22 + * @since 2020-04-23 */ +@NoArgsConstructor +@AllArgsConstructor @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) @TableName("t_sys_role") -@NoArgsConstructor -@AllArgsConstructor +@ApiModel(value="SysRoleModel对象", description="角色表") public class SysRoleModel implements Serializable { private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "id") private String id; - /** - * 角色名称 - */ + + @ApiModelProperty(value = "角色名称") private String name; diff --git a/src/main/java/com/fc/test/dao/model/SysRoleUserModel.java b/src/main/java/com/fc/test/dao/model/SysRoleUserModel.java index 2119ad5e294c7fc304d04aa26474912c02fdbd2e..7c3b665a2a2e195bc7a2c0a68d49963525abb666 100644 --- a/src/main/java/com/fc/test/dao/model/SysRoleUserModel.java +++ b/src/main/java/com/fc/test/dao/model/SysRoleUserModel.java @@ -2,13 +2,13 @@ package com.fc.test.dao.model; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; - +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; -import org.apache.ibatis.annotations.Arg; /** *@@ -16,26 +16,25 @@ import org.apache.ibatis.annotations.Arg; *
* * @author pencilso - * @since 2020-04-22 + * @since 2020-04-23 */ @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) @TableName("t_sys_role_user") +@ApiModel(value="SysRoleUserModel对象", description="用户角色中间表") @AllArgsConstructor @NoArgsConstructor public class SysRoleUserModel implements Serializable { private static final long serialVersionUID = 1L; + private String id; - /** - * 用户id - */ + + @ApiModelProperty(value = "用户id") private String sysUserId; - /** - * 角色id - */ + @ApiModelProperty(value = "角色id") private String sysRoleId; diff --git a/src/main/java/com/fc/test/dao/model/SysStreetModel.java b/src/main/java/com/fc/test/dao/model/SysStreetModel.java index 16dea9334aef9f78c1427eb0cee00c669fa8122d..e9ec0b9b711ebf6248ed28d0a00780d6af06bc1a 100644 --- a/src/main/java/com/fc/test/dao/model/SysStreetModel.java +++ b/src/main/java/com/fc/test/dao/model/SysStreetModel.java @@ -1,8 +1,12 @@ package com.fc.test.dao.model; import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import java.time.LocalDateTime; import java.io.Serializable; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -13,69 +17,52 @@ import lombok.experimental.Accessors; * * * @author pencilso - * @since 2020-04-22 + * @since 2020-04-23 */ @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) @TableName("t_sys_street") +@ApiModel(value="SysStreetModel对象", description="街道设置") public class SysStreetModel implements Serializable { private static final long serialVersionUID = 1L; - /** - * 街道代码 - */ + @ApiModelProperty(value = "自增列") + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @ApiModelProperty(value = "街道代码") private String streetCode; - /** - * 父级区代码 - */ + @ApiModelProperty(value = "父级区代码") private String areaCode; - /** - * 街道名称 - */ + @ApiModelProperty(value = "街道名称") private String streetName; - /** - * 简称 - */ + @ApiModelProperty(value = "简称") private String shortName; - /** - * 经度 - */ + @ApiModelProperty(value = "经度") private String lng; - /** - * 纬度 - */ + @ApiModelProperty(value = "纬度") private String lat; - /** - * 排序 - */ + @ApiModelProperty(value = "排序") private Integer sort; - /** - * 创建时间 - */ + @ApiModelProperty(value = "创建时间") private LocalDateTime gmtCreate; - /** - * 修改时间 - */ + @ApiModelProperty(value = "修改时间") private LocalDateTime gmtModified; - /** - * 备注 - */ + @ApiModelProperty(value = "备注") private String memo; - /** - * 状态 - */ + @ApiModelProperty(value = "状态") private Integer dataState; diff --git a/src/main/java/com/fc/test/dao/model/SysUserModel.java b/src/main/java/com/fc/test/dao/model/SysUserModel.java index 48575e80e5227071df7e0f0590cec1cac859149c..8b3642ddbe60840549209d83ade606586d1dbf59 100644 --- a/src/main/java/com/fc/test/dao/model/SysUserModel.java +++ b/src/main/java/com/fc/test/dao/model/SysUserModel.java @@ -2,6 +2,8 @@ package com.fc.test.dao.model; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -12,33 +14,27 @@ import lombok.experimental.Accessors; * * * @author pencilso - * @since 2020-04-22 + * @since 2020-04-23 */ @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) @TableName("t_sys_user") +@ApiModel(value="SysUserModel对象", description="用户表") public class SysUserModel implements Serializable { private static final long serialVersionUID = 1L; - /** - * 用户id - */ + + @ApiModelProperty(value = "主键") private String id; - /** - * 用户账号 - */ + @ApiModelProperty(value = "用户账号") private String username; - /** - * 用户密码 - */ + @ApiModelProperty(value = "用户密码") private String password; - /** - * 昵称 - */ + @ApiModelProperty(value = "昵称") private String nickname; diff --git a/src/main/java/com/fc/test/dao/model/TestModel.java b/src/main/java/com/fc/test/dao/model/TestModel.java index f4c942bca5c84ff86f171f64efe42beae3f8c257..e3f975f4d0b1801768fa42c700d9ec1548b779ab 100644 --- a/src/main/java/com/fc/test/dao/model/TestModel.java +++ b/src/main/java/com/fc/test/dao/model/TestModel.java @@ -3,6 +3,8 @@ package com.fc.test.dao.model; import com.baomidou.mybatisplus.annotation.TableName; import java.time.LocalDateTime; import java.io.Serializable; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -13,34 +15,30 @@ import lombok.experimental.Accessors; * * * @author pencilso - * @since 2020-04-22 + * @since 2020-04-23 */ @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) @TableName("t_test") +@ApiModel(value="TestModel对象", description="测试表") public class TestModel implements Serializable { private static final long serialVersionUID = 1L; - /** - * 名称 - */ + @ApiModelProperty(value = "主键") + private String id; + + @ApiModelProperty(value = "名称") private String name; - /** - * 性别 - */ + @ApiModelProperty(value = "性别") private Integer age; - /** - * 创建时间 - */ + @ApiModelProperty(value = "创建时间") private LocalDateTime crateTime; - /** - * 名字 - */ + @ApiModelProperty(value = "名字") private String tesName; diff --git a/src/main/java/com/fc/test/dao/service/impl/SysAreaServiceImpl.java b/src/main/java/com/fc/test/dao/service/impl/SysAreaServiceImpl.java index 7549b60beb5807e85ded222a4ac84c53d691d6c9..5d2cefc0618a9e376baf6c3a79af68d8fdc5e427 100644 --- a/src/main/java/com/fc/test/dao/service/impl/SysAreaServiceImpl.java +++ b/src/main/java/com/fc/test/dao/service/impl/SysAreaServiceImpl.java @@ -1,9 +1,9 @@ package com.fc.test.dao.service.impl; -import com.fc.test.dao.model.SysAreaModel; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fc.test.dao.mapper.SysAreaMapper; +import com.fc.test.dao.model.SysAreaModel; import com.fc.test.dao.service.SysAreaService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import java.util.List; diff --git a/src/main/java/com/fc/test/dao/service/impl/SysDepartmentServiceImpl.java b/src/main/java/com/fc/test/dao/service/impl/SysDepartmentServiceImpl.java index 586335487cf25c19e9d7d8a5bceeeac4005a5d2b..d04c86e8881e04f00612d335d6917af6129e18f3 100644 --- a/src/main/java/com/fc/test/dao/service/impl/SysDepartmentServiceImpl.java +++ b/src/main/java/com/fc/test/dao/service/impl/SysDepartmentServiceImpl.java @@ -34,25 +34,26 @@ public class SysDepartmentServiceImpl extends ServiceImpl