Forráskód Böngészése

权限管理模块-bean更新生成bean代swagger注解

songxinlu 3 éve
szülő
commit
d129f63c4a
39 módosított fájl, 696 hozzáadás és 691 törlés
  1. 11 24
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/DataAuth.java
  2. 11 24
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/DataAuthDetail.java
  3. 13 30
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/Dept.java
  4. 10 21
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/DeptDoctor.java
  5. 10 21
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/Dictionaries.java
  6. 12 27
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/Doctor.java
  7. 14 33
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/Hospital.java
  8. 9 18
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/HospitalUser.java
  9. 15 36
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/Log.java
  10. 12 27
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/LoginLog.java
  11. 10 21
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/Medoup.java
  12. 9 18
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/MedoupDoctor.java
  13. 17 42
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/Menu.java
  14. 11 24
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/MenuResource.java
  15. 12 27
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/Region.java
  16. 12 27
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/RegionDept.java
  17. 14 33
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/Resource.java
  18. 12 27
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/Role.java
  19. 10 21
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/RoleService.java
  20. 8 15
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/RoleServiceDataAuth.java
  21. 9 18
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/ServiceDataAuth.java
  22. 10 21
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/ServiceMenu.java
  23. 10 21
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/ServiceResource.java
  24. 11 24
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/ServiceSet.java
  25. 12 21
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/SysService.java
  26. 18 45
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/User.java
  27. 11 24
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/UserRole.java
  28. 13 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/RoleServiceFacade.java
  29. 13 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/ServiceDataAuthFacade.java
  30. 13 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/ServiceMenuFacade.java
  31. 13 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/ServiceResourceFacade.java
  32. 2 0
      dblayer-mbg/src/main/resources/freemarker/entity.java.ftl
  33. 1 1
      dblayer-mbg/src/test/java/com/lantone/dblayermbg/GeneratorUtil.java
  34. 53 0
      security-center/src/main/java/com/lantone/security/enums/CRUDEnum.java
  35. 170 0
      security-center/src/main/java/com/lantone/security/facade/DataAuthHandleFacade.java
  36. 23 0
      security-center/src/main/java/com/lantone/security/vo/DataAuthVO.java
  37. 33 0
      security-center/src/main/java/com/lantone/security/vo/ServiceDataAuthVO.java
  38. 24 0
      security-center/src/main/java/com/lantone/security/vo/SysServiceVO.java
  39. 25 0
      security-center/src/main/java/com/lantone/security/web/DataAuthController.java

+ 11 - 24
dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/DataAuth.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -16,55 +18,40 @@ import java.util.Date;
  */
 @Data
 @TableName("sys_data_auth")
+@ApiModel(value="DataAuth对象", description="数据权限表")
 public class DataAuth implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 编号
-     */
+    @ApiModelProperty(value = "编号")
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
-    /**
-     * 数据权限名称
-     */
+    @ApiModelProperty(value = "数据权限名称")
     @TableField("auth_name")
     private String authName;
 
-    /**
-     * 状态 0:禁用,1:启用
-     */
+    @ApiModelProperty(value = "状态 0:禁用,1:启用")
     @TableField("status")
     private String status;
 
-    /**
-     * 排序
-     */
+    @ApiModelProperty(value = "排序")
     @TableField("order_no")
     private String orderNo;
 
-    /**
-     * 医院ID
-     */
+    @ApiModelProperty(value = "医院ID")
     @TableField("hospital_id")
     private String hospitalId;
 
-    /**
-     * 创建用户编号
-     */
+    @ApiModelProperty(value = "创建用户编号")
     @TableField("creator")
     private Long creator;
 
-    /**
-     * 创建时间
-     */
+    @ApiModelProperty(value = "创建时间")
     @TableField("create_time")
     private Date createTime;
 
-    /**
-     * 是否删除,N:未删除,Y:删除
-     */
+    @ApiModelProperty(value = "是否删除,N:未删除,Y:删除")
     @TableField("is_deleted")
     private String isDeleted;
 

+ 11 - 24
dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/DataAuthDetail.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -16,55 +18,40 @@ import java.util.Date;
  */
 @Data
 @TableName("sys_data_auth_detail")
+@ApiModel(value="DataAuthDetail对象", description="数据权限详情表")
 public class DataAuthDetail implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 编号
-     */
+    @ApiModelProperty(value = "编号")
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
-    /**
-     * 数据权限编号
-     */
+    @ApiModelProperty(value = "数据权限编号")
     @TableField("service_data_auth_id")
     private Long serviceDataAuthId;
 
-    /**
-     * 数据范围类型::1:全部组织,2:全部科室,3:全部科室除本科室外,4:本科室,5:本医疗组,6:本人,7:自定义
-     */
+    @ApiModelProperty(value = "数据范围类型::1:全部组织,2:全部科室,3:全部科室除本科室外,4:本科室,5:本医疗组,6:本人,7:自定义")
     @TableField("data_type")
     private String dataType;
 
-    /**
-     * detail_id的类型 1:detail_id为医院id 2:为科室id3:为医生id
-     */
+    @ApiModelProperty(value = "detail_id的类型 1:detail_id为医院id 2:为科室id3:为医生id")
     @TableField("detail_type")
     private String detailType;
 
-    /**
-     * 医院、科室、医生id
-     */
+    @ApiModelProperty(value = "医院、科室、医生id")
     @TableField("detail_id")
     private String detailId;
 
-    /**
-     * 创建用户编号
-     */
+    @ApiModelProperty(value = "创建用户编号")
     @TableField("creator")
     private Long creator;
 
-    /**
-     * 创建时间
-     */
+    @ApiModelProperty(value = "创建时间")
     @TableField("create_time")
     private Date createTime;
 
-    /**
-     * 是否删除,N:未删除,Y:删除
-     */
+    @ApiModelProperty(value = "是否删除,N:未删除,Y:删除")
     @TableField("is_deleted")
     private String isDeleted;
 

+ 13 - 30
dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/Dept.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -16,6 +18,7 @@ import java.util.Date;
  */
 @Data
 @TableName("sys_dept")
+@ApiModel(value="Dept对象", description="科室表")
 public class Dept implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -23,63 +26,43 @@ public class Dept implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
-    /**
-     * 医院ID
-     */
+    @ApiModelProperty(value = "医院ID")
     @TableField("hospital_id")
     private Long hospitalId;
 
-    /**
-     * 医院科室编码
-     */
+    @ApiModelProperty(value = "医院科室编码")
     @TableField("code")
     private String code;
 
-    /**
-     * 科室名称
-     */
+    @ApiModelProperty(value = "科室名称")
     @TableField("name")
     private String name;
 
-    /**
-     * 类别
-     */
+    @ApiModelProperty(value = "类别")
     @TableField("type")
     private String type;
 
-    /**
-     * 首字母拼音
-     */
+    @ApiModelProperty(value = "首字母拼音")
     @TableField("spell")
     private String spell;
 
-    /**
-     * 区域类别
-     */
+    @ApiModelProperty(value = "区域类别")
     @TableField("station")
     private String station;
 
-    /**
-     * 排序
-     */
+    @ApiModelProperty(value = "排序")
     @TableField("order_no")
     private String orderNo;
 
-    /**
-     * 创建用户编号
-     */
+    @ApiModelProperty(value = "创建用户编号")
     @TableField("creator")
     private Long creator;
 
-    /**
-     * 创建时间
-     */
+    @ApiModelProperty(value = "创建时间")
     @TableField("create_time")
     private Date createTime;
 
