Selaa lähdekoodia

Merge remote-tracking branch 'origin/dev/ez-security210625' into dev/ez-security210625

# Conflicts:
#	gateway-service/src/main/resources/application.yml
#	security-center/src/main/java/com/lantone/security/config/ResourceServerConfigurer.java
#	security-center/src/main/java/com/lantone/security/dto/JwtDTO.java
#	security-center/src/main/java/com/lantone/security/facade/UserLoginFacade.java
#	security-center/src/main/java/com/lantone/security/facade/UserMenuInfoFacade.java
rengb 3 vuotta sitten
vanhempi
commit
cb1c86c513
100 muutettua tiedostoa jossa 2735 lisäystä ja 236 poistoa
  1. 49 0
      common/src/main/java/com/lantone/common/dto/DataAuthDTO.java
  2. 53 0
      common/src/main/java/com/lantone/common/dto/DataAuthDetailDTO.java
  3. 55 0
      common/src/main/java/com/lantone/common/dto/DeptDTO.java
  4. 72 0
      common/src/main/java/com/lantone/common/dto/HospitalDTO.java
  5. 1 1
      security-center/src/main/java/com/lantone/security/dto/MenuInfoDTO.java
  6. 46 0
      common/src/main/java/com/lantone/common/dto/RoleDTO.java
  7. 68 0
      common/src/main/java/com/lantone/common/dto/ServiceRoleDataAuthDetailDTO.java
  8. 45 0
      common/src/main/java/com/lantone/common/dto/SysServiceDTO.java
  9. 43 0
      common/src/main/java/com/lantone/common/vo/DataAuthDetailVO.java
  10. 46 0
      common/src/main/java/com/lantone/common/vo/DataAuthVO.java
  11. 46 0
      common/src/main/java/com/lantone/common/vo/RoleVO.java
  12. 32 0
      common/src/main/java/com/lantone/common/vo/ServiceDataAuthVO.java
  13. 45 0
      common/src/main/java/com/lantone/common/vo/SysServiceVO.java
  14. 59 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/DataAuth.java
  15. 59 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/DataAuthDetail.java
  16. 70 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/Dept.java
  17. 58 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/DeptDoctor.java
  18. 54 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/Dictionaries.java
  19. 63 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/Doctor.java
  20. 23 45
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/Organize.java
  21. 51 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/HospitalUser.java
  22. 75 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/Log.java
  23. 61 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/LoginLog.java
  24. 58 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/Medoup.java
  25. 54 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/MedoupDoctor.java
  26. 21 52
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/MenuInfo.java
  27. 59 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/MenuResource.java
  28. 66 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/Region.java
  29. 63 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/RegionDept.java
  30. 71 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/Resource.java
  31. 14 29
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/Role.java
  32. 55 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/RoleService.java
  33. 50 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/RoleServiceDataAuth.java
  34. 51 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/ServiceDataAuth.java
  35. 55 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/ServiceMenu.java
  36. 55 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/ServiceResource.java
  37. 58 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/ServiceSet.java
  38. 55 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/SysService.java
  39. 21 42
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/User.java
  40. 11 24
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/UserRole.java
  41. 14 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/DataAuthDetailFacade.java
  42. 14 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/DataAuthFacade.java
  43. 14 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/DeptDoctorFacade.java
  44. 14 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/DeptFacade.java
  45. 14 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/DictionariesFacade.java
  46. 14 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/DoctorFacade.java
  47. 2 2
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/OrganizeFacade.java
  48. 14 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/HospitalUserFacade.java
  49. 14 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/LogFacade.java
  50. 14 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/LoginLogFacade.java
  51. 14 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/MedoupDoctorFacade.java
  52. 14 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/MedoupFacade.java
  53. 2 3
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/MenuInfoFacade.java
  54. 14 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/MenuResourceFacade.java
  55. 14 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/RegionDeptFacade.java
  56. 14 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/RegionFacade.java
  57. 14 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/ResourceFacade.java
  58. 14 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/RoleServiceDataAuthFacade.java
  59. 13 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/RoleServiceFacade.java
  60. 13 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/ServiceDataAuthFacade.java
  61. 13 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/ServiceMenuFacade.java
  62. 13 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/ServiceResourceFacade.java
  63. 14 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/ServiceSetFacade.java
  64. 14 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/SysServiceFacade.java
  65. 1 1
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/UserFacade.java
  66. 14 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/DataAuthDetailMapper.java
  67. 27 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/DataAuthMapper.java
  68. 14 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/DeptDoctorMapper.java
  69. 14 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/DeptMapper.java
  70. 14 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/DictionariesMapper.java
  71. 14 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/DoctorMapper.java
  72. 2 2
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/OrganizeMapper.java
  73. 14 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/HospitalUserMapper.java
  74. 14 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/LogMapper.java
  75. 14 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/LoginLogMapper.java
  76. 14 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/MedoupDoctorMapper.java
  77. 14 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/MedoupMapper.java
  78. 0 26
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/MenuInfoMapper.java
  79. 14 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/MenuMapper.java
  80. 14 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/MenuResourceMapper.java
  81. 14 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/RegionDeptMapper.java
  82. 14 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/RegionMapper.java
  83. 14 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/ResourceMapper.java
  84. 14 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/RoleServiceDataAuthMapper.java
  85. 14 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/RoleServiceMapper.java
  86. 14 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/ServiceDataAuthMapper.java
  87. 14 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/ServiceMenuMapper.java
  88. 14 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/ServiceResourceMapper.java
  89. 14 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/ServiceSetMapper.java
  90. 14 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/SysServiceMapper.java
  91. 5 7
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/UserMapper.java
  92. 13 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/DataAuthDetailService.java
  93. 13 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/DataAuthService.java
  94. 13 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/DeptDoctorService.java
  95. 13 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/DeptService.java
  96. 13 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/DictionariesService.java
  97. 13 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/DoctorService.java
  98. 2 2
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/OrganizeService.java
  99. 13 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/HospitalUserService.java
  100. 0 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/LogService.java

+ 49 - 0
common/src/main/java/com/lantone/common/dto/DataAuthDTO.java

