From a972ea581c9c426a0aa8dfaa9b7b619afe5471d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E5=85=88=E7=94=9F?= <songlongkuan@gmail.com>
Date: Thu, 23 Apr 2020 10:16:57 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix=20=E5=88=A4=E6=96=AD=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/fc/test/util/StringUtils.java | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/fc/test/util/StringUtils.java b/src/main/java/com/fc/test/util/StringUtils.java
index e214fd8..0894cc3 100644
--- a/src/main/java/com/fc/test/util/StringUtils.java
+++ b/src/main/java/com/fc/test/util/StringUtils.java
@@ -1,17 +1,15 @@
 package com.fc.test.util;
 
-import java.io.Serializable;
+import com.fc.test.common.support.StrFormatter;
+import org.apache.commons.lang.WordUtils;
+import org.apache.commons.lang.text.StrBuilder;
+import org.springframework.util.Assert;
+
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.lang.WordUtils;
-import org.apache.commons.lang.text.StrBuilder;
-
-import com.fc.test.common.support.StrFormatter;
-import org.springframework.util.Assert;
-
 
 /**
  * 字符串工具类
@@ -435,8 +433,8 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
      * @return
      */
     public static String[] splitArray(String context, String regex) {
-        Assert.isTrue(StringUtils.isBlank(context), "splitArray context can not be null");
-        Assert.isTrue(StringUtils.isBlank(regex), "splitArray regex can not be null");
+        Assert.isTrue(StringUtils.isNotBlank(context), "splitArray context can not be null");
+        Assert.isTrue(StringUtils.isNotBlank(regex), "splitArray regex can not be null");
         return context.split(regex);
     }
 
-- 
Gitee


From 793af436bb5505891adc4d180507568f7f2691fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E5=85=88=E7=94=9F?= <songlongkuan@gmail.com>
Date: Thu, 23 Apr 2020 10:54:34 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E6=A8=A1?=
 =?UTF-8?q?=E5=9E=8B=20=20model=20=20=E6=B7=BB=E5=8A=A0swagger=E6=B3=A8?=
 =?UTF-8?q?=E8=A7=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fc/test/dao/model/SysAreaModel.java   | 59 +++++++-----------
 .../com/fc/test/dao/model/SysCityModel.java   | 59 +++++++-----------
 .../com/fc/test/dao/model/SysDatasModel.java  | 18 +++---
 .../fc/test/dao/model/SysDepartmentModel.java | 43 ++++++-------
 .../fc/test/dao/model/SysDictDataModel.java   | 60 +++++++------------
 .../fc/test/dao/model/SysDictTypeModel.java   | 40 +++++--------
 .../com/fc/test/dao/model/SysEmailModel.java  | 32 ++++------
 .../fc/test/dao/model/SysFileDataModel.java   | 18 +++---
 .../com/fc/test/dao/model/SysFileModel.java   | 38 ++++--------
 .../fc/test/dao/model/SysInterUrlModel.java   | 20 +++----
 .../com/fc/test/dao/model/SysNoticeModel.java | 35 ++++-------
 .../fc/test/dao/model/SysNoticeUserModel.java | 20 +++----
 .../fc/test/dao/model/SysOperLogModel.java    | 31 ++++------
 .../fc/test/dao/model/SysPermissionModel.java | 56 ++++++-----------
 .../dao/model/SysPermissionRoleModel.java     | 18 +++---
 .../fc/test/dao/model/SysPositionModel.java   | 20 +++----
 .../fc/test/dao/model/SysProvinceModel.java   | 51 +++++++---------
 .../test/dao/model/SysQuartzJobLogModel.java  | 40 +++++--------
 .../fc/test/dao/model/SysQuartzJobModel.java  | 38 +++++-------
 .../com/fc/test/dao/model/SysRoleModel.java   | 18 +++---
 .../fc/test/dao/model/SysRoleUserModel.java   | 17 +++---
 .../com/fc/test/dao/model/SysStreetModel.java | 55 +++++++----------
 .../com/fc/test/dao/model/SysUserModel.java   | 22 +++----
 .../java/com/fc/test/dao/model/TestModel.java | 24 ++++----
 .../dao/service/impl/SysAreaServiceImpl.java  |  4 +-
 .../impl/SysDepartmentServiceImpl.java        | 15 ++---
 26 files changed, 338 insertions(+), 513 deletions(-)

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 999a4fb..e8bd96f 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;
  * </p>
  *
  * @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 c13977a..4ea3788 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;
  * </p>
  *
  * @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 0270213..c7aa729 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;
  * </p>
  *
  * @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 49d4c65..1ec2c61 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;
  * </p>
  *
  * @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 e8c2655..6501d5e 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;
  * </p>
  *
  * @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 a6f3c10..6424bc0 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;
  * </p>
  *
  * @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 a7d5172..1283229 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;
  * </p>
  *
  * @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 4b82aee..7179a96 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;
  * </p>
  *
  * @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 abdad6f..bd2c9d3 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;
  * </p>
  *
  * @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 c54c41f..3f21b8e 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;
  * </p>
  *
  * @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 c5da23b..f2c72f2 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;
  * </p>
  *
  * @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 77da600..acca9ae 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;
  * </p>
  *
  * @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 806231c..b9eff27 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;
  * </p>
  *
  * @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 21230f1..8ef5a4e 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;
  * </p>
  *
  * @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 f30c4be..63b30e2 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;
  * </p>
  *
  * @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 221d66a..fcd1a2d 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;
  * </p>
  *
  * @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 26529af..f9dfc69 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;
  * </p>
  *
  * @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 c219050..5cc2f15 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;
  * </p>
  *
  * @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 c831f69..e557d62 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;
  * </p>
  *
  * @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 d0297bb..27956d0 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;
  * </p>
  *
  * @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 2119ad5..7c3b665 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;
 
 /**
  * <p>
@@ -16,26 +16,25 @@ import org.apache.ibatis.annotations.Arg;
  * </p>
  *
  * @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 16dea93..e9ec0b9 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;
  * </p>
  *
  * @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 48575e8..8b3642d 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;
  * </p>
  *
  * @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 f4c942b..e3f975f 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;
  * </p>
  *
  * @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 7549b60..5d2cefc 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 5863354..d04c86e 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<SysDepartmentMapper, S
 
     /**
      * 获取树
+     *
      * @param menuList
      * @param parentId
      * @return
      */