-    /**
-     * 是否删除,N:未删除,Y:删除
-     */
+    @ApiModelProperty(value = "是否删除,N:未删除,Y:删除")
     @TableField("is_deleted")
     private String isDeleted;
 

+ 10 - 21
dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/DeptDoctor.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -16,6 +18,7 @@ import java.util.Date;
  */
 @Data
 @TableName("sys_dept_doctor")
+@ApiModel(value="DeptDoctor对象", description="科室医生关联表")
 public class DeptDoctor implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -23,45 +26,31 @@ public class DeptDoctor implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
-    /**
-     * 医院ID
-     */
+    @ApiModelProperty(value = "医院ID")
     @TableField("hospital_id")
     private Long hospitalId;
 
-    /**
-     * 科室ID
-     */
+    @ApiModelProperty(value = "科室ID")
     @TableField("dept_id")
     private Long deptId;
 
-    /**
-     * 医生ID
-     */
+    @ApiModelProperty(value = "医生ID")
     @TableField("doctor_id")
     private Long doctorId;
 
-    /**
-     * 创建用户编号
-     */
+    @ApiModelProperty(value = "创建用户编号")
     @TableField("creator")
     private Long creator;
 
-    /**
-     * 创建时间
-     */
+    @ApiModelProperty(value = "创建时间")
     @TableField("create_time")
     private Date createTime;
 
-    /**
-     * 排序
-     */
+    @ApiModelProperty(value = "排序")
     @TableField("order_no")
     private String orderNo;
 
-    /**
-     * 是否删除,N:未删除,Y:删除
-     */
+    @ApiModelProperty(value = "是否删除,N:未删除,Y:删除")
     @TableField("is_deleted")
     private String isDeleted;
 

+ 10 - 21
dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/Dictionaries.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -15,49 +17,36 @@ import java.io.Serializable;
  */
 @Data
 @TableName("sys_dictionaries")
+@ApiModel(value="Dictionaries对象", description="字典管理表")
 public class Dictionaries implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 字典id
-     */
+    @ApiModelProperty(value = "字典id")
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
-    /**
-     * 代码类别
-     */
+    @ApiModelProperty(value = "代码类别")
     @TableField("type")
     private String type;
 
-    /**
-     * 字典编码
-     */
+    @ApiModelProperty(value = "字典编码")
     @TableField("code")
     private String code;
 
-    /**
-     * 代码名称
-     */
+    @ApiModelProperty(value = "代码名称")
     @TableField("name")
     private String name;
 
-    /**
-     * 字典说明
-     */
+    @ApiModelProperty(value = "字典说明")
     @TableField("explain")
     private String explain;
 
-    /**
-     * 状态 0:禁用,1:启用
-     */
+    @ApiModelProperty(value = "状态 0:禁用,1:启用")
     @TableField("status")
     private String status;
 
-    /**
-     * 是否删除,N:未删除,Y:删除
-     */
+    @ApiModelProperty(value = "是否删除,N:未删除,Y:删除")
     @TableField("is_deleted")
     private String isDeleted;
 

+ 12 - 27
dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/Doctor.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -16,61 +18,44 @@ import java.util.Date;
  */
 @Data
 @TableName("sys_doctor")
+@ApiModel(value="Doctor对象", description="医生表")
 public class Doctor implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 编号
-     */
+    @ApiModelProperty(value = "编号")
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
-    /**
-     * 医生编码
-     */
+    @ApiModelProperty(value = "医生编码")
     @TableField("code")
     private String code;
 
-    /**
-     * 医生姓名
-     */
+    @ApiModelProperty(value = "医生姓名")
     @TableField("name")
     private String name;
 
-    /**
-     * 手机号
-     */
+    @ApiModelProperty(value = "手机号")
     @TableField("mobilePhone")
     private String mobilePhone;
 
-    /**
-     * 职称
-     */
+    @ApiModelProperty(value = "职称")
     @TableField("professor")
     private String professor;
 
-    /**
-     * 职业医师资格(0:无,1:有)
-     */
+    @ApiModelProperty(value = "职业医师资格(0:无,1:有)")
     @TableField("occup")
     private String occup;
 
-    /**
-     * 创建用户编号
-     */
+    @ApiModelProperty(value = "创建用户编号")
     @TableField("creator")
     private Long creator;
 
-    /**
-     * 创建时间
-     */
+    @ApiModelProperty(value = "创建时间")
     @TableField("create_time")
     private Date createTime;
 
-    /**
-     * 是否删除,N:未删除,Y:删除
-     */
+    @ApiModelProperty(value = "是否删除,N:未删除,Y:删除")
     @TableField("is_deleted")
     private String isDeleted;
 

+ 14 - 33
dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/Hospital.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -16,76 +18,55 @@ import java.util.Date;
  */
 @Data
 @TableName("sys_hospital")
+@ApiModel(value="Hospital对象", description="组织表")
 public class Hospital implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 编号
-     */
+    @ApiModelProperty(value = "编号")
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
     @TableField("parent_id")
     private Long parentId;
 
-    /**
-     * 医院编码
-     */
+    @ApiModelProperty(value = "医院编码")
     @TableField("org_code")
     private String orgCode;
 
-    /**
-     * 父级编码
-     */
+    @ApiModelProperty(value = "父级编码")
     @TableField("parent_code")
     private String parentCode;
 
-    /**
-     * 名称
-     */
+    @ApiModelProperty(value = "名称")
     @TableField("name")
     private String name;
 
-    /**
-     * 归属区域
-     */
+    @ApiModelProperty(value = "归属区域")
     @TableField("region")
     private String region;
 
-    /**
-     * 组织类型(集团医院、医共、医联、医院)
-     */
+    @ApiModelProperty(value = "组织类型(集团医院、医共、医联、医院)")
     @TableField("type")
     private String type;
 
-    /**
-     * 排序
-     */
+    @ApiModelProperty(value = "排序")
     @TableField("order_no")
     private String orderNo;
 
-    /**
-     * 状态 0:禁用,1:启用
-     */
+    @ApiModelProperty(value = "状态 0:禁用,1:启用")
     @TableField("status")
     private String status;
 
-    /**
-     * 创建者编号
-     */
+    @ApiModelProperty(value = "创建者编号")
     @TableField("creator")
     private Long creator;
 
-    /**
-     * 创建时间
-     */
+    @ApiModelProperty(value = "创建时间")
     @TableField("create_time")
     private Date createTime;
 
-    /**
-     * 是否删除,N:未删除,Y:删除
-     */
+    @ApiModelProperty(value = "是否删除,N:未删除,Y:删除")
     @TableField("is_deleted")
     private String isDeleted;
 

+ 9 - 18
dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/HospitalUser.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -16,43 +18,32 @@ import java.util.Date;
  */
 @Data
 @TableName("sys_hospital_user")
+@ApiModel(value="HospitalUser对象", description="用户组织关联表")
 public class HospitalUser implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 编号
-     */
+    @ApiModelProperty(value = "编号")
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
-    /**
-     * 组织编号
-     */
+    @ApiModelProperty(value = "组织编号")
     @TableField("hospital_id")
     private Long hospitalId;
 
-    /**
-     * 用户编号
-     */
+    @ApiModelProperty(value = "用户编号")
     @TableField("user_id")
     private Long userId;
 
-    /**
-     * 创建者编号
-     */
+    @ApiModelProperty(value = "创建者编号")
     @TableField("creator")
     private Long creator;
 
-    /**
-     * 创建时间
-     */
+    @ApiModelProperty(value = "创建时间")
     @TableField("create_time")
     private Date createTime;
 