@@ -0,0 +1,49 @@
+package com.lantone.common.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @ClassName: DataAuthDTO
+ * @Description: 数据权限返回对象
+ * @Author songxl
+ * @Date 2021/7/22
+ * @Version 1.0
+ */
+@Data
+public class DataAuthDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "编号")
+    private Long id;
+
+    @ApiModelProperty(value = "数据权限名称")
+    private String authName;
+
+    @ApiModelProperty(value = "状态 0:禁用,1:启用")
+    private String status;
+
+    @ApiModelProperty(value = "排序")
+    private String orderNo;
+
+    @ApiModelProperty(value = "医院ID")
+    private String hospitalId;
+
+    @ApiModelProperty(value = "创建用户编号")
+    private Long creator;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "是否删除,N:未删除,Y:删除")
+    private String isDeleted;
+    /**
+     * 系统列表
+     */
+    private List<SysServiceDTO> sysServiceDTOS;
+
+}

+ 53 - 0
common/src/main/java/com/lantone/common/dto/DataAuthDetailDTO.java

@@ -0,0 +1,53 @@
+package com.lantone.common.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @ClassName: DataAuthDetailDTO
+ * @Description:
+ * @Author songxl
+ * @Date 2021/7/22
+ * @Version 1.0
+ */
+@Data
+public class DataAuthDetailDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "编号")
+    private Long id;
+
+    @ApiModelProperty(value = "数据权限编号")
+    private Long serviceDataAuthId;
+
+    @ApiModelProperty(value = "数据范围类型::1:全部组织,2:全部科室,3:全部科室除本科室外,4:本科室,5:本医疗组,6:本人,7:自定义")
+    private Integer dataType;
+
+    @ApiModelProperty(value = "detail_id的类型 1:detail_id为医院id 2:为科室id3:为医生id")
+    private Integer detailType;
+
+    @ApiModelProperty(value = "医院、科室、医生id")
+    private Long detailId;
+
+    @ApiModelProperty(value = "创建用户编号")
+    private Long creator;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "是否删除,N:未删除,Y:删除")
+    private String isDeleted;
+
+    /**
+     * 可看组织
+     */
+
+    private HospitalDTO hospitalDTOS;
+    /**
+     * 可看医生列表
+     */
+}

+ 55 - 0
common/src/main/java/com/lantone/common/dto/DeptDTO.java

@@ -0,0 +1,55 @@
+package com.lantone.common.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @ClassName: DeptDTO
+ * @Description: 科室返回对象
+ * @Author songxl
+ * @Date 2021/7/22
+ * @Version 1.0
+ */
+@Data
+public class DeptDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+
+    @ApiModelProperty(value = "医院ID")
+    private Long hospitalId;
+
+    @ApiModelProperty(value = "医院科室编码")
+    private String code;
+
+    @ApiModelProperty(value = "科室名称")
+    private String name;
+
+    @ApiModelProperty(value = "类别")
+    private String type;
+
+    @ApiModelProperty(value = "首字母拼音")
+    private String spell;
+
+    @ApiModelProperty(value = "区域类别")
+    private String station;
+
+    @ApiModelProperty(value = "排序")
+    private String orderNo;
+
+    @ApiModelProperty(value = "创建用户编号")
+    private Long creator;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "是否删除,N:未删除,Y:删除")
+    private String isDeleted;
+    /**
+     * 关联标志位 true 关联
+     */
+    private boolean relationStatus;
+}

+ 72 - 0
common/src/main/java/com/lantone/common/dto/HospitalDTO.java

@@ -0,0 +1,72 @@
+package com.lantone.common.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 用户组织对象
+ * </p>
+ */
+@Data
+public class HospitalDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "编号")
+    private Long id;
+
+    private Long parentId;
+
+    @ApiModelProperty(value = "医院编码")
+    private String orgCode;
+
+    @ApiModelProperty(value = "父级编码")
+    private String parentCode;
+
+    @ApiModelProperty(value = "名称")
+    private String name;
+
+    @ApiModelProperty(value = "归属区域")
+    private String region;
+
+    @ApiModelProperty(value = "组织类型(0:AI病案质控平台 1:集团医院 2:医共 3:医联 4:医院)")
+    private String type;
+
+    @ApiModelProperty(value = "排序")
+    private String orderNo;
+
+    @ApiModelProperty(value = "状态 0:禁用,1:启用")
+    private String status;
+
+    @ApiModelProperty(value = "创建者编号")
+    private Long creator;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "是否删除,N:未删除,Y:删除")
+    private String isDeleted;
+
+
+    /**
+     * 用户在该组织下的角色列表
+     */
+    private List<RoleDTO> roles;
+    /**
+     * 该医院的科室列表
+     */
+    private List<DeptDTO> depts;
+
+    /**
+     * 该虚拟医院的医院列表
+     */
+    private List<HospitalDTO> hospitalDTOS;
+    /**
+     * 关联标志位 true 关联
+     */
+    private boolean relationStatus;
+}

+ 1 - 1
security-center/src/main/java/com/lantone/security/dto/MenuInfoDTO.java

@@ -1,4 +1,4 @@
-package com.lantone.security.dto;
+package com.lantone.common.dto;
 
 
 

+ 46 - 0
common/src/main/java/com/lantone/common/dto/RoleDTO.java

@@ -0,0 +1,46 @@
+package com.lantone.common.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @ClassName: RoleDTO
+ * @Description: 角色输出对象
+ * @Author songxl
+ * @Date 2021/7/22
+ * @Version 1.0
+ */
+@Data
+public class RoleDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "编号")
+    private Long id;
+
+    @ApiModelProperty(value = "角色名称")
+    private String name;
+
+    @ApiModelProperty(value = "角色描述")
+    private String remark;
+
+    @ApiModelProperty(value = "状态 0:禁用,1:启用")
+    private String status;
+
+    @ApiModelProperty(value = "医院id")
+    private Long hospitalId;
+
+    @ApiModelProperty(value = "创建用户id")
+    private String creator;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "排序")
+    private String orderNo;
+
+    @ApiModelProperty(value = "是否删除,N:未删除,Y:删除")
+    private String isDeleted;
+}

+ 68 - 0
common/src/main/java/com/lantone/common/dto/ServiceRoleDataAuthDetailDTO.java