-    private static List<BootstrapTree> getbooBootstrapTreePerm(List<SysDepartmentModel> menuList, String parentId){
+    private static List<BootstrapTree> getbooBootstrapTreePerm(List<SysDepartmentModel> menuList, String parentId) {
         List<BootstrapTree> treeList = new ArrayList<>();
         List<BootstrapTree> childList = null;
-        for(SysDepartmentModel p : menuList) {
-            p.setParentId(p.getParentId()==null||p.getParentId().trim().equals("")? "0":p.getParentId());
-            if(p.getParentId().trim().equals(parentId)) {
-                if(p.getChildCount()!=null&&p.getChildCount()>0) {
+        for (SysDepartmentModel p : menuList) {
+            p.setParentId(p.getParentId() == null || p.getParentId().trim().equals("") ? "0" : p.getParentId());
+            if (p.getParentId().trim().equals(parentId)) {
+                if (p.getChildCount() != null && p.getChildCount() > 0) {
                     childList = getbooBootstrapTreePerm(menuList, String.valueOf(p.getId()));
                 }
-                BootstrapTree bootstrapTree = new BootstrapTree(p.getDeptName(), "", "", String.valueOf(p.getId()), "",0,childList,p.getDeptName(),p.getStatus());
+                BootstrapTree bootstrapTree = new BootstrapTree(p.getDeptName(), "", "", String.valueOf(p.getId()), "", 0, childList, p.getDeptName(), p.getStatus());
                 treeList.add(bootstrapTree);
                 childList = null;
             }
         }
-        return treeList.size() >0 ? treeList : null;
+        return treeList.size() > 0 ? treeList : null;
     }
 
     /**
-- 
Gitee


From e185fcc491f4269305d0e12a80bd61a72fa7a456 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E5=85=88=E7=94=9F?= <songlongkuan@gmail.com>
Date: Thu, 23 Apr 2020 10:58:03 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=20=20=E5=BF=BD=E7=95=A5git=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                              | 4 ++++
 "d:\\springbootv2-log/springbootv2.log" | 0
 2 files changed, 4 insertions(+)
 delete mode 100644 "d:\\springbootv2-log/springbootv2.log"

diff --git a/.gitignore b/.gitignore
index e8a6d93..f1be357 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 e69de29..0000000
-- 
Gitee