-    /**
-     * 是否删除,N:未删除,Y:删除
-     */
+    @ApiModelProperty(value = "是否删除,N:未删除,Y:删除")
     @TableField("is_deleted")
     private String isDeleted;
 

+ 15 - 36
dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/Log.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -16,79 +18,56 @@ import java.util.Date;
  */
 @Data
 @TableName("sys_log")
+@ApiModel(value="Log对象", description="系统操作日志表")
 public class Log implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 编号
-     */
+    @ApiModelProperty(value = "编号")
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
-    /**
-     * 操作内容
-     */
+    @ApiModelProperty(value = "操作内容")
     @TableField("operationContent")
     private String operationContent;
 
-    /**
-     * 日志类型(正常、异常)
-     */
+    @ApiModelProperty(value = "日志类型(正常、异常)")
     @TableField("type")
     private String type;
 
-    /**
-     * 操作ip地址
-     */
+    @ApiModelProperty(value = "操作ip地址")
     @TableField("remote_addr")
     private String remoteAddr;
 
-    /**
-     * 用户代理
-     */
+    @ApiModelProperty(value = "用户代理")
     @TableField("user_agent")
     private String userAgent;
 
-    /**
-     * 请求uri
-     */
+    @ApiModelProperty(value = "请求uri")
     @TableField("request_uri")
     private String requestUri;
 
-    /**
-     * http请求方法
-     */
+    @ApiModelProperty(value = "http请求方法")
     @TableField("method")
     private String method;
 
-    /**
-     * http请求体
-     */
+    @ApiModelProperty(value = "http请求体")
     @TableField("params")
     private String params;
 
-    /**
-     * 异常信息
-     */
+    @ApiModelProperty(value = "异常信息")
     @TableField("exception")
     private String exception;
 
-    /**
-     * 创建时间
-     */
+    @ApiModelProperty(value = "创建时间")
     @TableField("create_date")
     private Date createDate;
 
-    /**
-     * 操作人
-     */
+    @ApiModelProperty(value = "操作人")
     @TableField("operator")
     private String operator;
 
-    /**
-     * 是否删除,N:未删除,Y:删除
-     */
+    @ApiModelProperty(value = "是否删除,N:未删除,Y:删除")
     @TableField("is_deleted")
     private String isDeleted;
 

+ 12 - 27
dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/LoginLog.java

@@ -3,6 +3,8 @@ package com.lantone.dblayermbg.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -14,61 +16,44 @@ import java.util.Date;
  * </p>
  */
 @Data
+@ApiModel(value="LoginLog对象", description="登录日志表")
 public class LoginLog implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 编号
-     */
+    @ApiModelProperty(value = "编号")
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
-    /**
-     * 用户编号
-     */
+    @ApiModelProperty(value = "用户编号")
     @TableField("user_id")
     private Long userId;
 
-    /**
-     * 用户姓名
-     */
+    @ApiModelProperty(value = "用户姓名")
     @TableField("user_name")
     private String userName;
 
-    /**
-     * 登录时间
-     */
+    @ApiModelProperty(value = "登录时间")
     @TableField("login_time")
     private Date loginTime;
 
-    /**
-     * 0成功、-1失败、-2密码错误
-     */
+    @ApiModelProperty(value = "0成功、-1失败、-2密码错误")
     @TableField("login_status")
     private String loginStatus;
 
-    /**
-     * 登录ip
-     */
+    @ApiModelProperty(value = "登录ip")
     @TableField("login_ip")
     private String loginIp;
 
-    /**
-     * 浏览器
-     */
+    @ApiModelProperty(value = "浏览器")
     @TableField("login_browser")
     private String loginBrowser;
 
-    /**
-     * 备注
-     */
+    @ApiModelProperty(value = "备注")
     @TableField("remark")
     private String remark;
 
-    /**
-     * 是否删除,N:未删除,Y:删除
-     */
+    @ApiModelProperty(value = "是否删除,N:未删除,Y:删除")
     @TableField("is_deleted")
     private String isDeleted;
 

+ 10 - 21
dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/Medoup.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -16,6 +18,7 @@ import java.util.Date;
  */
 @Data
 @TableName("sys_medoup")
+@ApiModel(value="Medoup对象", description="医疗小组信息表")
 public class Medoup implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -23,45 +26,31 @@ public class Medoup implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
-    /**
-     * 医院ID
-     */
+    @ApiModelProperty(value = "医院ID")
     @TableField("hospital_id")
     private Long hospitalId;
 
-    /**
-     * 科室ID
-     */
+    @ApiModelProperty(value = "科室ID")
     @TableField("dept_id")
     private Long deptId;
 
-    /**
-     * 医疗小组编码
-     */
+    @ApiModelProperty(value = "医疗小组编码")
     @TableField("code")
     private String code;
 
-    /**
-     * 医疗小组姓名
-     */
+    @ApiModelProperty(value = "医疗小组姓名")
     @TableField("name")
     private String name;
 
-    /**
-     * 创建用户编号
-     */
+    @ApiModelProperty(value = "创建用户编号")
     @TableField("creator")
     private Long creator;
 
-    /**
-     * 创建时间
-     */
+    @ApiModelProperty(value = "创建时间")
     @TableField("create_time")
     private Date createTime;
 
-    /**
-     * 是否删除,N:未删除,Y:删除
-     */
+    @ApiModelProperty(value = "是否删除,N:未删除,Y:删除")
     @TableField("is_deleted")
     private String isDeleted;
 

+ 9 - 18
dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/MedoupDoctor.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -16,6 +18,7 @@ import java.util.Date;
  */
 @Data
 @TableName("sys_medoup_doctor")
+@ApiModel(value="MedoupDoctor对象", description="医疗组医生关联表")
 public class MedoupDoctor implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -23,39 +26,27 @@ public class MedoupDoctor implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
-    /**
-     * 医院ID
-     */
+    @ApiModelProperty(value = "医院ID")
     @TableField("hospital_id")
     private Long hospitalId;
 
-    /**
-     * 科室ID
-     */
+    @ApiModelProperty(value = "科室ID")
     @TableField("dept_id")
     private Long deptId;
 
-    /**
-     * 医生ID
-     */
+    @ApiModelProperty(value = "医生ID")
     @TableField("dcotor_id")
     private Long dcotorId;
 
-    /**
-     * 创建者
-     */
+    @ApiModelProperty(value = "创建者")
     @TableField("creator")
     private Long creator;
 
-    /**
-     * 创建时间
-     */
+    @ApiModelProperty(value = "创建时间")
     @TableField("create_time")
     private Date createTime;
 
-    /**
-     * 是否删除,N:未删除,Y:删除
-     */
+    @ApiModelProperty(value = "是否删除,N:未删除,Y:删除")
     @TableField("is_deleted")
     private String isDeleted;
 

+ 17 - 42
dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/Menu.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -16,91 +18,64 @@ import java.util.Date;
  */
 @Data
 @TableName("sys_menu")
+@ApiModel(value="Menu对象", description="菜单功能表")
 public class Menu implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 编号
-     */
+    @ApiModelProperty(value = "编号")
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
-    /**
-     * 父级编号
-     */
+    @ApiModelProperty(value = "父级编号")
     @TableField("parent_id")
     private Long parentId;
 
-    /**
-     * 服务id
-     */
+    @ApiModelProperty(value = "服务id")
     @TableField("service_id")
     private Long serviceId;
 
-    /**
-     * 功能名称
-     */
+    @ApiModelProperty(value = "功能名称")
     @TableField("name")
     private String name;
 