@@ -0,0 +1,68 @@
+package com.lantone.common.dto;
+
+import lombok.Data;
+
+/**
+ * @ClassName: ServiceRoleDataAuthDetailDTO
+ * @Description: 服务、角色、数据权限明细关联对象
+ * @Author songxl
+ * @Date 2021/7/22
+ * @Version 1.0
+ */
+@Data
+public class ServiceRoleDataAuthDetailDTO {
+    /**
+     * 服务、角色、数据权限关联id
+     */
+    private Long serviceRoleDataAuthDetailId;
+    /**
+     * 系统数据权限id
+     */
+    private Long serviceDataAuthId;
+    /**
+     * 数据权限详情id
+     */
+    private Long detail;
+    /**
+     * 数据权限id
+     */
+    private Long dataAuthId;
+    /**
+     * 数据权限名称
+     */
+    private String dataAuthName;
+    /**
+     * 数据权限启用禁用状态
+     */
+    private String status;
+    /**
+     * 数据范围类型::1:全部组织,2:全部科室,3:全部科室除本科室外,4:本科室,5:本医疗组,6:本人,7:自定义
+     */
+    private Integer dataType;
+    /**
+     * detail_id的类型 1:detail_id为医院id 2:为科室id3:为医生id
+     */
+    private Integer detailType;
+    /**
+     * 医院、科室、医生id
+     */
+    private Long detailId;
+    /**
+     * 系统id
+     */
+    private Long serviceId;
+
+    /**
+     * 系统名称
+     */
+    private String serviceName;
+    /**
+     * 角色id
+     */
+    private Long roleId;
+    /**
+     * 角色名称
+     */
+    private String roleName;
+
+}

+ 45 - 0
common/src/main/java/com/lantone/common/dto/SysServiceDTO.java

@@ -0,0 +1,45 @@
+package com.lantone.common.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @ClassName: SysServiceVO
+ * @Description: 系统服务对象
+ * @Author songxl
+ * @Date 2021/7/21
+ * @Version 1.0
+ */
+@Data
+public class SysServiceDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "编号")
+    private Long id;
+
+    @ApiModelProperty(value = "服务名称")
+    private String name;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    @ApiModelProperty(value = "创建用户编号")
+    private Long creator;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "排序")
+    private String orderNo;
+
+    @ApiModelProperty(value = "是否删除,N:未删除,Y:删除")
+    private String isDeleted;
+    @ApiModelProperty(value = "数据权限详情列表")
+    private List<DataAuthDetailDTO> dataAuthDetailDTOS;
+    @ApiModelProperty(value = "角色列表")
+    private List<RoleDTO> roles;
+}

+ 43 - 0
common/src/main/java/com/lantone/common/vo/DataAuthDetailVO.java

@@ -0,0 +1,43 @@
+package com.lantone.common.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @ClassName: DataAuthDetailVO
+ * @Description: 数据权限详情
+ * @Author songxl
+ * @Date 2021/7/22
+ * @Version 1.0
+ */
+@Data
+public class DataAuthDetailVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "编号")
+    private Long id;
+
+    @ApiModelProperty(value = "数据权限编号")
+    private Long serviceDataAuthId;
+
+    @ApiModelProperty(value = "数据范围类型::1:全部组织,2:全部科室,3:全部科室除本科室外,4:本科室,5:本医疗组,6:本人,7:自定义")
+    private Integer dataType;
+
+    @ApiModelProperty(value = "detail_id的类型 1:detail_id为医院id 2:为科室id3:为医生id")
+    private Integer detailType;
+
+    @ApiModelProperty(value = "医院、科室、医生id")
+    private Long detailId;
+
+    @ApiModelProperty(value = "创建用户编号")
+    private Long creator;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "是否删除,N:未删除,Y:删除")
+    private String isDeleted;
+}

+ 46 - 0
common/src/main/java/com/lantone/common/vo/DataAuthVO.java

@@ -0,0 +1,46 @@
+package com.lantone.common.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @ClassName: DataAuthVO
+ * @Description: 数据权限对象
+ * @Author songxl
+ * @Date 2021/7/21
+ * @Version 1.0
+ */
+@Data
+public class DataAuthVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "编号")
+    private Long id;
+
+    @ApiModelProperty(value = "数据权限名称")
+    private String authName;
+
+    @ApiModelProperty(value = "状态 0:禁用,1:启用")
+    private String status;
+
+    @ApiModelProperty(value = "排序")
+    private String orderNo;
+
+    @ApiModelProperty(value = "医院ID")
+    private String hospitalId;
+
+    @ApiModelProperty(value = "创建用户编号")
+    private Long creator;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "是否删除,N:未删除,Y:删除")
+    private String isDeleted;
+    @ApiModelProperty("系统列表")
+    private List<SysServiceVO> serviceVOS;
+}

+ 46 - 0
common/src/main/java/com/lantone/common/vo/RoleVO.java

@@ -0,0 +1,46 @@
+package com.lantone.common.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @ClassName: RoleVO
+ * @Description: 角色对象
+ * @Author songxl
+ * @Date 2021/7/22
+ * @Version 1.0
+ */
+@Data
+public class RoleVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "编号")
+    private Long id;
+
+    @ApiModelProperty(value = "角色名称")
+    private String name;
+
+    @ApiModelProperty(value = "角色描述")
+    private String remark;
+
+    @ApiModelProperty(value = "状态 0:禁用,1:启用")
+    private String status;
+
+    @ApiModelProperty(value = "医院id")
+    private Long hospitalId;
+
+    @ApiModelProperty(value = "创建用户id")
+    private String creator;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "排序")
+    private String orderNo;
+
+    @ApiModelProperty(value = "是否删除,N:未删除,Y:删除")
+    private String isDeleted;
+}

+ 32 - 0
common/src/main/java/com/lantone/common/vo/ServiceDataAuthVO.java

@@ -0,0 +1,32 @@
+package com.lantone.common.vo;
+
+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<RoleVO> roles;
+    /**
+     * 操作码 1:新增;2:修改
+     */
+    @ApiModelProperty("操作码 1:新增;2:修改")
+    private int  type;
+}

+ 45 - 0
common/src/main/java/com/lantone/common/vo/SysServiceVO.java

@@ -0,0 +1,45 @@
+package com.lantone.common.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @ClassName: SysServiceVO
+ * @Description: 系统服务对象
+ * @Author songxl
+ * @Date 2021/7/21
+ * @Version 1.0
+ */
+@Data
+public class SysServiceVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "编号")
+    private Long id;
+
+    @ApiModelProperty(value = "服务名称")
+    private String name;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    @ApiModelProperty(value = "创建用户编号")
+    private Long creator;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "排序")
+    private String orderNo;
+
+    @ApiModelProperty(value = "是否删除,N:未删除,Y:删除")
+    private String isDeleted;
+    @ApiModelProperty(value = "数据权限详情列表")
+    private List<DataAuthDetailVO> dataAuthDetailVOS;
+    @ApiModelProperty(value = "角色列表")
+    private List<RoleVO> roles;
+}

+ 59 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/DataAuth.java