-    /**
-     * 类型:0:目录,1菜单,2按钮,3:超链接
-     */
+    @ApiModelProperty(value = "类型:0:目录,1菜单,2按钮,3:超链接")
     @TableField("type")
     private String type;
 
-    /**
-     * 页面路由
-     */
+    @ApiModelProperty(value = "页面路由")
     @TableField("url")
     private String url;
 
-    /**
-     * 图标
-     */
+    @ApiModelProperty(value = "图标")
     @TableField("icon")
     private String icon;
 
-    /**
-     * 排序
-     */
+    @ApiModelProperty(value = "排序")
     @TableField("order_no")
     private String orderNo;
 
-    /**
-     * 状态 0:禁用,1:启用
-     */
+    @ApiModelProperty(value = "状态 0:禁用,1:启用")
     @TableField("status")
     private String status;
 
-    /**
-     * 描述
-     */
+    @ApiModelProperty(value = "描述")
     @TableField("describe")
     private String describe;
 
-    /**
-     * 备注
-     */
+    @ApiModelProperty(value = "备注")
     @TableField("remark")
     private String remark;
 
-    /**
-     * 创建用户编号
-     */
+    @ApiModelProperty(value = "创建用户编号")
     @TableField("creator")
     private Long creator;
 
-    /**
-     * 创建时间
-     */
+    @ApiModelProperty(value = "创建时间")
     @TableField("create_time")
     private Date createTime;
 
-    /**
-     * 是否删除,N:未删除,Y:删除
-     */
+    @ApiModelProperty(value = "是否删除,N:未删除,Y:删除")
     @TableField("is_deleted")
     private String isDeleted;
 

+ 11 - 24
dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/MenuResource.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -16,55 +18,40 @@ import java.util.Date;
  */
 @Data
 @TableName("sys_menu_resource")
+@ApiModel(value="MenuResource对象", description="菜单资源关联表")
 public class MenuResource implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 编号
-     */
+    @ApiModelProperty(value = "编号")
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
-    /**
-     * 菜单ID
-     */
+    @ApiModelProperty(value = "菜单ID")
     @TableField("menu_id")
     private Long menuId;
 
-    /**
-     * 资源ID
-     */
+    @ApiModelProperty(value = "资源ID")
     @TableField("resource_id")
     private Long resourceId;
 
-    /**
-     * 备注
-     */
+    @ApiModelProperty(value = "备注")
     @TableField("remark")
     private String remark;
 
-    /**
-     * 创建用户编号
-     */
+    @ApiModelProperty(value = "创建用户编号")
     @TableField("creator")
     private Long creator;
 
-    /**
-     * 创建时间
-     */
+    @ApiModelProperty(value = "创建时间")
     @TableField("create_time")
     private Date createTime;
 
-    /**
-     * 排序
-     */
+    @ApiModelProperty(value = "排序")
     @TableField("order_no")
     private String orderNo;
 
-    /**
-     * 是否删除,N:未删除,Y:删除
-     */
+    @ApiModelProperty(value = "是否删除,N:未删除,Y:删除")
     @TableField("is_deleted")
     private String isDeleted;
 

+ 12 - 27
dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/Region.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -16,6 +18,7 @@ import java.util.Date;
  */
 @Data
 @TableName("sys_region")
+@ApiModel(value="Region对象", description="病区表")
 public class Region implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -23,57 +26,39 @@ public class Region implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
-    /**
-     * 医院ID
-     */
+    @ApiModelProperty(value = "医院ID")
     @TableField("hospital_id")
     private Long hospitalId;
 
-    /**
-     * 病区编码
-     */
+    @ApiModelProperty(value = "病区编码")
     @TableField("code")
     private String code;
 
-    /**
-     * 病区名称
-     */
+    @ApiModelProperty(value = "病区名称")
     @TableField("name")
     private String name;
 
-    /**
-     * 首字母拼音
-     */
+    @ApiModelProperty(value = "首字母拼音")
     @TableField("spell")
     private String spell;
 
-    /**
-     * 区域类别
-     */
+    @ApiModelProperty(value = "区域类别")
     @TableField("station")
     private String station;
 
-    /**
-     * 排序
-     */
+    @ApiModelProperty(value = "排序")
     @TableField("order_no")
     private String orderNo;
 
-    /**
-     * 创建用户编号
-     */
+    @ApiModelProperty(value = "创建用户编号")
     @TableField("creator")
     private Long creator;
 
-    /**
-     * 创建时间
-     */
+    @ApiModelProperty(value = "创建时间")
     @TableField("create_time")
     private Date createTime;
 
-    /**
-     * 是否删除,N:未删除,Y:删除
-     */
+    @ApiModelProperty(value = "是否删除,N:未删除,Y:删除")
     @TableField("is_deleted")
     private String isDeleted;
 

+ 12 - 27
dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/RegionDept.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -16,61 +18,44 @@ import java.util.Date;
  */
 @Data
 @TableName("sys_region_dept")
+@ApiModel(value="RegionDept对象", description="病区科室关联表")
 public class RegionDept implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 编号
-     */
+    @ApiModelProperty(value = "编号")
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
-    /**
-     * 医院ID
-     */
+    @ApiModelProperty(value = "医院ID")
     @TableField("hospital_id")
     private Long hospitalId;
 
-    /**
-     * 病区ID
-     */
+    @ApiModelProperty(value = "病区ID")
     @TableField("region_id")
     private Long regionId;
 
-    /**
-     * 科室ID
-     */
+    @ApiModelProperty(value = "科室ID")
     @TableField("dept_id")
     private Long deptId;
 
-    /**
-     * 备注
-     */
+    @ApiModelProperty(value = "备注")
     @TableField("remark")
     private String remark;
 
-    /**
-     * 创建用户编号
-     */
+    @ApiModelProperty(value = "创建用户编号")
     @TableField("creator")
     private Long creator;
 
-    /**
-     * 创建时间
-     */
+    @ApiModelProperty(value = "创建时间")
     @TableField("create_time")
     private Date createTime;
 
-    /**
-     * 排序
-     */
+    @ApiModelProperty(value = "排序")
     @TableField("order_no")
     private String orderNo;
 
-    /**
-     * 是否删除,N:未删除,Y:删除
-     */
+    @ApiModelProperty(value = "是否删除,N:未删除,Y:删除")
     @TableField("is_deleted")
     private String isDeleted;
 

+ 14 - 33
dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/Resource.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -16,73 +18,52 @@ import java.util.Date;
  */
 @Data
 @TableName("sys_resource")
+@ApiModel(value="Resource对象", description="系统资源表")
 public class Resource implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 编号
-     */
+    @ApiModelProperty(value = "编号")
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
-    /**
-     * 系统id
-     */
+    @ApiModelProperty(value = "系统id")
     @TableField("service_id")
     private Long serviceId;
 
-    /**
-     * 资源名称
-     */
+    @ApiModelProperty(value = "资源名称")
     @TableField("name")
     private String name;
 
-    /**
-     * 页面路由
-     */
+    @ApiModelProperty(value = "页面路由")
     @TableField("url")
     private String url;
 
-    /**
-     * 排序
-     */
+    @ApiModelProperty(value = "排序")
     @TableField("order_no")
     private String orderNo;
 
-    /**
-     * 状态 0:禁用,1:启用
-     */
+    @ApiModelProperty(value = "状态 0:禁用,1:启用")
     @TableField("status")
     private String status;
 
-    /**
-     * 描述
-     */
+    @ApiModelProperty(value = "描述")
     @TableField("describe")
     private String describe;
 
-    /**
-     * 备注
-     */
+    @ApiModelProperty(value = "备注")
     @TableField("remark")
     private String remark;
 
-    /**
-     * 创建用户编号
-     */
+    @ApiModelProperty(value = "创建用户编号")
     @TableField("creator")
     private Long creator;
 
-    /**
-     * 创建时间
-     */
+    @ApiModelProperty(value = "创建时间")
     @TableField("create_time")
     private Date createTime;
 
-    /**
-     * 是否删除,N:未删除,Y:删除
-     */
+    @ApiModelProperty(value = "是否删除,N:未删除,Y:删除")
     @TableField("is_deleted")
     private String isDeleted;
 

+ 12 - 27
dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/Role.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -16,61 +18,44 @@ import java.util.Date;
  */
 @Data
 @TableName("sys_role")
+@ApiModel(value="Role对象", description="角色表")
 public class Role implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 编号
-     */
+    @ApiModelProperty(value = "编号")
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
-    /**
-     * 角色名称
-     */
+    @ApiModelProperty(value = "角色名称")
     @TableField("name")
     private String name;
 
-    /**
-     * 角色描述
-     */
+    @ApiModelProperty(value = "角色描述")
     @TableField("remark")
     private String remark;
 
-    /**
-     * 状态 0:禁用,1:启用
-     */
+    @ApiModelProperty(value = "状态 0:禁用,1:启用")
     @TableField("status")
     private String status;
 
-    /**
-     * 医院id
-     */
+    @ApiModelProperty(value = "医院id")
     @TableField("hospital_id")
     private Long hospitalId;
 
-    /**
-     * 创建用户id
-     */
+    @ApiModelProperty(value = "创建用户id")
     @TableField("creator")
     private String creator;
 
-    /**
-     * 创建时间
-     */
+    @ApiModelProperty(value = "创建时间")
     @TableField("create_time")
     private Date createTime;
 
-    /**
-     * 排序
-     */
+    @ApiModelProperty(value = "排序")
     @TableField("order_no")
     private String orderNo;
 
-    /**
-     * 是否删除,N:未删除,Y:删除
-     */
+    @ApiModelProperty(value = "是否删除,N:未删除,Y:删除")
     @TableField("is_deleted")
     private String isDeleted;
 

+ 10 - 21
dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/RoleService.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -16,49 +18,36 @@ import java.util.Date;
  */
 @Data
 @TableName("sys_role_service")
+@ApiModel(value="RoleService对象", description="组织角色与系统关联表")
 public class RoleService implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 编号
-     */
+    @ApiModelProperty(value = "编号")
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
-    /**
-     * 角色编号
-     */
+    @ApiModelProperty(value = "角色编号")
     @TableField("role_id")
     private Long roleId;
 
-    /**
-     * 服务编号
-     */
+    @ApiModelProperty(value = "服务编号")
     @TableField("service_id")
     private Long serviceId;
 
-    /**
-     * 排序
-     */
+    @ApiModelProperty(value = "排序")
     @TableField("order_no")
     private String orderNo;
 
-    /**
-     * 创建用户编号
-     */
+    @ApiModelProperty(value = "创建用户编号")
     @TableField("creator")
     private Long creator;
 
-    /**
-     * 创建时间
-     */
+    @ApiModelProperty(value = "创建时间")
     @TableField("create_time")
     private Date createTime;
 
-    /**
-     * 是否删除,N:未删除,Y:删除
-     */
+    @ApiModelProperty(value = "是否删除,N:未删除,Y:删除")
     @TableField("is_deleted")
     private String isDeleted;
 

+ 8 - 15
dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/RoleServiceDataAuth.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -16,6 +18,7 @@ import java.util.Date;
  */
 @Data
 @TableName("sys_role_service_data_auth")
+@ApiModel(value="RoleServiceDataAuth对象", description="角色系统数据权限关联表")
 public class RoleServiceDataAuth implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -23,33 +26,23 @@ public class RoleServiceDataAuth implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
-    /**
-     * 角色id
-     */
+    @ApiModelProperty(value = "角色id")
     @TableField("role_id")
     private Long roleId;
 
-    /**
-     * 服务数据权限关联id
-     */
+    @ApiModelProperty(value = "服务数据权限关联id")
     @TableField("service_data_auth_id")
     private Long serviceDataAuthId;
 
-    /**
-     * 创建用户编号
-     */
+    @ApiModelProperty(value = "创建用户编号")
     @TableField("creator")
     private Long creator;
 
-    /**
-     * 创建时间
-     */
+    @ApiModelProperty(value = "创建时间")
     @TableField("create_time")
     private Date createTime;
 
-    /**
-     * 是否删除,N:未删除,Y:删除
-     */
+    @ApiModelProperty(value = "是否删除,N:未删除,Y:删除")
     @TableField("is_deleted")
     private String isDeleted;
 

+ 9 - 18
dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/ServiceDataAuth.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -16,43 +18,32 @@ import java.util.Date;
  */
 @Data
 @TableName("sys_service_data_auth")
+@ApiModel(value="ServiceDataAuth对象", description="系统与数据权限信息关联表")
 public class ServiceDataAuth implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 编号
-     */
+    @ApiModelProperty(value = "编号")
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
-    /**
-     * 服务编号
-     */
+    @ApiModelProperty(value = "服务编号")
     @TableField("service_id")
     private Long serviceId;
 
-    /**
-     * 数据权限编号
-     */
+    @ApiModelProperty(value = "数据权限编号")
     @TableField("data_auth_id")
     private Long dataAuthId;
 
-    /**
-     * 创建用户编号
-     */
+    @ApiModelProperty(value = "创建用户编号")
     @TableField("creator")
     private Long creator;
 
-    /**
-     * 创建时间
-     */
+    @ApiModelProperty(value = "创建时间")
     @TableField("create_time")
     private Date createTime;
 
-    /**
-     * 是否删除,N:未删除,Y:删除
-     */
+    @ApiModelProperty(value = "是否删除,N:未删除,Y:删除")
     @TableField("is_deleted")
     private String isDeleted;
 

+ 10 - 21
dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/ServiceMenu.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -16,49 +18,36 @@ import java.util.Date;
  */
 @Data
 @TableName("sys_service_menu")
+@ApiModel(value="ServiceMenu对象", description="角色服务菜单功能关联表")
 public class ServiceMenu implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 编号
-     */
+    @ApiModelProperty(value = "编号")
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
-    /**
-     * 角色系统编号
-     */
+    @ApiModelProperty(value = "角色系统编号")
     @TableField("role_service_id")
     private Long roleServiceId;
 
-    /**
-     * 菜单功能编号
-     */
+    @ApiModelProperty(value = "菜单功能编号")
     @TableField("menu_id")
     private Long menuId;
 
-    /**
-     * 排序
-     */
+    @ApiModelProperty(value = "排序")
     @TableField("order_no")
     private String orderNo;
 
-    /**
-     * 创建用户编号
-     */
+    @ApiModelProperty(value = "创建用户编号")
     @TableField("creator")
     private Long creator;
 
-    /**
-     * 创建时间
-     */
+    @ApiModelProperty(value = "创建时间")
     @TableField("create_time")
     private Date createTime;
 
-    /**
-     * 是否删除,N:未删除,Y:删除
-     */
+    @ApiModelProperty(value = "是否删除,N:未删除,Y:删除")
     @TableField("is_deleted")
     private String isDeleted;
 