@@ -0,0 +1,59 @@
+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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 数据权限表
+ * </p>
+ */
+@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;
+
+    @ApiModelProperty(value = "状态 0:禁用,1:启用")
+    @TableField("status")
+    private String status;
+
+    @ApiModelProperty(value = "排序")
+    @TableField("order_no")
+    private String orderNo;
+
+    @ApiModelProperty(value = "医院ID")
+    @TableField("hospital_id")
+    private String hospitalId;
+
+    @ApiModelProperty(value = "创建用户编号")
+    @TableField("creator")
+    private Long creator;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField("create_time")
+    private Date createTime;
+
+    @ApiModelProperty(value = "是否删除,N:未删除,Y:删除")
+    @TableField("is_deleted")
+    private String isDeleted;
+
+
+}

+ 59 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/DataAuthDetail.java

@@ -0,0 +1,59 @@
+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;
+
+/**
+ * <p>
+ * 数据权限详情表
+ * </p>
+ */
+@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;
+
+    @ApiModelProperty(value = "数据范围类型::1:全部组织,2:全部科室,3:全部科室除本科室外,4:本科室,5:本医疗组,6:本人,7:自定义")
+    @TableField("data_type")
+    private Integer dataType;
+
+    @ApiModelProperty(value = "detail_id的类型 1:detail_id为医院id 2:为科室id3:为医生id")
+    @TableField("detail_type")
+    private Integer detailType;
+
+    @ApiModelProperty(value = "医院、科室、医生id")
+    @TableField("detail_id")
+    private Long detailId;
+
+    @ApiModelProperty(value = "创建用户编号")
+    @TableField("creator")
+    private Long creator;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField("create_time")
+    private Date createTime;
+
+    @ApiModelProperty(value = "是否删除,N:未删除,Y:删除")
+    @TableField("is_deleted")
+    private String isDeleted;
+
+
+}

+ 70 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/Dept.java

@@ -0,0 +1,70 @@
+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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 科室表
+ * </p>
+ */
+@Data
+@TableName("sys_dept")
+@ApiModel(value="Dept对象", description="科室表")
+public class Dept implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long 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;
+
+    @ApiModelProperty(value = "是否删除,N:未删除,Y:删除")
+    @TableField("is_deleted")
+    private String isDeleted;
+
+
+}

+ 58 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/DeptDoctor.java

@@ -0,0 +1,58 @@
+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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 科室医生关联表
+ * </p>
+ */
+@Data
+@TableName("sys_dept_doctor")
+@ApiModel(value="DeptDoctor对象", description="科室医生关联表")
+public class DeptDoctor implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty(value = "医院ID")
+    @TableField("hospital_id")
+    private Long hospitalId;
+
+    @ApiModelProperty(value = "科室ID")
+    @TableField("dept_id")
+    private Long deptId;
+
+    @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;
+
+    @ApiModelProperty(value = "是否删除,N:未删除,Y:删除")
+    @TableField("is_deleted")
+    private String isDeleted;
+
+
+}

+ 54 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/Dictionaries.java

@@ -0,0 +1,54 @@
+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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 字典管理表
+ * </p>
+ */
+@Data
+@TableName("sys_dictionaries")
+@ApiModel(value="Dictionaries对象", description="字典管理表")
+public class Dictionaries implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @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;
+
+    @ApiModelProperty(value = "状态 0:禁用,1:启用")
+    @TableField("status")
+    private String status;
+
+    @ApiModelProperty(value = "是否删除,N:未删除,Y:删除")
+    @TableField("is_deleted")
+    private String isDeleted;
+
+
+}

+ 63 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/Doctor.java

@@ -0,0 +1,63 @@
+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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 医生表
+ * </p>
+ */
+@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;
+
+    @ApiModelProperty(value = "职业医师资格(0:无,1:有)")
+    @TableField("occup")
+    private String occup;
+
+    @ApiModelProperty(value = "创建用户编号")
+    @TableField("creator")
+    private Long creator;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField("create_time")
+    private Date createTime;
+
+    @ApiModelProperty(value = "是否删除,N:未删除,Y:删除")
+    @TableField("is_deleted")
+    private String isDeleted;
+
+
+}

+ 23 - 45
dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/Organize.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,80 +17,56 @@ import java.util.Date;
  * </p>
  */
 @Data
-@TableName("sys_organize")
-public class Organize implements Serializable {
+@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("organize_id")
-    private String organizeId;
-
-    /**
-     * 父级编号
-     */
     @TableField("parent_id")
-    private String parentId;
+    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;
 
-    /**
-     * 组织编码
-     */
-    @TableField("code")
-    private String code;
-
-    /**
-     * 组织类型(集团医院、医共、医联、医院)
-     */
+    @ApiModelProperty(value = "组织类型(0:AI病案质控平台 1:集团医院 2:医共 3:医联 4:医院)")
     @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;
 

+ 51 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/HospitalUser.java

@@ -0,0 +1,51 @@
+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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 用户组织关联表
+ * </p>
+ */
+@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;
+
+    @ApiModelProperty(value = "是否删除,N:未删除,Y:删除")
+    @TableField("is_deleted")
+    private String isDeleted;
+
+
+}

+ 75 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/Log.java

@@ -0,0 +1,75 @@
+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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 系统操作日志表
+ * </p>
+ */
+@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;
+
+    @ApiModelProperty(value = "操作ip地址")
+    @TableField("remote_addr")
+    private String remoteAddr;
+
+    @ApiModelProperty(value = "用户代理")
+    @TableField("user_agent")
+    private String userAgent;
+
+    @ApiModelProperty(value = "请求uri")
+    @TableField("request_uri")
+    private String requestUri;
+
+    @ApiModelProperty(value = "http请求方法")
+    @TableField("method")
+    private String method;
+
+    @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;
+
+    @ApiModelProperty(value = "是否删除,N:未删除,Y:删除")
+    @TableField("is_deleted")
+    private String isDeleted;
+
+
+}

+ 61 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/LoginLog.java