+ 10 - 21
dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/ServiceResource.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -16,49 +18,36 @@ import java.util.Date;
  */
 @Data
 @TableName("sys_service_resource")
+@ApiModel(value="ServiceResource对象", description="角色系统资源关联表")
 public class ServiceResource implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 编号
-     */
+    @ApiModelProperty(value = "编号")
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
-    /**
-     * 角色系统编号
-     */
+    @ApiModelProperty(value = "角色系统编号")
     @TableField("role_service_id")
     private Long roleServiceId;
 
-    /**
-     * 资源编号
-     */
+    @ApiModelProperty(value = "资源编号")
     @TableField("resource_id")
     private Long resourceId;
 
-    /**
-     * 排序
-     */
+    @ApiModelProperty(value = "排序")
     @TableField("order_no")
     private String orderNo;
 
-    /**
-     * 创建用户编号
-     */
+    @ApiModelProperty(value = "创建用户编号")
     @TableField("creator")
     private Long creator;
 
-    /**
-     * 创建时间
-     */
+    @ApiModelProperty(value = "创建时间")
     @TableField("create_time")
     private Date createTime;
 
-    /**
-     * 是否删除,N:未删除,Y:删除
-     */
+    @ApiModelProperty(value = "是否删除,N:未删除,Y:删除")
     @TableField("is_deleted")
     private String isDeleted;
 

+ 11 - 24
dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/ServiceSet.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -15,55 +17,40 @@ import java.io.Serializable;
  */
 @Data
 @TableName("sys_service_set")
+@ApiModel(value="ServiceSet对象", description="参数管理表")
 public class ServiceSet implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 编号
-     */
+    @ApiModelProperty(value = "编号")
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
-    /**
-     * 所属组织id
-     */
+    @ApiModelProperty(value = "所属组织id")
     @TableField("organize_id")
     private Long organizeId;
 
-    /**
-     * 所属组织
-     */
+    @ApiModelProperty(value = "所属组织")
     @TableField("organize_name")
     private String organizeName;
 
-    /**
-     * 参数名
-     */
+    @ApiModelProperty(value = "参数名")
     @TableField("param_name")
     private String paramName;
 
-    /**
-     * 参数值
-     */
+    @ApiModelProperty(value = "参数值")
     @TableField("param_value")
     private String paramValue;
 
-    /**
-     * 参数说明
-     */
+    @ApiModelProperty(value = "参数说明")
     @TableField("explain")
     private String explain;
 
-    /**
-     * 参数描述
-     */
+    @ApiModelProperty(value = "参数描述")
     @TableField("describe")
     private String describe;
 
-    /**
-     * 是否删除,N:未删除,Y:删除
-     */
+    @ApiModelProperty(value = "是否删除,N:未删除,Y:删除")
     @TableField("is_deleted")
     private String isDeleted;
 

+ 12 - 21
dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/SysService.java

@@ -3,7 +3,10 @@ package com.lantone.dblayermbg.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -14,49 +17,37 @@ import java.util.Date;
  * </p>
  */
 @Data
+@TableName("sys_service")
+@ApiModel(value="SysService对象", description="服务表")
 public class SysService implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 编号
-     */
+    @ApiModelProperty(value = "编号")
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
-    /**
-     * 服务名称
-     */
+    @ApiModelProperty(value = "服务名称")
     @TableField("name")
     private String name;
 
-    /**
-     * 备注
-     */
+    @ApiModelProperty(value = "备注")
     @TableField("remark")
     private String remark;
 
-    /**
-     * 创建用户编号
-     */
+    @ApiModelProperty(value = "创建用户编号")
     @TableField("creator")
     private Long creator;
 
-    /**
-     * 创建时间
-     */
+    @ApiModelProperty(value = "创建时间")
     @TableField("create_time")
     private Date createTime;
 
-    /**
-     * 排序
-     */
+    @ApiModelProperty(value = "排序")
     @TableField("order_no")
     private String orderNo;
 
-    /**
-     * 是否删除,N:未删除,Y:删除
-     */
+    @ApiModelProperty(value = "是否删除,N:未删除,Y:删除")
     @TableField("is_deleted")
     private String isDeleted;
 

+ 18 - 45
dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/User.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -16,97 +18,68 @@ import java.util.Date;
  */
 @Data
 @TableName("sys_user")
+@ApiModel(value="User对象", description="用户表")
 public class User implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 编号
-     */
+    @ApiModelProperty(value = "编号")
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
-    /**
-     * 医生id
-     */
+    @ApiModelProperty(value = "医生id")
     @TableField("doctor_id")
     private Long doctorId;
 
-    /**
-     * 用户名
-     */
+    @ApiModelProperty(value = "用户名")
     @TableField("username")
     private String username;
 
-    /**
-     * 密码
-     */
+    @ApiModelProperty(value = "密码")
     @TableField("password")
     private String password;
 
-    /**
-     * 姓名
-     */
+    @ApiModelProperty(value = "姓名")
     @TableField("name")
     private String name;
 
-    /**
-     * 性别
-     */
+    @ApiModelProperty(value = "性别")
     @TableField("sex")
     private Integer sex;
 
-    /**
-     * 手机号
-     */
+    @ApiModelProperty(value = "手机号")
     @TableField("mobile_phone")
     private String mobilePhone;
 
-    /**
-     * 身份证号
-     */
+    @ApiModelProperty(value = "身份证号")
     @TableField("idcard")
     private String idcard;
 
-    /**
-     * 职称编号
-     */
+    @ApiModelProperty(value = "职称编号")
     @TableField("title_id")
     private String titleId;
 
-    /**
-     * 工号
-     */
+    @ApiModelProperty(value = "工号")
     @TableField("job_no")
     private Integer jobNo;
 
-    /**
-     * 排序
-     */
+    @ApiModelProperty(value = "排序")
     @TableField("order_no")
     private Integer orderNo;
 
-    /**
-     * 状态 0:禁用,1:启用
-     */
+    @ApiModelProperty(value = "状态 0:禁用,1:启用")
     @TableField("status")
     private String status;
 
-    /**
-     * 创建者编号
-     */
+    @ApiModelProperty(value = "创建者编号")
     @TableField("creator")
     private Long creator;
 
-    /**
-     * 创建时间
-     */
+    @ApiModelProperty(value = "创建时间")
     @TableField("create_time")
     private Date createTime;
 
-    /**
-     * 是否删除,N:未删除,Y:删除
-     */
+    @ApiModelProperty(value = "是否删除,N:未删除,Y:删除")
     @TableField("is_deleted")
     private String isDeleted;
 

+ 11 - 24
dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/UserRole.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -16,55 +18,40 @@ import java.util.Date;
  */
 @Data
 @TableName("sys_user_role")
+@ApiModel(value="UserRole对象", description="用户角色关联表")
 public class UserRole implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 编号
-     */
+    @ApiModelProperty(value = "编号")
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
-    /**
-     * 用户编号
-     */
+    @ApiModelProperty(value = "用户编号")
     @TableField("user_id")
     private Long userId;
 
-    /**
-     * 角色编号
-     */
+    @ApiModelProperty(value = "角色编号")
     @TableField("role_id")
     private Long roleId;
 
-    /**
-     * 备注
-     */
+    @ApiModelProperty(value = "备注")
     @TableField("remark")
     private String remark;
 
-    /**
-     * 创建用户编号
-     */
+    @ApiModelProperty(value = "创建用户编号")
     @TableField("creator")
     private Long creator;
 