@@ -0,0 +1,61 @@
+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;
+import java.util.Date;
+
+/**
+ * <p>
+ * 登录日志表
+ * </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;
+
+    @ApiModelProperty(value = "0成功、-1失败、-2密码错误")
+    @TableField("login_status")
+    private String loginStatus;
+
+    @ApiModelProperty(value = "登录ip")
+    @TableField("login_ip")
+    private String loginIp;
+
+    @ApiModelProperty(value = "浏览器")
+    @TableField("login_browser")
+    private String loginBrowser;
+
+    @ApiModelProperty(value = "备注")
+    @TableField("remark")
+    private String remark;
+
+    @ApiModelProperty(value = "是否删除,N:未删除,Y:删除")
+    @TableField("is_deleted")
+    private String isDeleted;
+
+
+}

+ 58 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/Medoup.java

@@ -0,0 +1,58 @@
+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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 医疗小组信息表
+ * </p>
+ */
+@Data
+@TableName("sys_medoup")
+@ApiModel(value="Medoup对象", description="医疗小组信息表")
+public class Medoup implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty(value = "医院ID")
+    @TableField("hospital_id")
+    private Long hospitalId;
+
+    @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;
+
+    @ApiModelProperty(value = "是否删除,N:未删除,Y:删除")
+    @TableField("is_deleted")
+    private String isDeleted;
+
+
+}

+ 54 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/MedoupDoctor.java

@@ -0,0 +1,54 @@
+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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 医疗组医生关联表
+ * </p>
+ */
+@Data
+@TableName("sys_medoup_doctor")
+@ApiModel(value="MedoupDoctor对象", description="医疗组医生关联表")
+public class MedoupDoctor implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty(value = "医院ID")
+    @TableField("hospital_id")
+    private Long hospitalId;
+
+    @ApiModelProperty(value = "科室ID")
+    @TableField("dept_id")
+    private Long deptId;
+
+    @ApiModelProperty(value = "医生ID")
+    @TableField("dcotor_id")
+    private Long dcotorId;
+
+    @ApiModelProperty(value = "创建者")
+    @TableField("creator")
+    private Long creator;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField("create_time")
+    private Date createTime;
+
+    @ApiModelProperty(value = "是否删除,N:未删除,Y:删除")
+    @TableField("is_deleted")
+    private String isDeleted;
+
+
+}

+ 21 - 52
dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/MenuInfo.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,98 +17,65 @@ import java.util.Date;
  * </p>
  */
 @Data
-@TableName("sys_menu_info")
-public class MenuInfo implements Serializable {
+@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
-     */
-    @TableField("system_id")
-    private Long systemId;
+    @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;
 
-    /**
-     * 权限标识
-     */
-    @TableField("permission")
-    private String permission;
-
-    /**
-     * 图标
-     */
+    @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;
 

+ 59 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/MenuResource.java

@@ -0,0 +1,59 @@
+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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 菜单资源关联表
+ * </p>
+ */
+@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;
+
+    @ApiModelProperty(value = "菜单ID")
+    @TableField("menu_id")
+    private Long menuId;
+
+    @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;
+
+    @ApiModelProperty(value = "是否删除,N:未删除,Y:删除")
+    @TableField("is_deleted")
+    private String isDeleted;
+
+
+}

+ 66 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/Region.java

@@ -0,0 +1,66 @@
+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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 病区表
+ * </p>
+ */
+@Data
+@TableName("sys_region")
+@ApiModel(value="Region对象", description="病区表")
+public class Region implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long 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;
+
+    @ApiModelProperty(value = "是否删除,N:未删除,Y:删除")
+    @TableField("is_deleted")
+    private String isDeleted;
+
+
+}

+ 63 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/RegionDept.java

@@ -0,0 +1,63 @@
+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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 病区科室关联表
+ * </p>
+ */
+@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;
+
+    @ApiModelProperty(value = "医院ID")
+    @TableField("hospital_id")
+    private Long hospitalId;
+
+    @ApiModelProperty(value = "病区ID")
+    @TableField("region_id")
+    private Long regionId;
+
+    @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;
+
+    @ApiModelProperty(value = "是否删除,N:未删除,Y:删除")
+    @TableField("is_deleted")
+    private String isDeleted;
+
+
+}

+ 71 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/Resource.java

@@ -0,0 +1,71 @@
+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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 系统资源表
+ * </p>
+ */
+@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;
+
+    @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;
+
+    @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;
+
+    @ApiModelProperty(value = "是否删除,N:未删除,Y:删除")
+    @TableField("is_deleted")
+    private String isDeleted;
+
+
+}

+ 14 - 29
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
-     */
-    @TableField("organize_id")
-    private String organizeId;
+    @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;
 

+ 55 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/RoleService.java

@@ -0,0 +1,55 @@
+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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 组织角色与系统关联表
+ * </p>
+ */
+@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;
+
+    @ApiModelProperty(value = "是否删除,N:未删除,Y:删除")
+    @TableField("is_deleted")
+    private String isDeleted;
+
+
+}

+ 50 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/RoleServiceDataAuth.java

@@ -0,0 +1,50 @@
+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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 角色系统数据权限关联表
+ * </p>
+ */
+@Data
+@TableName("sys_role_service_data_auth")
+@ApiModel(value="RoleServiceDataAuth对象", description="角色系统数据权限关联表")
+public class RoleServiceDataAuth implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty(value = "角色id")
+    @TableField("role_id")
+    private Long roleId;
+
+    @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;
+
+    @ApiModelProperty(value = "是否删除,N:未删除,Y:删除")
+    @TableField("is_deleted")
+    private String isDeleted;
+
+
+}

+ 51 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/ServiceDataAuth.java

@@ -0,0 +1,51 @@
+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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 系统与数据权限信息关联表
+ * </p>
+ */
+@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;
+
+    @ApiModelProperty(value = "是否删除,N:未删除,Y:删除")
+    @TableField("is_deleted")
+    private String isDeleted;
+
+
+}

+ 55 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/ServiceMenu.java

@@ -0,0 +1,55 @@
+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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 角色服务菜单功能关联表
+ * </p>
+ */
+@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;
+
+    @ApiModelProperty(value = "是否删除,N:未删除,Y:删除")
+    @TableField("is_deleted")
+    private String isDeleted;
+
+
+}

+ 55 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/ServiceResource.java

@@ -0,0 +1,55 @@
+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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 角色系统资源关联表
+ * </p>
+ */
+@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;
+
+    @ApiModelProperty(value = "是否删除,N:未删除,Y:删除")
+    @TableField("is_deleted")
+    private String isDeleted;
+
+
+}

+ 58 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/ServiceSet.java

@@ -0,0 +1,58 @@
+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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 参数管理表
+ * </p>
+ */
+@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;
+
+    @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;
+
+    @ApiModelProperty(value = "是否删除,N:未删除,Y:删除")
+    @TableField("is_deleted")
+    private String isDeleted;
+
+
+}

+ 55 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/SysService.java

@@ -0,0 +1,55 @@
+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;
+
+/**
+ * <p>
+ * 服务表
+ * </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;
+
+    @ApiModelProperty(value = "是否删除,N:未删除,Y:删除")
+    @TableField("is_deleted")
+    private String isDeleted;
+
+
+}

+ 21 - 42
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,91 +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;
 
-    /**
-     * 用户名
-     */
+    @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;
 

+ 14 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/DataAuthDetailFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.facade;
+
+import com.lantone.dblayermbg.service.impl.DataAuthDetailServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 数据权限详情表 服务实现类Facade
+ * </p>
+ */
+@Component
+public class DataAuthDetailFacade extends DataAuthDetailServiceImpl {
+
+}

+ 14 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/DataAuthFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.facade;
+
+import com.lantone.dblayermbg.service.impl.DataAuthServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 数据权限表 服务实现类Facade
+ * </p>
+ */
+@Component
+public class DataAuthFacade extends DataAuthServiceImpl {
+
+}

+ 14 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/DeptDoctorFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.facade;
+
+import com.lantone.dblayermbg.service.impl.DeptDoctorServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 科室医生关联表 服务实现类Facade
+ * </p>
+ */
+@Component
+public class DeptDoctorFacade extends DeptDoctorServiceImpl {
+
+}

+ 14 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/DeptFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.facade;
+
+import com.lantone.dblayermbg.service.impl.DeptServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 科室表 服务实现类Facade
+ * </p>
+ */
+@Component
+public class DeptFacade extends DeptServiceImpl {
+
+}

+ 14 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/DictionariesFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.facade;
+
+import com.lantone.dblayermbg.service.impl.DictionariesServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 字典管理表 服务实现类Facade
+ * </p>
+ */
+@Component
+public class DictionariesFacade extends DictionariesServiceImpl {
+
+}

+ 14 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/DoctorFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.facade;
+
+import com.lantone.dblayermbg.service.impl.DoctorServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 医生表 服务实现类Facade
+ * </p>
+ */
+@Component
+public class DoctorFacade extends DoctorServiceImpl {
+
+}

+ 2 - 2
dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/OrganizeFacade.java

@@ -1,6 +1,6 @@
 package com.lantone.dblayermbg.facade;
 
-import com.lantone.dblayermbg.service.impl.OrganizeServiceImpl;
+import com.lantone.dblayermbg.service.impl.HospitalServiceImpl;
 import org.springframework.stereotype.Component;
 
 /**
@@ -9,6 +9,6 @@ import org.springframework.stereotype.Component;
  * </p>
  */
 @Component