-    /**
-     * 创建时间
-     */
+    @ApiModelProperty(value = "创建时间")
     @TableField("create_time")
     private Date createTime;
 
-    /**
-     * 排序
-     */
+    @ApiModelProperty(value = "排序")
     @TableField("order_no")
     private String orderNo;
 
-    /**
-     * 是否删除,N:未删除,Y:删除
-     */
+    @ApiModelProperty(value = "是否删除,N:未删除,Y:删除")
     @TableField("is_deleted")
     private String isDeleted;
 

+ 13 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/RoleServiceFacade.java

@@ -0,0 +1,13 @@
+package com.lantone.dblayermbg.facade;
+
+import com.lantone.dblayermbg.service.impl.RoleServiceServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 组织角色与系统关联Facade
+ * </p>
+ */
+@Component
+public class RoleServiceFacade extends RoleServiceServiceImpl {
+}

+ 13 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/ServiceDataAuthFacade.java

@@ -0,0 +1,13 @@
+package com.lantone.dblayermbg.facade;
+
+import com.lantone.dblayermbg.service.impl.ServiceDataAuthServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 系统与数据权限信息关联表Facade
+ * </p>
+ */
+@Component
+public class ServiceDataAuthFacade extends ServiceDataAuthServiceImpl {
+}

+ 13 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/ServiceMenuFacade.java

@@ -0,0 +1,13 @@
+package com.lantone.dblayermbg.facade;
+
+import com.lantone.dblayermbg.service.impl.ServiceMenuServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 角色服务菜单功能关联表Facade
+ * </p>
+ */
+@Component
+public class ServiceMenuFacade extends ServiceMenuServiceImpl {
+}

+ 13 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/ServiceResourceFacade.java

@@ -0,0 +1,13 @@
+package com.lantone.dblayermbg.facade;
+
+import com.lantone.dblayermbg.service.impl.ServiceResourceServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 角色系统资源关联表Facade
+ * </p>
+ */
+@Component
+public class ServiceResourceFacade extends ServiceResourceServiceImpl {
+}

+ 2 - 0
dblayer-mbg/src/main/resources/freemarker/entity.java.ftl

@@ -7,6 +7,8 @@ import ${pkg};
 </#list>
 <#if entityLombokModel>
 import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 <#--import lombok.EqualsAndHashCode;-->
 <#--import lombok.experimental.Accessors;-->
 </#if>

+ 1 - 1
dblayer-mbg/src/test/java/com/lantone/dblayermbg/GeneratorUtil.java

@@ -153,7 +153,7 @@ public class GeneratorUtil {
                 // XML ColumnList: mapper.xml生成查询结果列
                 .setBaseColumnList(false)
                 // swagger注解; 须添加swagger依赖
-                //                .setSwagger2(true)
+                .setSwagger2(true)
                 // 作者
                 //                .setAuthor(AUTHOR)
                 // 设置实体类名称

+ 53 - 0
security-center/src/main/java/com/lantone/security/enums/CRUDEnum.java

@@ -0,0 +1,53 @@
+package com.lantone.security.enums;
+
+import com.diagbot.core.KeyedNamed;
+import lombok.Setter;
+
+/**
+ * @ClassName: CRUDEnum
+ * @Description: 增删改查注解
+ * @Author songxl
+ * @Date 2021/7/21
+ * @Version 1.0
+ */
+public enum CRUDEnum implements KeyedNamed {
+    ADD(1, "添加"),
+    UPDATE(2, "修改"),
+    DELETE(3, "删除"),
+    SELECT(4, "查询");
+
+    @Setter
+    private int key;
+
+    @Setter
+    private String name;
+
+    CRUDEnum(int key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static CRUDEnum getEnum(int key) {
+        for (CRUDEnum item : CRUDEnum.values()) {
+            if (item.key == key) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(int key) {
+        CRUDEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+
+    @Override
+    public int getKey() {
+        return 0;
+    }
+
+    @Override
+    public String getName() {
+        return null;
+    }
+}

+ 170 - 0
security-center/src/main/java/com/lantone/security/facade/DataAuthHandleFacade.java

@@ -0,0 +1,170 @@
+package com.lantone.security.facade;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
+import com.lantone.common.util.DateUtil;
+import com.lantone.common.util.ListUtil;
+import com.lantone.common.util.StringUtil;
+import com.lantone.dblayermbg.entity.DataAuth;
+import com.lantone.dblayermbg.entity.DataAuthDetail;
+import com.lantone.dblayermbg.entity.Role;
+import com.lantone.dblayermbg.entity.RoleServiceDataAuth;
+import com.lantone.dblayermbg.entity.ServiceDataAuth;
+import com.lantone.dblayermbg.facade.DataAuthDetailFacade;
+import com.lantone.dblayermbg.facade.DataAuthFacade;
+import com.lantone.dblayermbg.facade.RoleServiceDataAuthFacade;
+import com.lantone.dblayermbg.facade.ServiceDataAuthFacade;
+import com.lantone.dblayermbg.service.impl.DataAuthServiceImpl;
+import com.lantone.security.enums.CRUDEnum;
+import com.lantone.security.util.SysUserUtils;
+import com.lantone.security.vo.ServiceDataAuthVO;
+import com.lantone.security.vo.SysServiceVO;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+
+/**
+ * @ClassName: DataAuthHandleFacade
+ * @Description:数据权限操作facade
+ * @Author songxl
+ * @Date 2021/7/21
+ * @Version 1.0
+ */
+@Component
+public class DataAuthHandleFacade extends DataAuthServiceImpl {
+    @Autowired
+    private DataAuthFacade dataAuthFacade;
+    @Autowired
+    private ServiceDataAuthFacade serviceDataAuthFacade;
+    @Autowired
+    private RoleServiceDataAuthFacade roleServiceDataAuthFacade;
+    @Autowired
+    private DataAuthDetailFacade dataAuthDetailFacade;
+
+    /**
+     * @Author songxl
+     * @Description 数据权限新增or修改方法
+     * @Date 2021/7/21
+     * @Param [serviceDataAuthVO]
+     * @Return void
+     * @MethodName addOrUpdate
+     */
+    @Transactional
+    public void addOrUpdate(ServiceDataAuthVO serviceDataAuthVO) {
+        //1.入参校验
+        inputParamCheck(serviceDataAuthVO);
+        //2.执行增加、修改操作
+        if (CRUDEnum.ADD.getKey() == serviceDataAuthVO.getType()) {
+            try {
+                addDataAuth(serviceDataAuthVO);
+            }catch (Exception e)
+            {
+                e.printStackTrace();
+            }
+        } else if (CRUDEnum.UPDATE.getKey() == serviceDataAuthVO.getType()) {
+
+        } else {
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "操作码错误");
+        }
+
+    }
+
+    /**
+     * @Author songxl
+     * @Description 添加数据权限
+     * @Date 2021/7/21
+     * @Param [serviceDataAuthVO]
+     * @Return void
+     * @MethodName addDataAuth
+     */
+    private void addDataAuth(ServiceDataAuthVO serviceDataAuthVO) {
+        //1.插入新建数据权限
+        DataAuth dataAuth = new DataAuth();
+        dataAuth.setCreateTime(DateUtil.now());
+        dataAuth.setCreator(Long.parseLong(SysUserUtils.getCurrentPrincipleID()));
+        BeanUtils.copyProperties(dataAuth, serviceDataAuthVO.getDataAuthVO());
+        boolean dataAuthInsert = dataAuthFacade.save(dataAuth);
+        if (dataAuthInsert) {
+            //2.插入成功获取新生成的数据权限名称编号data_auth_id
+            Long dataAuthId = dataAuthFacade.list(new QueryWrapper<DataAuth>()
+                    .eq("auth_name", dataAuth.getAuthName())
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())).get(0).getId();
+
+            //3.插入新建数据权限与系统的关系
+            for (SysServiceVO sysServiceVO : serviceDataAuthVO.getDataAuthVO().getServiceVOS()) {
+                ServiceDataAuth serviceDataAuth = new ServiceDataAuth();
+                serviceDataAuth.setServiceId(sysServiceVO.getId());
+                serviceDataAuth.setDataAuthId(dataAuthId);
+                serviceDataAuth.setCreateTime(DateUtil.now());
+                serviceDataAuth.setCreator(Long.parseLong(SysUserUtils.getCurrentPrincipleID()));
+                boolean serviceDataAuthInsert = serviceDataAuthFacade.save(serviceDataAuth);
+                if (serviceDataAuthInsert) {
+                    //4.获取上一步插入时新生成的数据权限名称与系统关联编号service_data_auth _id
+                    Long serviceDataAuthId = serviceDataAuthFacade.list(new QueryWrapper<ServiceDataAuth>()
+                            .eq("service_id", sysServiceVO.getId())
+                            .eq("data_auth_id", dataAuthId)
+                            .eq("is_deleted", IsDeleteEnum.N.getKey())).get(0).getId();
+
+                    //5.插入数据权限系统关联表与角色管理sys_role_service_data_auth
+                    for(Role role:serviceDataAuthVO.getRoles()){
+                        RoleServiceDataAuth roleServiceDataAuth = new RoleServiceDataAuth();
+                        roleServiceDataAuth.setRoleId(role.getId());
+                        roleServiceDataAuth.setServiceDataAuthId(serviceDataAuthId);
+                        roleServiceDataAuth.setCreateTime(DateUtil.now());
+                        roleServiceDataAuth.setCreator(Long.parseLong(SysUserUtils.getCurrentPrincipleID()));
+                        if(!roleServiceDataAuthFacade.save(roleServiceDataAuth)){
+                            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "角色对应服务数据权限关系插入失败");
+                        }
+                    }
+
+                    //6.插入数据权限详细信息。sys_data_auth_detail
+                    for(DataAuthDetail dataAuthDetail:sysServiceVO.getDataAuthDetailVOS()){
+                        dataAuthDetail.setCreator(Long.parseLong(SysUserUtils.getCurrentPrincipleID()));
+                        dataAuthDetail.setCreateTime(DateUtil.now());
+                        dataAuthDetail.setServiceDataAuthId(serviceDataAuthId);
+                        if(!dataAuthDetailFacade.save(dataAuthDetail)){
+                            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "数据权限明细插入失败");
+                        }
+                    }
+
+                } else {
+                    throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "服务对应数据权限关系插入失败");
+                }
+            }
+
+        } else {
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "数据权限插入失败");
+        }
+
+    }
+
+    /**
+     * @Author songxl
+     * @Description 入参校验
+     * @Date 2021/7/21
+     * @Param [serviceDataAuthVO]
+     * @Return void
+     * @MethodName inputParamCheck
+     */
+    private void inputParamCheck(ServiceDataAuthVO serviceDataAuthVO) {
+        if (serviceDataAuthVO == null) {
+            throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "入参为空");
+        }
+        if (serviceDataAuthVO.getType() == 0) {
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "操作码为空");
+        }
+        if (StringUtil.isEmpty(serviceDataAuthVO.getDataAuthVO().getAuthName())) {
+            throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "数据权限名称为空");
+        }
+        if (ListUtil.isEmpty(serviceDataAuthVO.getDataAuthVO().getServiceVOS())) {
+            throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "数据权限对应系统未选择");
+        }
+        if (ListUtil.isEmpty(serviceDataAuthVO.getDataAuthVO().getServiceVOS().get(0).getDataAuthDetailVOS())) {
+            throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "系统对应数据权限明细未选择");
+        }
+    }
+}

+ 23 - 0
security-center/src/main/java/com/lantone/security/vo/DataAuthVO.java

@@ -0,0 +1,23 @@
+package com.lantone.security.vo;
+
+import com.lantone.dblayermbg.entity.DataAuth;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @ClassName: DataAuthVO
+ * @Description: 数据权限对象
+ * @Author songxl
+ * @Date 2021/7/21
+ * @Version 1.0
+ */
+@Data
+public class DataAuthVO extends DataAuth {
+    /**
+     * 系统列表
+     */
+    @ApiModelProperty("系统列表")
+    private List<SysServiceVO> serviceVOS;
+}

+ 33 - 0
security-center/src/main/java/com/lantone/security/vo/ServiceDataAuthVO.java

@@ -0,0 +1,33 @@
+package com.lantone.security.vo;
+
+import com.lantone.dblayermbg.entity.Role;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @ClassName: ServiceDataAuthVO
+ * @Description: 系统数据权限对象
+ * @Author songxl
+ * @Date 2021/7/21
+ * @Version 1.0
+ */
+@Data
+public class ServiceDataAuthVO {
+    /**
+     * 数据权限对象
+     */
+    @ApiModelProperty("数据权限对象")
+    private DataAuthVO dataAuthVO;
+    /**
+     * 角色列表
+     */
+    @ApiModelProperty("角色列表")
+    private List<Role> roles;
+    /**
+     * 操作码 1:新增;2:修改
+     */
+    @ApiModelProperty("操作码 1:新增;2:修改")
+    private int  type;
+}

+ 24 - 0
security-center/src/main/java/com/lantone/security/vo/SysServiceVO.java

@@ -0,0 +1,24 @@
+package com.lantone.security.vo;
+
+import com.lantone.dblayermbg.entity.DataAuthDetail;
+import com.lantone.dblayermbg.entity.SysService;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @ClassName: SysServiceVO
+ * @Description: 系统服务对象
+ * @Author songxl
+ * @Date 2021/7/21
+ * @Version 1.0
+ */
+@Data
+public class SysServiceVO extends SysService {
+    /**
+     * 数据权限详情列表
+     */
+    @ApiModelProperty("数据权限详情列表")
+    private List<DataAuthDetail> dataAuthDetailVOS;
+}

+ 25 - 0
security-center/src/main/java/com/lantone/security/web/DataAuthController.java

@@ -1,8 +1,18 @@
 package com.lantone.security.web;
 
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
+import com.lantone.security.facade.DataAuthHandleFacade;
+import com.lantone.security.vo.ServiceDataAuthVO;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
 
 /**
  * @ClassName: DataAuthController
@@ -15,4 +25,19 @@ import org.springframework.web.bind.annotation.RestController;
 @Api(value = "数据权限API", tags = { "数据权限API" })
 @RequestMapping("/data/auth")
 public class DataAuthController {
+    @Autowired
+    private DataAuthHandleFacade dataAuthHandleFacade;
+
+    @ApiOperation(value = "新增数据权限[by:songxl]",
+            notes = "dataAuthVO:数据权限对象,必填<br>" +
+                    "roles:角色列表,必填<br>" +
+                    "操作码 1:新增;2:修改")
+    @PostMapping("/addAuth")
+    @SysLogger("addAuth")
+    @ApiIgnore
+    @Transactional
+    public RespDTO<Boolean> addAuth(@RequestBody ServiceDataAuthVO serviceDataAuthVO) {
+        dataAuthHandleFacade.addOrUpdate(serviceDataAuthVO);
+        return RespDTO.onSuc(null);
+    }
 }