-public class OrganizeFacade extends OrganizeServiceImpl {
+public class HospitalFacade extends HospitalServiceImpl {
 
 }

+ 14 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/HospitalUserFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.facade;
+
+import com.lantone.dblayermbg.service.impl.HospitalUserServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 用户组织关联表 服务实现类Facade
+ * </p>
+ */
+@Component
+public class HospitalUserFacade extends HospitalUserServiceImpl {
+
+}

+ 14 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/LogFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.facade;
+
+import com.lantone.dblayermbg.service.impl.LogServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 系统操作日志表 服务实现类Facade
+ * </p>
+ */
+@Component
+public class LogFacade extends LogServiceImpl {
+
+}

+ 14 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/LoginLogFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.facade;
+
+import com.lantone.dblayermbg.service.impl.LoginLogServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 登录日志表 服务实现类Facade
+ * </p>
+ */
+@Component
+public class LoginLogFacade extends LoginLogServiceImpl {
+
+}

+ 14 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/MedoupDoctorFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.facade;
+
+import com.lantone.dblayermbg.service.impl.MedoupDoctorServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 医疗组医生关联表 服务实现类Facade
+ * </p>
+ */
+@Component
+public class MedoupDoctorFacade extends MedoupDoctorServiceImpl {
+
+}

+ 14 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/MedoupFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.facade;
+
+import com.lantone.dblayermbg.service.impl.MedoupServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 医疗小组信息表 服务实现类Facade
+ * </p>
+ */
+@Component
+public class MedoupFacade extends MedoupServiceImpl {
+
+}

+ 2 - 3
dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/MenuInfoFacade.java

@@ -1,15 +1,14 @@
 package com.lantone.dblayermbg.facade;
 
-import com.lantone.dblayermbg.service.impl.MenuInfoServiceImpl;
+import com.lantone.dblayermbg.service.impl.MenuServiceImpl;
 import org.springframework.stereotype.Component;
 
-
 /**
  * <p>
  * 菜单功能表 服务实现类Facade
  * </p>
  */
 @Component
-public class MenuInfoFacade extends MenuInfoServiceImpl {
+public class MenuFacade extends MenuServiceImpl {
 
 }

+ 14 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/MenuResourceFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.facade;
+
+import com.lantone.dblayermbg.service.impl.MenuResourceServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 菜单资源关联表 服务实现类Facade
+ * </p>
+ */
+@Component
+public class MenuResourceFacade extends MenuResourceServiceImpl {
+
+}

+ 14 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/RegionDeptFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.facade;
+
+import com.lantone.dblayermbg.service.impl.RegionDeptServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 病区科室关联表 服务实现类Facade
+ * </p>
+ */
+@Component
+public class RegionDeptFacade extends RegionDeptServiceImpl {
+
+}

+ 14 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/RegionFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.facade;
+
+import com.lantone.dblayermbg.service.impl.RegionServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 病区表 服务实现类Facade
+ * </p>
+ */
+@Component
+public class RegionFacade extends RegionServiceImpl {
+
+}

+ 14 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/ResourceFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.facade;
+
+import com.lantone.dblayermbg.service.impl.ResourceServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 系统资源表 服务实现类Facade
+ * </p>
+ */
+@Component
+public class ResourceFacade extends ResourceServiceImpl {
+
+}

+ 14 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/RoleServiceDataAuthFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.facade;
+
+import com.lantone.dblayermbg.service.impl.RoleServiceDataAuthServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 角色系统数据权限关联表 服务实现类Facade
+ * </p>
+ */
+@Component
+public class RoleServiceDataAuthFacade extends RoleServiceDataAuthServiceImpl {
+
+}

+ 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 {
+}

+ 14 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/ServiceSetFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.facade;
+
+import com.lantone.dblayermbg.service.impl.ServiceSetServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 参数管理表 服务实现类Facade
+ * </p>
+ */
+@Component
+public class ServiceSetFacade extends ServiceSetServiceImpl {
+
+}

+ 14 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/SysServiceFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.facade;
+
+import com.lantone.dblayermbg.service.impl.SysServiceServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 服务表 服务实现类Facade
+ * </p>
+ */
+@Component
+public class SysServiceFacade extends SysServiceServiceImpl {
+
+}

+ 1 - 1
dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/UserFacade.java

@@ -5,7 +5,7 @@ import org.springframework.stereotype.Component;
 
 /**
  * <p>
- * 系统用户表 服务实现类Facade
+ * 用户表 服务实现类Facade
  * </p>
  */
 @Component

+ 14 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/DataAuthDetailMapper.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.dblayermbg.entity.DataAuthDetail;
+
+/**
+ * <p>
+ * 数据权限详情表 Mapper 接口
+ * </p>
+ */
+public interface DataAuthDetailMapper extends BaseMapper<DataAuthDetail> {
+
+}
+

+ 27 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/DataAuthMapper.java

@@ -0,0 +1,27 @@
+package com.lantone.dblayermbg.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.common.dto.ServiceRoleDataAuthDetailDTO;
+import com.lantone.common.vo.ServiceDataAuthVO;
+import com.lantone.dblayermbg.entity.DataAuth;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 数据权限表 Mapper 接口
+ * </p>
+ */
+public interface DataAuthMapper extends BaseMapper<DataAuth> {
+    /**
+     * @Author songxl
+     * @Description 通过数据权限id和角色id获取数据权限详情
+     * @Date  2021/7/22
+     * @Param [serviceDataAuthVO]
+     * @Return com.lantone.security.dto.ServiceRoleDataAuthDetailDTO
+     * @MethodName getDataAuthById
+     */
+    List<ServiceRoleDataAuthDetailDTO> getDataAuthById(@Param("serviceDataAuthVO") ServiceDataAuthVO serviceDataAuthVO);
+}
+

+ 14 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/DeptDoctorMapper.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.dblayermbg.entity.DeptDoctor;
+
+/**
+ * <p>
+ * 科室医生关联表 Mapper 接口
+ * </p>
+ */
+public interface DeptDoctorMapper extends BaseMapper<DeptDoctor> {
+
+}
+

+ 14 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/DeptMapper.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.dblayermbg.entity.Dept;
+
+/**
+ * <p>
+ * 科室表 Mapper 接口
+ * </p>
+ */
+public interface DeptMapper extends BaseMapper<Dept> {
+
+}
+

+ 14 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/DictionariesMapper.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.dblayermbg.entity.Dictionaries;
+
+/**
+ * <p>
+ * 字典管理表 Mapper 接口
+ * </p>
+ */
+public interface DictionariesMapper extends BaseMapper<Dictionaries> {
+
+}
+

+ 14 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/DoctorMapper.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.dblayermbg.entity.Doctor;
+
+/**
+ * <p>
+ * 医生表 Mapper 接口
+ * </p>
+ */
+public interface DoctorMapper extends BaseMapper<Doctor> {
+
+}
+

+ 2 - 2
dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/OrganizeMapper.java

@@ -1,14 +1,14 @@
 package com.lantone.dblayermbg.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lantone.dblayermbg.entity.Organize;
+import com.lantone.dblayermbg.entity.Hospital;
 
 /**
  * <p>
  * 组织表 Mapper 接口
  * </p>
  */
-public interface OrganizeMapper extends BaseMapper<Organize> {
+public interface HospitalMapper extends BaseMapper<Hospital> {
 
 }
 

+ 14 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/HospitalUserMapper.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.dblayermbg.entity.HospitalUser;
+
+/**
+ * <p>
+ * 用户组织关联表 Mapper 接口
+ * </p>
+ */
+public interface HospitalUserMapper extends BaseMapper<HospitalUser> {
+
+}
+

+ 14 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/LogMapper.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.dblayermbg.entity.Log;
+
+/**
+ * <p>
+ * 系统操作日志表 Mapper 接口
+ * </p>
+ */
+public interface LogMapper extends BaseMapper<Log> {
+
+}
+

+ 14 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/LoginLogMapper.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.dblayermbg.entity.LoginLog;
+
+/**
+ * <p>
+ * 登录日志表 Mapper 接口
+ * </p>
+ */
+public interface LoginLogMapper extends BaseMapper<LoginLog> {
+
+}
+

+ 14 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/MedoupDoctorMapper.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.dblayermbg.entity.MedoupDoctor;
+
+/**
+ * <p>
+ * 医疗组医生关联表 Mapper 接口
+ * </p>
+ */
+public interface MedoupDoctorMapper extends BaseMapper<MedoupDoctor> {
+
+}
+

+ 14 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/MedoupMapper.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.dblayermbg.entity.Medoup;
+
+/**
+ * <p>
+ * 医疗小组信息表 Mapper 接口
+ * </p>
+ */
+public interface MedoupMapper extends BaseMapper<Medoup> {
+
+}
+

+ 0 - 26
dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/MenuInfoMapper.java

@@ -1,26 +0,0 @@
-package com.lantone.dblayermbg.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lantone.dblayermbg.entity.MenuInfo;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 菜单功能表 Mapper 接口
- * </p>
- */
-public interface MenuInfoMapper extends BaseMapper<MenuInfo> {
-
-    /**
-     * @Author songxl
-     * @Description 通过用户id获取用户所有菜单id
-     * @Date 2021/7/20
-     * @Param [userId]
-     * @Return java.util.List<java.lang.Long>
-     * @MethodName queryAllMenuIdByUserId
-     */
-    List<Long> queryAllMenuIdByUserId(@Param("userID") Long userID, @Param("organizeID")String organizeId);
-}
-

+ 14 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/MenuMapper.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.dblayermbg.entity.Menu;
+
+/**
+ * <p>
+ * 菜单功能表 Mapper 接口
+ * </p>
+ */
+public interface MenuMapper extends BaseMapper<Menu> {
+
+}
+

+ 14 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/MenuResourceMapper.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.dblayermbg.entity.MenuResource;
+
+/**
+ * <p>
+ * 菜单资源关联表 Mapper 接口
+ * </p>
+ */
+public interface MenuResourceMapper extends BaseMapper<MenuResource> {
+
+}
+

+ 14 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/RegionDeptMapper.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.dblayermbg.entity.RegionDept;
+
+/**
+ * <p>
+ * 病区科室关联表 Mapper 接口
+ * </p>
+ */
+public interface RegionDeptMapper extends BaseMapper<RegionDept> {
+
+}
+

+ 14 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/RegionMapper.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.dblayermbg.entity.Region;
+
+/**
+ * <p>
+ * 病区表 Mapper 接口
+ * </p>
+ */
+public interface RegionMapper extends BaseMapper<Region> {
+
+}
+

+ 14 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/ResourceMapper.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.dblayermbg.entity.Resource;
+
+/**
+ * <p>
+ * 系统资源表 Mapper 接口
+ * </p>
+ */
+public interface ResourceMapper extends BaseMapper<Resource> {
+
+}
+

+ 14 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/RoleServiceDataAuthMapper.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.dblayermbg.entity.RoleServiceDataAuth;
+
+/**
+ * <p>
+ * 角色系统数据权限关联表 Mapper 接口
+ * </p>
+ */
+public interface RoleServiceDataAuthMapper extends BaseMapper<RoleServiceDataAuth> {
+
+}
+

+ 14 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/RoleServiceMapper.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.dblayermbg.entity.RoleService;
+
+/**
+ * <p>
+ * 组织角色与系统关联表 Mapper 接口
+ * </p>
+ */
+public interface RoleServiceMapper extends BaseMapper<RoleService> {
+
+}
+

+ 14 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/ServiceDataAuthMapper.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.dblayermbg.entity.ServiceDataAuth;
+
+/**
+ * <p>
+ * 系统与数据权限信息关联表 Mapper 接口
+ * </p>
+ */
+public interface ServiceDataAuthMapper extends BaseMapper<ServiceDataAuth> {
+
+}
+

+ 14 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/ServiceMenuMapper.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.dblayermbg.entity.ServiceMenu;
+
+/**
+ * <p>
+ * 角色服务菜单功能关联表 Mapper 接口
+ * </p>
+ */
+public interface ServiceMenuMapper extends BaseMapper<ServiceMenu> {
+
+}
+

+ 14 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/ServiceResourceMapper.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.dblayermbg.entity.ServiceResource;
+
+/**
+ * <p>
+ * 角色系统资源关联表 Mapper 接口
+ * </p>
+ */
+public interface ServiceResourceMapper extends BaseMapper<ServiceResource> {
+
+}
+

+ 14 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/ServiceSetMapper.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.dblayermbg.entity.ServiceSet;
+
+/**
+ * <p>
+ * 参数管理表 Mapper 接口
+ * </p>
+ */
+public interface ServiceSetMapper extends BaseMapper<ServiceSet> {
+
+}
+

+ 14 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/SysServiceMapper.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.dblayermbg.entity.SysService;
+
+/**
+ * <p>
+ * 服务表 Mapper 接口
+ * </p>
+ */
+public interface SysServiceMapper extends BaseMapper<SysService> {
+
+}
+

+ 5 - 7
dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/UserMapper.java

@@ -1,8 +1,8 @@
 package com.lantone.dblayermbg.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lantone.dblayermbg.entity.Organize;
-import com.lantone.dblayermbg.entity.Role;
+import com.lantone.common.dto.RoleDTO;
+import com.lantone.dblayermbg.entity.Hospital;
 import com.lantone.dblayermbg.entity.User;
 import org.apache.ibatis.annotations.Param;
 
@@ -10,15 +10,13 @@ import java.util.List;
 
 /**
  * <p>
- * 系统用户表 Mapper 接口
+ * 用户表 Mapper 接口
  * </p>
  */
 public interface UserMapper extends BaseMapper<User> {
-
-
     List<User> getalle();
-    List<Organize> getUserOrganizeByUserID(Long userID);
+    List<Hospital> getUserOrganizeByUserID(Long userID);
 
-    List<Role> getUserRoleByUserID(@Param("userID") Long userID, @Param("organizeId")String organizeId);
+    List<RoleDTO> getUserRoleByUserID(@Param("userID") Long userID, @Param("organizeId")Long organizeId);
 }
 

+ 13 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/DataAuthDetailService.java

@@ -0,0 +1,13 @@
+package com.lantone.dblayermbg.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.lantone.dblayermbg.entity.DataAuthDetail;
+
+/**
+ * <p>
+ * 数据权限详情表 服务类
+ * </p>
+ */
+public interface DataAuthDetailService extends IService<DataAuthDetail> {
+
+}

+ 13 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/DataAuthService.java

@@ -0,0 +1,13 @@
+package com.lantone.dblayermbg.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.lantone.dblayermbg.entity.DataAuth;
+
+/**
+ * <p>
+ * 数据权限表 服务类
+ * </p>
+ */
+public interface DataAuthService extends IService<DataAuth> {
+
+}

+ 13 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/DeptDoctorService.java

@@ -0,0 +1,13 @@
+package com.lantone.dblayermbg.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.lantone.dblayermbg.entity.DeptDoctor;
+
+/**
+ * <p>
+ * 科室医生关联表 服务类
+ * </p>
+ */
+public interface DeptDoctorService extends IService<DeptDoctor> {
+
+}

+ 13 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/DeptService.java

@@ -0,0 +1,13 @@
+package com.lantone.dblayermbg.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.lantone.dblayermbg.entity.Dept;
+
+/**
+ * <p>
+ * 科室表 服务类
+ * </p>
+ */
+public interface DeptService extends IService<Dept> {
+
+}

+ 13 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/DictionariesService.java

@@ -0,0 +1,13 @@
+package com.lantone.dblayermbg.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.lantone.dblayermbg.entity.Dictionaries;
+
+/**
+ * <p>
+ * 字典管理表 服务类
+ * </p>
+ */
+public interface DictionariesService extends IService<Dictionaries> {
+
+}

+ 13 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/DoctorService.java

@@ -0,0 +1,13 @@
+package com.lantone.dblayermbg.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.lantone.dblayermbg.entity.Doctor;
+
+/**
+ * <p>
+ * 医生表 服务类
+ * </p>
+ */
+public interface DoctorService extends IService<Doctor> {
+
+}

+ 2 - 2
dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/OrganizeService.java

@@ -1,13 +1,13 @@
 package com.lantone.dblayermbg.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.lantone.dblayermbg.entity.Organize;
+import com.lantone.dblayermbg.entity.Hospital;
 
 /**
  * <p>
  * 组织表 服务类
  * </p>
  */
-public interface OrganizeService extends IService<Organize> {
+public interface HospitalService extends IService<Hospital> {
 
 }

+ 13 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/HospitalUserService.java

@@ -0,0 +1,13 @@
+package com.lantone.dblayermbg.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.lantone.dblayermbg.entity.HospitalUser;
+
+/**
+ * <p>
+ * 用户组织关联表 服务类
+ * </p>
+ */
+public interface HospitalUserService extends IService<HospitalUser> {
+
+}

+ 0 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/LogService.java


Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä