根据数据库表修改对相关功能、类做出调整

common/src/main/java/com/lantone/common/dto/DataAuthDTO.java

@@ -22,7 +22,7 @@ public class DataAuthDTO implements Serializable {
     private Long id;
 
     @ApiModelProperty(value = "数据权限名称")
-    private String authName;
+    private String name;
     @ApiModelProperty(value = "角色编号")
     private Long roleId;
 

common/src/main/java/com/lantone/common/dto/ServiceRoleDataAuthDetailDTO.java

@@ -4,18 +4,18 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
- * @ClassName: ServiceRoleDataAuthDetailDTO
+ * @ClassName: SoftwareRoleDataAuthDetailDTO
  * @Description: 服务、角色、数据权限明细关联对象
  * @Author songxl
  * @Date 2021/7/22
  * @Version 1.0
  */
 @Data
-public class ServiceRoleDataAuthDetailDTO {
+public class SoftwareRoleDataAuthDetailDTO {
     @ApiModelProperty(value = "服务、角色、数据权限关联id")
-    private Long serviceRoleDataAuthDetailId;
+    private Long softwareRoleDataAuthDetailId;
     @ApiModelProperty(value = "系统数据权限id")
-    private Long serviceDataAuthId;
+    private Long softwareDataAuthId;
     @ApiModelProperty(value = "数据权限详情id")
     private Long detail;
     @ApiModelProperty(value = "数据权限id")
@@ -31,10 +31,10 @@ public class ServiceRoleDataAuthDetailDTO {
     @ApiModelProperty(value = "医院、科室、医生id")
     private Long detailId;
     @ApiModelProperty(value = "系统id")
-    private Long serviceId;
+    private Long softwareId;
 
     @ApiModelProperty(value = "系统名称")
-    private String serviceName;
+    private String softwareName;
     @ApiModelProperty(value = "角色id")
     private Long roleId;
     @ApiModelProperty(value = "角色名称")

common/src/main/java/com/lantone/common/vo/DataAuthVO.java

@@ -23,7 +23,7 @@ public class DataAuthVO extends Page implements Serializable {
     private Long id;
 
     @ApiModelProperty(value = "数据权限名称")
-    private String authName;
+    private String name;
 
     @ApiModelProperty(value = "状态 0:禁用，1：启用")
     private String status;
@@ -43,7 +43,7 @@ public class DataAuthVO extends Page implements Serializable {
     @ApiModelProperty(value = "是否删除,N:未删除，Y:删除")
     private String isDeleted;
     @ApiModelProperty("系统列表")
-    private List<SysServiceVO> serviceVOS;
+    private List<SysSoftwareVO> softwareVOS;
 
     @ApiModelProperty("角色列表")
     private List<Long> roles;

common/src/main/java/com/lantone/common/vo/RoleServiceMenuVo.java

@@ -12,7 +12,7 @@ import java.util.List;
  * </p>
  */
 @Data
-public class RoleServiceMenuVo implements Serializable {
+public class RoleSoftwareMenuVo implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -21,7 +21,7 @@ public class RoleServiceMenuVo implements Serializable {
     private List<Long> roles;
 
     @ApiModelProperty(value = "服务id")
-    private Long serviceId;
+    private Long softwareId;
 
     @ApiModelProperty(value = "是否删除,N:未删除，Y:删除")
     private String isDeleted;

common/src/main/java/com/lantone/common/vo/ServiceDataAuthVO.java

@@ -13,7 +13,7 @@ import java.util.List;
  * @Version 1.0
  */
 @Data
-public class ServiceDataAuthVO {
+public class SoftwareDataAuthVO {
     /**
      * 数据权限对象
      */

common/src/main/java/com/lantone/common/vo/SysServiceVO.java

@@ -15,7 +15,7 @@ import java.util.List;
  * @Version 1.0
  */
 @Data
-public class SysServiceVO implements Serializable {
+public class SysSoftwareVO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "编号")

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

@@ -28,8 +28,8 @@ public class DataAuth implements Serializable {
     private Long id;
 
     @ApiModelProperty(value = "数据权限名称")
-    @TableField("auth_name")
-    private String authName;
+    @TableField("name")
+    private String name;
 
     @ApiModelProperty(value = "状态 0:禁用，1：启用")
     @TableField("status")
@@ -39,10 +39,6 @@ public class DataAuth implements Serializable {
     @TableField("order_no")
     private String orderNo;
 
-    @ApiModelProperty(value = "医院ID")
-    @TableField("hospital_id")
-    private String hospitalId;
-
     @ApiModelProperty(value = "是否删除,N:未删除，Y:删除")
     @TableField("is_deleted")
     private String isDeleted;

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

@@ -23,13 +23,13 @@ public class DataAuthDetail implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "编号")
+    @ApiModelProperty(value = "主键")
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
-    @ApiModelProperty(value = "数据权限编号")
-    @TableField("service_data_auth_id")
-    private Long serviceDataAuthId;
+    @ApiModelProperty(value = "系统服务与数据权限关联")
+    @TableField("software_data_auth_id")
+    private Long softwareDataAuthId;
 
     @ApiModelProperty(value = "数据范围类型：：1:全部组织,2:全部科室,3:全部科室除本科室外,4:本科室,5:本医疗组,6:本人,7:自定义")
     @TableField("data_type")

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

@@ -13,23 +13,20 @@ import java.util.Date;
 
 /**
  * <p>
- * 科室医生关联表
+ * 科室与医生关联表
  * </p>
  */
 @Data
 @TableName("sys_dept_doctor")
-@ApiModel(value="DeptDoctor对象", description="科室医生关联表")
+@ApiModel(value="DeptDoctor对象", description="科室与医生关联表")
 public class DeptDoctor 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("dept_id")
     private Long deptId;

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

@@ -1,55 +0,0 @@
-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;
-
-
-}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/RoleServiceMenu.java

@@ -13,26 +13,27 @@ import java.util.Date;
 
 /**
  * <p>
- * 角色系统功能菜单关联表
+ * 角色与系统服务关联表
  * </p>
  */
 @Data
-@TableName("sys_role_service_menu")
-@ApiModel(value="RoleServiceMenu对象", description="角色系统功能菜单关联表")
-public class RoleServiceMenu implements Serializable {
+@TableName("sys_role_software")
+@ApiModel(value="RoleSoftware对象", description="角色与系统服务关联表")
+public class RoleSoftware implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "主键")
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
-    @ApiModelProperty(value = "角色id")
+    @ApiModelProperty(value = "角色ID")
     @TableField("role_id")
     private Long roleId;
 
-    @ApiModelProperty(value = "系统功能菜单关联id")
-    @TableField("service_menu_id")
-    private Long serviceMenuId;
+    @ApiModelProperty(value = "系统服务ID")
+    @TableField("software_id")
+    private Long softwareId;
 
     @ApiModelProperty(value = "是否删除,N:未删除，Y:删除")
     @TableField("is_deleted")

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/RoleSoftwareDataAuth.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 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_role_software_data_auth")
+@ApiModel(value="RoleSoftwareDataAuth对象", description="角色与系统服务与数据权限关联表")
+public class RoleSoftwareDataAuth implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty(value = "角色ID")
+    @TableField("role_id")
+    private Long roleId;
+
+    @ApiModelProperty(value = "系统服务与数据权限关联ID")
+    @TableField("software_data_auth_id")
+    private Long softwareDataAuthId;
+
+    @ApiModelProperty(value = "是否删除,N:未删除，Y:删除")
+    @TableField("is_deleted")
+    private String isDeleted;
+
+    @ApiModelProperty(value = "记录创建时间")
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    @ApiModelProperty(value = "记录修改时间,如果时间是1970年则表示纪录未修改")
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    @ApiModelProperty(value = "创建人，0表示无创建人值")
+    @TableField("creator")
+    private String creator;
+
+    @ApiModelProperty(value = "修改人,如果为0则表示纪录未修改")
+    @TableField("modifier")
+    private String modifier;
+
+    @ApiModelProperty(value = "备注")
+    @TableField("remark")
+    private String remark;
+
+
+}

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

@@ -13,26 +13,27 @@ import java.util.Date;
 
 /**
  * <p>
- * 角色系统数据权限关联表
+ * 角色与系统服务与功能菜单关联表
  * </p>
  */
 @Data
-@TableName("sys_role_service_data_auth")
-@ApiModel(value="RoleServiceDataAuth对象", description="角色系统数据权限关联表")
-public class RoleServiceDataAuth implements Serializable {
+@TableName("sys_role_software_menu")
+@ApiModel(value="RoleSoftwareMenu对象", description="角色与系统服务与功能菜单关联表")
+public class RoleSoftwareMenu implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "主键")
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
-    @ApiModelProperty(value = "角色id")
+    @ApiModelProperty(value = "角色ID")
     @TableField("role_id")
     private Long roleId;
 
-    @ApiModelProperty(value = "服务数据权限关联id")
-    @TableField("service_data_auth_id")
-    private Long serviceDataAuthId;
+    @ApiModelProperty(value = "系统服务与功能菜单关联ID")
+    @TableField("software_menu_id")
+    private Long softwareMenuId;
 
     @ApiModelProperty(value = "是否删除,N:未删除，Y:删除")
     @TableField("is_deleted")

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/RoleSoftwareResource.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 lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 角色与系统服务与URL资源关联表
+ * </p>
+ */
+@Data
+@TableName("sys_role_software_resource")
+@ApiModel(value="RoleSoftwareResource对象", description="角色与系统服务与URL资源关联表")
+public class RoleSoftwareResource implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty(value = "角色ID")
+    @TableField("role_id")
+    private Long roleId;
+
+    @ApiModelProperty(value = "系统服务与URL资源关联ID")
+    @TableField("software_resource_id")
+    private Long softwareResourceId;
+
+    @ApiModelProperty(value = "是否删除,N:未删除，Y:删除")
+    @TableField("is_deleted")
+    private String isDeleted;
+
+    @ApiModelProperty(value = "记录创建时间")
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    @ApiModelProperty(value = "记录修改时间,如果时间是1970年则表示纪录未修改")
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    @ApiModelProperty(value = "创建人，0表示无创建人值")
+    @TableField("creator")
+    private String creator;
+
+    @ApiModelProperty(value = "修改人,如果为0则表示纪录未修改")
+    @TableField("modifier")
+    private String modifier;
+
+    @ApiModelProperty(value = "备注")
+    @TableField("remark")
+    private String remark;
+
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/RoleServiceResource.java

@@ -13,26 +13,27 @@ import java.util.Date;
 
 /**
  * <p>
- * 角色系统资源关联表
+ * 系统服务表
  * </p>
  */
 @Data
-@TableName("sys_role_service_resource")
-@ApiModel(value="RoleServiceResource对象", description="角色系统资源关联表")
-public class RoleServiceResource implements Serializable {
+@TableName("sys_software")
+@ApiModel(value="Software对象", description="系统服务表")
+public class Software implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "主键")
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
-    @ApiModelProperty(value = "角色id")
-    @TableField("role_id")
-    private Long roleId;
+    @ApiModelProperty(value = "系统服务名称")
+    @TableField("name")
+    private String name;
 
-    @ApiModelProperty(value = "系统资源关联id")
-    @TableField("service_resource_id")
-    private Long serviceResourceId;
+    @ApiModelProperty(value = "排序")
+    @TableField("order_no")
+    private String orderNo;
 
     @ApiModelProperty(value = "是否删除,N:未删除，Y:删除")
     @TableField("is_deleted")

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

@@ -13,25 +13,25 @@ import java.util.Date;
 
 /**
  * <p>
- * 系统与数据权限信息关联表
+ * 系统服务与数据权限关联表
  * </p>
  */
 @Data
-@TableName("sys_service_data_auth")
-@ApiModel(value="ServiceDataAuth对象", description="系统与数据权限信息关联表")
-public class ServiceDataAuth implements Serializable {
+@TableName("sys_software_data_auth")
+@ApiModel(value="SoftwareDataAuth对象", description="系统服务与数据权限关联表")
+public class SoftwareDataAuth implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "编号")
+    @ApiModelProperty(value = "主键")
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
-    @ApiModelProperty(value = "服务编号")
-    @TableField("service_id")
-    private Long serviceId;
+    @ApiModelProperty(value = "系统服务ID")
+    @TableField("software_id")
+    private Long softwareId;
 
-    @ApiModelProperty(value = "数据权限编号")
+    @ApiModelProperty(value = "数据权限ID")
     @TableField("data_auth_id")
     private Long dataAuthId;
 

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

@@ -17,9 +17,9 @@ import java.util.Date;
  * </p>
  */
 @Data
-@TableName("sys_service_menu")
-@ApiModel(value="ServiceMenu对象", description="系统服务功能菜单关联表")
-public class ServiceMenu implements Serializable {
+@TableName("sys_software_menu")
+@ApiModel(value="SoftwareMenu对象", description="系统服务功能菜单关联表")
+public class SoftwareMenu implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -28,8 +28,8 @@ public class ServiceMenu implements Serializable {
     private Long id;
 
     @ApiModelProperty(value = "系统服务ID")
-    @TableField("service_id")
-    private Long serviceId;
+    @TableField("software_id")
+    private Long softwareId;
 
     @ApiModelProperty(value = "功能菜单ID")
     @TableField("menu_id")

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

@@ -13,25 +13,25 @@ import java.util.Date;
 
 /**
  * <p>
- * 系统资源关联表
+ * 系统服务与URL资源关联表
  * </p>
  */
 @Data
-@TableName("sys_service_resource")
-@ApiModel(value="ServiceResource对象", description="系统资源关联表")
-public class ServiceResource implements Serializable {
+@TableName("sys_software_resource")
+@ApiModel(value="SoftwareResource对象", description="系统服务与URL资源关联表")
+public class SoftwareResource implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "编号")
+    @ApiModelProperty(value = "主键")
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
-    @ApiModelProperty(value = "系统编号")
-    @TableField("service_id")
-    private Long serviceId;
+    @ApiModelProperty(value = "系统服务ID")
+    @TableField("software_id")
+    private Long softwareId;
 
-    @ApiModelProperty(value = "资源编号")
+    @ApiModelProperty(value = "URL资源ID")
     @TableField("resource_id")
     private Long resourceId;
 

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

@@ -1,14 +0,0 @@
-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 {
-
-}

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

@@ -1,13 +0,0 @@
-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 {
-}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/RoleServiceMenuFacade.java

@@ -1,14 +0,0 @@
-package com.lantone.dblayermbg.facade;
-
-import com.lantone.dblayermbg.service.impl.RoleServiceMenuServiceImpl;
-import org.springframework.stereotype.Component;
-
-/**
- * <p>
- * 角色系统功能菜单关联表 服务实现类Facade
- * </p>
- */
-@Component
-public class RoleServiceMenuFacade extends RoleServiceMenuServiceImpl {
-
-}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/RoleServiceResourceFacade.java

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

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/RoleSoftwareDataAuthFacade.java

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

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/RoleSoftwareFacade.java

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

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/RoleSoftwareMenuFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.facade;
+
+import com.lantone.dblayermbg.service.impl.RoleSoftwareMenuServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 角色与系统服务与功能菜单关联表 服务实现类Facade
+ * </p>
+ */
+@Component
+public class RoleSoftwareMenuFacade extends RoleSoftwareMenuServiceImpl {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/RoleSoftwareResourceFacade.java

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

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

@@ -1,13 +0,0 @@
-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 {
-}

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

@@ -1,13 +0,0 @@
-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 {
-}

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

@@ -1,13 +0,0 @@
-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 {
-}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/SoftwareDataAuthFacade.java

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

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/SoftwareFacade.java

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

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/SoftwareMenuFacade.java

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

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/SoftwareResourceFacade.java

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

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

@@ -3,9 +3,9 @@ package com.lantone.dblayermbg.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.lantone.common.dto.DataAuthDTO;
-import com.lantone.common.dto.ServiceRoleDataAuthDetailDTO;
+import com.lantone.common.dto.SoftwareRoleDataAuthDetailDTO;
 import com.lantone.common.vo.DataAuthVO;
-import com.lantone.common.vo.ServiceDataAuthVO;
+import com.lantone.common.vo.SoftwareDataAuthVO;
 import com.lantone.dblayermbg.entity.DataAuth;
 import org.apache.ibatis.annotations.Param;
 
@@ -17,34 +17,39 @@ import java.util.List;
  * </p>
  */
 public interface DataAuthMapper extends BaseMapper<DataAuth> {
+
     /**
-     /**
+     * @Method getDataAuthById
      * @Author songxl
-     * @Description 通过数据权限id和角色id获取数据权限
-     * @Date 2021/7/22
-     * @Param [serviceDataAuthVO]
-     * @Return com.lantone.security.dto.ServiceRoleDataAuthDetailDTO
-     * @MethodName getDataAuthById
+     * @Version  1.0
+     * @Description通过数据权限id和角色id获取数据权限
+     * @param  softwareDataAuthVO
+     * @Return java.util.List<com.lantone.common.dto.SoftwareRoleDataAuthDetailDTO>
+     * @Date 2021/7/29
      */
-    List<ServiceRoleDataAuthDetailDTO> getDataAuthById(@Param("serviceDataAuthVO") ServiceDataAuthVO serviceDataAuthVO);
+    List<SoftwareRoleDataAuthDetailDTO> getDataAuthById(@Param("softwareDataAuthVO") SoftwareDataAuthVO softwareDataAuthVO);
 
     /**
+     * @Method getOneSoftwareRoleDataAuthDetail
      * @Author songxl
-     * @Description 获取数据权限详情
-     * @Date 2021/7/22
-     * @Param [serviceDataAuthVO]
-     * @Return com.lantone.security.dto.ServiceRoleDataAuthDetailDTO
-     * @MethodName getDataAuthById
+     * @Version  1.0
+     * @Description获取数据权限详情
+     * @param softwareID
+     * @param dataDetailID
+     * @Return java.util.List<com.lantone.common.dto.SoftwareRoleDataAuthDetailDTO>
+     * @Date 2021/7/29
      */
-    List<ServiceRoleDataAuthDetailDTO> getOneServiceRoleDataAuthDetail(@Param("serviceID") Long serviceID, @Param("dataDetailID") Long dataDetailID);
+    List<SoftwareRoleDataAuthDetailDTO> getOneSoftwareRoleDataAuthDetail(@Param("softwareID") Long softwareID, @Param("dataDetailID") Long dataDetailID);
+
 
     /**
+     * @Method getDataAuthPage
      * @Author songxl
+     * @Version  1.0
      * @Description获取数据权限列表
-     * @Date 2021/7/27
-     * @Param [dataAuthVO]
+     * @param dataAuthVO
      * @Return com.baomidou.mybatisplus.core.metadata.IPage<com.lantone.common.dto.DataAuthDTO>
-     * @MethodName getDataAuthPage
+     * @Date 2021/7/29
      */
     IPage<DataAuthDTO> getDataAuthPage(@Param("dataAuthVO") DataAuthVO dataAuthVO);
 }

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

@@ -1,14 +0,0 @@
-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> {
-
-}
-

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

@@ -1,14 +0,0 @@
-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> {
-
-}
-

dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/RoleServiceResourceMapper.java

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

dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/RoleSoftwareDataAuthMapper.java

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

dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/RoleSoftwareMapper.java

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

dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/RoleSoftwareResourceMapper.java

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

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

@@ -1,14 +0,0 @@
-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> {
-
-}
-

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

@@ -1,14 +0,0 @@
-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> {
-
-}
-

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

@@ -1,14 +0,0 @@
-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> {
-
-}
-

dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/SoftwareDataAuthMapper.java

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

dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/SoftwareMapper.java

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

dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/SoftwareMenuMapper.java

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

dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/SoftwareResourceMapper.java

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

dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/RoleServiceDataAuthService.java

@@ -1,13 +0,0 @@
-package com.lantone.dblayermbg.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.lantone.dblayermbg.entity.RoleServiceDataAuth;
-
-/**
- * <p>
- * 角色系统数据权限关联表 服务类
- * </p>
- */
-public interface RoleServiceDataAuthService extends IService<RoleServiceDataAuth> {
-
-}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/RoleServiceMenuService.java

@@ -1,13 +0,0 @@
-package com.lantone.dblayermbg.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.lantone.dblayermbg.entity.RoleServiceMenu;
-
-/**
- * <p>
- * 角色系统功能菜单关联表 服务类
- * </p>
- */
-public interface RoleServiceMenuService extends IService<RoleServiceMenu> {
-
-}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/RoleServiceResourceService.java

@@ -1,13 +0,0 @@
-package com.lantone.dblayermbg.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.lantone.dblayermbg.entity.RoleServiceResource;
-
-/**
- * <p>
- * 角色系统资源关联表 服务类
- * </p>
- */
-public interface RoleServiceResourceService extends IService<RoleServiceResource> {
-
-}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/RoleServiceService.java

@@ -1,13 +0,0 @@
-package com.lantone.dblayermbg.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.lantone.dblayermbg.entity.RoleService;
-
-/**
- * <p>
- * 组织角色与系统关联表 服务类
- * </p>
- */
-public interface RoleServiceService extends IService<RoleService> {
-
-}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/RoleSoftwareDataAuthService.java

@@ -0,0 +1,13 @@
+package com.lantone.dblayermbg.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.lantone.dblayermbg.entity.RoleSoftwareDataAuth;
+
+/**
+ * <p>
+ * 角色与系统服务与数据权限关联表 服务类
+ * </p>
+ */
+public interface RoleSoftwareDataAuthService extends IService<RoleSoftwareDataAuth> {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/RoleSoftwareMenuService.java

@@ -0,0 +1,13 @@
+package com.lantone.dblayermbg.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.lantone.dblayermbg.entity.RoleSoftwareMenu;
+
+/**
+ * <p>
+ * 角色与系统服务与功能菜单关联表 服务类
+ * </p>
+ */
+public interface RoleSoftwareMenuService extends IService<RoleSoftwareMenu> {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/RoleSoftwareResourceService.java

@@ -0,0 +1,13 @@
+package com.lantone.dblayermbg.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.lantone.dblayermbg.entity.RoleSoftwareResource;
+
+/**
+ * <p>
+ * 角色与系统服务与URL资源关联表 服务类
+ * </p>
+ */
+public interface RoleSoftwareResourceService extends IService<RoleSoftwareResource> {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/RoleSoftwareService.java

@@ -0,0 +1,13 @@
+package com.lantone.dblayermbg.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.lantone.dblayermbg.entity.RoleSoftware;
+
+/**
+ * <p>
+ * 角色与系统服务关联表 服务类
+ * </p>
+ */
+public interface RoleSoftwareService extends IService<RoleSoftware> {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/ServiceDataAuthService.java

@@ -1,13 +0,0 @@
-package com.lantone.dblayermbg.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.lantone.dblayermbg.entity.ServiceDataAuth;
-
-/**
- * <p>
- * 系统与数据权限信息关联表 服务类
- * </p>
- */
-public interface ServiceDataAuthService extends IService<ServiceDataAuth> {
-
-}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/ServiceMenuService.java

@@ -1,13 +0,0 @@
-package com.lantone.dblayermbg.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.lantone.dblayermbg.entity.ServiceMenu;
-
-/**
- * <p>
- * 角色服务菜单功能关联表 服务类
- * </p>
- */
-public interface ServiceMenuService extends IService<ServiceMenu> {
-
-}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/ServiceResourceService.java

@@ -1,13 +0,0 @@
-package com.lantone.dblayermbg.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.lantone.dblayermbg.entity.ServiceResource;
-
-/**
- * <p>
- * 角色系统资源关联表 服务类
- * </p>
- */
-public interface ServiceResourceService extends IService<ServiceResource> {
-
-}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/SoftwareDataAuthService.java

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

dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/SoftwareMenuService.java

@@ -0,0 +1,13 @@
+package com.lantone.dblayermbg.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.lantone.dblayermbg.entity.SoftwareMenu;
+
+/**
+ * <p>
+ * 系统服务功能菜单关联表 服务类
+ * </p>
+ */
+public interface SoftwareMenuService extends IService<SoftwareMenu> {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/SoftwareResourceService.java

@@ -0,0 +1,13 @@
+package com.lantone.dblayermbg.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.lantone.dblayermbg.entity.SoftwareResource;
+
+/**
+ * <p>
+ * 系统服务与URL资源关联表 服务类
+ * </p>
+ */
+public interface SoftwareResourceService extends IService<SoftwareResource> {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/SoftwareService.java

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

dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/impl/RoleServiceDataAuthServiceImpl.java

@@ -1,17 +0,0 @@
-package com.lantone.dblayermbg.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.lantone.dblayermbg.entity.RoleServiceDataAuth;
-import com.lantone.dblayermbg.mapper.RoleServiceDataAuthMapper;
-import com.lantone.dblayermbg.service.RoleServiceDataAuthService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 角色系统数据权限关联表 服务实现类
- * </p>
- */
-@Service
-public class RoleServiceDataAuthServiceImpl extends ServiceImpl<RoleServiceDataAuthMapper, RoleServiceDataAuth> implements RoleServiceDataAuthService {
-
-}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/impl/RoleServiceMenuServiceImpl.java

@@ -1,17 +0,0 @@
-package com.lantone.dblayermbg.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.lantone.dblayermbg.entity.RoleServiceMenu;
-import com.lantone.dblayermbg.mapper.RoleServiceMenuMapper;
-import com.lantone.dblayermbg.service.RoleServiceMenuService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 角色系统功能菜单关联表 服务实现类
- * </p>
- */
-@Service
-public class RoleServiceMenuServiceImpl extends ServiceImpl<RoleServiceMenuMapper, RoleServiceMenu> implements RoleServiceMenuService {
-
-}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/impl/RoleServiceResourceServiceImpl.java

@@ -1,17 +0,0 @@
-package com.lantone.dblayermbg.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.lantone.dblayermbg.entity.RoleServiceResource;
-import com.lantone.dblayermbg.mapper.RoleServiceResourceMapper;
-import com.lantone.dblayermbg.service.RoleServiceResourceService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 角色系统资源关联表 服务实现类
- * </p>
- */
-@Service
-public class RoleServiceResourceServiceImpl extends ServiceImpl<RoleServiceResourceMapper, RoleServiceResource> implements RoleServiceResourceService {
-
-}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/impl/RoleServiceServiceImpl.java

@@ -1,17 +0,0 @@
-package com.lantone.dblayermbg.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.lantone.dblayermbg.entity.RoleService;
-import com.lantone.dblayermbg.mapper.RoleServiceMapper;
-import com.lantone.dblayermbg.service.RoleServiceService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 组织角色与系统关联表 服务实现类
- * </p>
- */
-@Service
-public class RoleServiceServiceImpl extends ServiceImpl<RoleServiceMapper, RoleService> implements RoleServiceService {
-
-}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/impl/RoleSoftwareDataAuthServiceImpl.java

@@ -0,0 +1,17 @@
+package com.lantone.dblayermbg.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.lantone.dblayermbg.entity.RoleSoftwareDataAuth;
+import com.lantone.dblayermbg.mapper.RoleSoftwareDataAuthMapper;
+import com.lantone.dblayermbg.service.RoleSoftwareDataAuthService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 角色与系统服务与数据权限关联表 服务实现类
+ * </p>
+ */
+@Service
+public class RoleSoftwareDataAuthServiceImpl extends ServiceImpl<RoleSoftwareDataAuthMapper, RoleSoftwareDataAuth> implements RoleSoftwareDataAuthService {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/impl/RoleSoftwareMenuServiceImpl.java

@@ -0,0 +1,17 @@
+package com.lantone.dblayermbg.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.lantone.dblayermbg.entity.RoleSoftwareMenu;
+import com.lantone.dblayermbg.mapper.RoleSoftwareMenuMapper;
+import com.lantone.dblayermbg.service.RoleSoftwareMenuService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 角色与系统服务与功能菜单关联表 服务实现类
+ * </p>
+ */
+@Service
+public class RoleSoftwareMenuServiceImpl extends ServiceImpl<RoleSoftwareMenuMapper, RoleSoftwareMenu> implements RoleSoftwareMenuService {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/impl/RoleSoftwareResourceServiceImpl.java

@@ -0,0 +1,17 @@
+package com.lantone.dblayermbg.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.lantone.dblayermbg.entity.RoleSoftwareResource;
+import com.lantone.dblayermbg.mapper.RoleSoftwareResourceMapper;
+import com.lantone.dblayermbg.service.RoleSoftwareResourceService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 角色与系统服务与URL资源关联表 服务实现类
+ * </p>
+ */
+@Service
+public class RoleSoftwareResourceServiceImpl extends ServiceImpl<RoleSoftwareResourceMapper, RoleSoftwareResource> implements RoleSoftwareResourceService {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/impl/RoleSoftwareServiceImpl.java

@@ -0,0 +1,17 @@
+package com.lantone.dblayermbg.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.lantone.dblayermbg.entity.RoleSoftware;
+import com.lantone.dblayermbg.mapper.RoleSoftwareMapper;
+import com.lantone.dblayermbg.service.RoleSoftwareService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 角色与系统服务关联表 服务实现类
+ * </p>
+ */
+@Service
+public class RoleSoftwareServiceImpl extends ServiceImpl<RoleSoftwareMapper, RoleSoftware> implements RoleSoftwareService {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/impl/ServiceDataAuthServiceImpl.java

@@ -1,17 +0,0 @@
-package com.lantone.dblayermbg.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.lantone.dblayermbg.entity.ServiceDataAuth;
-import com.lantone.dblayermbg.mapper.ServiceDataAuthMapper;
-import com.lantone.dblayermbg.service.ServiceDataAuthService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 系统与数据权限信息关联表 服务实现类
- * </p>
- */
-@Service
-public class ServiceDataAuthServiceImpl extends ServiceImpl<ServiceDataAuthMapper, ServiceDataAuth> implements ServiceDataAuthService {
-
-}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/impl/ServiceMenuServiceImpl.java

@@ -1,17 +0,0 @@
-package com.lantone.dblayermbg.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.lantone.dblayermbg.entity.ServiceMenu;
-import com.lantone.dblayermbg.mapper.ServiceMenuMapper;
-import com.lantone.dblayermbg.service.ServiceMenuService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 角色服务菜单功能关联表 服务实现类
- * </p>
- */
-@Service
-public class ServiceMenuServiceImpl extends ServiceImpl<ServiceMenuMapper, ServiceMenu> implements ServiceMenuService {
-
-}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/impl/ServiceResourceServiceImpl.java

@@ -1,17 +0,0 @@
-package com.lantone.dblayermbg.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.lantone.dblayermbg.entity.ServiceResource;
-import com.lantone.dblayermbg.mapper.ServiceResourceMapper;
-import com.lantone.dblayermbg.service.ServiceResourceService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 角色系统资源关联表 服务实现类
- * </p>
- */
-@Service
-public class ServiceResourceServiceImpl extends ServiceImpl<ServiceResourceMapper, ServiceResource> implements ServiceResourceService {
-
-}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/impl/SoftwareDataAuthServiceImpl.java

@@ -0,0 +1,17 @@
+package com.lantone.dblayermbg.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.lantone.dblayermbg.entity.SoftwareDataAuth;
+import com.lantone.dblayermbg.mapper.SoftwareDataAuthMapper;
+import com.lantone.dblayermbg.service.SoftwareDataAuthService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 系统服务与数据权限关联表 服务实现类
+ * </p>
+ */
+@Service
+public class SoftwareDataAuthServiceImpl extends ServiceImpl<SoftwareDataAuthMapper, SoftwareDataAuth> implements SoftwareDataAuthService {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/impl/SoftwareMenuServiceImpl.java

@@ -0,0 +1,17 @@
+package com.lantone.dblayermbg.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.lantone.dblayermbg.entity.SoftwareMenu;
+import com.lantone.dblayermbg.mapper.SoftwareMenuMapper;
+import com.lantone.dblayermbg.service.SoftwareMenuService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 系统服务功能菜单关联表 服务实现类
+ * </p>
+ */
+@Service
+public class SoftwareMenuServiceImpl extends ServiceImpl<SoftwareMenuMapper, SoftwareMenu> implements SoftwareMenuService {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/impl/SoftwareResourceServiceImpl.java

@@ -0,0 +1,17 @@
+package com.lantone.dblayermbg.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.lantone.dblayermbg.entity.SoftwareResource;
+import com.lantone.dblayermbg.mapper.SoftwareResourceMapper;
+import com.lantone.dblayermbg.service.SoftwareResourceService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 系统服务与URL资源关联表 服务实现类
+ * </p>
+ */
+@Service
+public class SoftwareResourceServiceImpl extends ServiceImpl<SoftwareResourceMapper, SoftwareResource> implements SoftwareResourceService {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/impl/SoftwareServiceImpl.java

@@ -0,0 +1,17 @@
+package com.lantone.dblayermbg.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.lantone.dblayermbg.entity.Software;
+import com.lantone.dblayermbg.mapper.SoftwareMapper;
+import com.lantone.dblayermbg.service.SoftwareService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 系统服务表 服务实现类
+ * </p>
+ */
+@Service
+public class SoftwareServiceImpl extends ServiceImpl<SoftwareMapper, Software> implements SoftwareService {
+
+}

dblayer-mbg/src/main/resources/mapper/DataAuthMapper.xml

@@ -1,48 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.lantone.dblayermbg.mapper.DataAuthMapper">
-    <select id="getDataAuthById" resultType="com.lantone.common.dto.ServiceRoleDataAuthDetailDTO">
+    <select id="getDataAuthById" resultType="com.lantone.common.dto.SoftwareRoleDataAuthDetailDTO">
         SELECT
-        rsd.id serviceRoleDataAuthDetailId,
-        sd.id serviceDataAuthId,
-        sd.service_id serviceId,
-        s.`name` serviceName,
+        rsd.id softwareRoleDataAuthDetailId,
+        sd.id softwareDataAuthId,
+        sd.software_id softwareId,
+        s.`name` softwareName,
         r.id roleId,
         r.`name` roleName,
         sd.data_auth_id dataAuthId,
-        d.auth_name dataAuthName,
+        d.name dataAuthName,
         d.`status`
         FROM
         sys_role r,
-        sys_service s,
-        sys_role_service_data_auth rsd,
+        sys_software s,
+        sys_role_software_data_auth rsd,
         sys_data_auth d,
-        sys_service_data_auth sd
+        sys_software_data_auth sd
         WHERE
         r.id = rsd.role_id
         AND r.`status` = '1'
         AND d.`status` = '1'
-        AND s.id = sd.service_id
-        AND rsd.service_data_auth_id = sd.id
+        AND s.id = sd.software_id
+        AND rsd.software_data_auth_id = sd.id
         AND sd.data_auth_id = d.id
         AND r.is_deleted = 'N'
         AND s.is_deleted = 'N'
         AND rsd.is_deleted = 'N'
         AND d.is_deleted = 'N'
         AND sd.is_deleted = 'N'
-        <if test="serviceDataAuthVO.roles !=null and serviceDataAuthVO.roles.size!=0">
+        <if test="softwareDataAuthVO.roles !=null and softwareDataAuthVO.roles.size!=0">
             AND rsd.role_id in
-            <foreach collection="serviceDataAuthVO.roles" item="role" open="(" close=")" separator=",">
+            <foreach collection="softwareDataAuthVO.roles" item="role" open="(" close=")" separator=",">
                 #{role.id}
             </foreach>
         </if>
-        <if test="serviceDataAuthVO.dataAuthVO.id != null ">
-            AND d.id = #{serviceDataAuthVO.dataAuthVO.id}
+        <if test="softwareDataAuthVO.dataAuthVO.id != null ">
+            AND d.id = #{softwareDataAuthVO.dataAuthVO.id}
         </if>
     </select>
 
 
-    <select id="getOneServiceRoleDataAuthDetail" resultType="com.lantone.common.dto.ServiceRoleDataAuthDetailDTO">
+    <select id="getOneSoftwareRoleDataAuthDetail" resultType="com.lantone.common.dto.SoftwareRoleDataAuthDetailDTO">
         SELECT DISTINCT
         detail.id detail,
         detail.data_type dataType,
@@ -50,46 +50,46 @@
         detail.detail_id detailId
         FROM
         sys_role r,
-        sys_service s,
-        sys_role_service_data_auth rsd,
+        sys_software s,
+        sys_role_software_data_auth rsd,
         sys_data_auth d,
-        sys_service_data_auth sd
-        LEFT JOIN sys_data_auth_detail detail ON sd.id = detail.service_data_auth_id
+        sys_software_data_auth sd
+        LEFT JOIN sys_data_auth_detail detail ON sd.id = detail.software_data_auth_id
         WHERE
         r.id = rsd.role_id
         AND r.`status` = '1'
         AND d.`status` = '1'
-        AND s.id = sd.service_id
-        AND rsd.service_data_auth_id = sd.id
+        AND s.id = sd.software_id
+        AND rsd.software_data_auth_id = sd.id
         AND sd.data_auth_id = d.id
         AND r.is_deleted = 'N'
         AND s.is_deleted = 'N'
         AND rsd.is_deleted = 'N'
         AND d.is_deleted = 'N'
         AND sd.is_deleted = 'N'
-        <if test="serviceID != null ">
+        <if test="softwareID != null ">
             AND d.id = #{dataDetailID}
         </if>
         <if test="dataDetailID != null ">
-            AND s.id = #{serviceID}
+            AND s.id = #{softwareID}
         </if>
     </select>
     <select id="getDataAuthPage" resultType="com.lantone.common.dto.DataAuthDTO">
         SELECT DISTINCT
         auth.id,
-        auth.auth_name,
+        auth.name,
         r.id roleId,
         r.`name` roleName,
         auth.`status`
         FROM
         sys_role r,
         sys_data_auth auth,
-        sys_role_service_data_auth rauth,
-        sys_service_data_auth sauth
+        sys_role_software_data_auth rauth,
+        sys_software_data_auth sauth
         WHERE
         r.id = rauth.role_id
         AND sauth.data_auth_id = auth.id
-        AND sauth.id = rauth.service_data_auth_id
+        AND sauth.id = rauth.software_data_auth_id
         AND r.is_deleted = 'N'
         AND auth.is_deleted = 'N'
         AND rauth.is_deleted = 'N'
@@ -103,8 +103,8 @@
                 #{id}
             </foreach>
         </if>
-        <if test="dataAuthVO.authName!=null and dataAuthVO.authName!=''">
-            AND auth.auth_name LIKE concat('%',#{dataAuthVO.authName},'%')
+        <if test="dataAuthVO.name!=null and dataAuthVO.name!=''">
+            AND auth.name LIKE concat('%',#{dataAuthVO.name},'%')
         </if>
     </select>
 </mapper>

dblayer-mbg/src/main/resources/mapper/DoctorMapper.xml

@@ -29,8 +29,7 @@
         AND detail.detail_id = doc.id
         AND detail.is_deleted = 'N'
         WHERE
-        h.id = dd.hospital_id
-        AND dept.id = dd.dept_id
+            dept.id = dd.dept_id
         AND doc.id = dd.doctor_id
         AND h.is_deleted = 'N'
         AND dept.is_deleted = 'N'

dblayer-mbg/src/main/resources/mapper/RoleServiceMenuMapper.xml

@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.lantone.dblayermbg.mapper.RoleServiceMenuMapper">
-
-    <select id="getMenus" resultType="com.lantone.common.dto.MenuDTO">
-        SELECT
-         m.id,
-         m.`name`,
-         m.parent_id,
-         m.`describe`,
-         m.`status`,
-         m.order_no,
-         m.remark,
-         m.type,
-         m.url url,
-         r.id resourceId,
-         r.url permission
-        FROM
-            sys_service_menu sm,
-            sys_role_service_menu rsm,
-            sys_menu m
-        LEFT JOIN sys_menu_resource mr ON m.id = mr.menu_id
-        AND mr.is_deleted = 'N'
-        LEFT JOIN sys_resource r ON mr.resource_id = r.id
-        AND r.is_deleted = 'N'
-        WHERE m.id = sm.menu_id
-        AND sm.id = rsm.service_menu_id
-        <if test="roleServiceMenuVo.serviceId != null and roleServiceMenuVo.serviceId !=''">
-            AND sm.service_id = #{roleServiceMenuVo.serviceId}
-        </if>
-        <if test="roleServiceMenuVo.roles !=null and roleServiceMenuVo.roles.size!=0">
-            AND rsm.role_id IN
-            <foreach collection="roleServiceMenuVo.roles" item="id" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
-        </if>
-        AND m.is_deleted = 'N'
-        ORDER BY
-        m.gmt_create,
-        m.order_no DESC
-    </select>
-
-</mapper>

dblayer-mbg/src/main/resources/mapper/RoleServiceResourceMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.lantone.dblayermbg.mapper.RoleServiceResourceMapper">
+<mapper namespace="com.lantone.dblayermbg.mapper.RoleSoftwareDataAuthMapper">
 
 </mapper>

dblayer-mbg/src/main/resources/mapper/RoleServiceMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.lantone.dblayermbg.mapper.RoleServiceMapper">
+<mapper namespace="com.lantone.dblayermbg.mapper.RoleSoftwareMapper">
 
 </mapper>

dblayer-mbg/src/main/resources/mapper/RoleSoftwareMenuMapper.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lantone.dblayermbg.mapper.RoleSoftwareMenuMapper">
+    <select id="getMenus" resultType="com.lantone.common.dto.MenuDTO">
+        SELECT
+        m.id,
+        m.`name`,
+        m.parent_id,
+        m.`menu_describe`,
+        m.`status`,
+        m.order_no,
+        m.remark,
+        m.type,
+        m.url url,
+        r.id resourceId,
+        r.url permission
+        FROM
+        sys_software_menu sm,
+        sys_role_software_menu rsm,
+        sys_menu m
+        LEFT JOIN sys_menu_resource mr ON m.id = mr.menu_id
+        AND mr.is_deleted = 'N'
+        LEFT JOIN sys_resource r ON mr.resource_id = r.id
+        AND r.is_deleted = 'N'
+        WHERE m.id = sm.menu_id
+        AND sm.id = rsm.software_menu_id
+        <if test="roleSoftwareMenuVo.softwareId != null and roleSoftwareMenuVo.softwareId !=''">
+            AND sm.software_id = #{rolesoftwareMenuVo.softwareId}
+        </if>
+        <if test="roleSoftwareMenuVo.roles !=null and roleSoftwareMenuVo.roles.size!=0">
+            AND rsm.role_id IN
+            <foreach collection="roleSoftwareMenuVo.roles" item="id" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        AND m.is_deleted = 'N'
+        ORDER BY
+        m.gmt_create,
+        m.order_no DESC
+    </select>
+</mapper>

dblayer-mbg/src/main/resources/mapper/RoleServiceDataAuthMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.lantone.dblayermbg.mapper.RoleServiceDataAuthMapper">
+<mapper namespace="com.lantone.dblayermbg.mapper.RoleSoftwareResourceMapper">
 
 </mapper>

dblayer-mbg/src/main/resources/mapper/ServiceDataAuthMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.lantone.dblayermbg.mapper.ServiceDataAuthMapper">
+<mapper namespace="com.lantone.dblayermbg.mapper.SoftwareDataAuthMapper">
 
 </mapper>

dblayer-mbg/src/main/resources/mapper/ServiceMenuMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.lantone.dblayermbg.mapper.ServiceMenuMapper">
+<mapper namespace="com.lantone.dblayermbg.mapper.SoftwareMapper">
 
 </mapper>

dblayer-mbg/src/main/resources/mapper/ServiceResourceMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.lantone.dblayermbg.mapper.ServiceResourceMapper">
+<mapper namespace="com.lantone.dblayermbg.mapper.SoftwareMenuMapper">
 
 </mapper>

dblayer-mbg/src/main/resources/mapper/SoftwareResourceMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lantone.dblayermbg.mapper.SoftwareResourceMapper">
+
+</mapper>

dblayer-mbg/src/main/resources/mapper/base/BaseDataAuthDetailMapper.xml

@@ -5,7 +5,7 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.lantone.dblayermbg.entity.DataAuthDetail">
         <id column="id" property="id"/>
-        <result column="service_data_auth_id" property="serviceDataAuthId"/>
+        <result column="software_data_auth_id" property="softwareDataAuthId"/>
         <result column="data_type" property="dataType"/>
         <result column="detail_type" property="detailType"/>
         <result column="detail_id" property="detailId"/>

dblayer-mbg/src/main/resources/mapper/base/BaseDataAuthMapper.xml

@@ -5,10 +5,9 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.lantone.dblayermbg.entity.DataAuth">
         <id column="id" property="id"/>
-        <result column="auth_name" property="authName"/>
+        <result column="name" property="name"/>
         <result column="status" property="status"/>
         <result column="order_no" property="orderNo"/>
-        <result column="hospital_id" property="hospitalId"/>
         <result column="is_deleted" property="isDeleted"/>
         <result column="gmt_create" property="gmtCreate"/>
         <result column="gmt_modified" property="gmtModified"/>

dblayer-mbg/src/main/resources/mapper/base/BaseDeptDoctorMapper.xml

@@ -5,7 +5,6 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.lantone.dblayermbg.entity.DeptDoctor">
         <id column="id" property="id"/>
-        <result column="hospital_id" property="hospitalId"/>
         <result column="dept_id" property="deptId"/>
         <result column="doctor_id" property="doctorId"/>
         <result column="order_no" property="orderNo"/>

dblayer-mbg/src/main/resources/mapper/base/BaseRoleServiceMapper.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.lantone.dblayermbg.mapper.RoleServiceMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.lantone.dblayermbg.entity.RoleService">
-        <id column="id" property="id"/>
-        <result column="role_id" property="roleId"/>
-        <result column="service_id" property="serviceId"/>
-        <result column="order_no" property="orderNo"/>
-        <result column="creator" property="creator"/>
-        <result column="create_time" property="createTime"/>
-        <result column="is_deleted" property="isDeleted"/>
-    </resultMap>
-
-</mapper>

dblayer-mbg/src/main/resources/mapper/base/BaseRoleSoftwareDataAuthMapper.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lantone.dblayermbg.mapper.RoleSoftwareDataAuthMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.lantone.dblayermbg.entity.RoleSoftwareDataAuth">
+        <id column="id" property="id"/>
+        <result column="role_id" property="roleId"/>
+        <result column="software_data_auth_id" property="softwareDataAuthId"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="creator" property="creator"/>
+        <result column="modifier" property="modifier"/>
+        <result column="remark" property="remark"/>
+    </resultMap>
+
+</mapper>

dblayer-mbg/src/main/resources/mapper/base/BaseRoleServiceMenuMapper.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.lantone.dblayermbg.mapper.RoleServiceMenuMapper">
+<mapper namespace="com.lantone.dblayermbg.mapper.RoleSoftwareMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.lantone.dblayermbg.entity.RoleServiceMenu">
+    <resultMap id="BaseResultMap" type="com.lantone.dblayermbg.entity.RoleSoftware">
         <id column="id" property="id"/>
         <result column="role_id" property="roleId"/>
-        <result column="service_menu_id" property="serviceMenuId"/>
+        <result column="software_id" property="softwareId"/>
         <result column="is_deleted" property="isDeleted"/>
         <result column="gmt_create" property="gmtCreate"/>
         <result column="gmt_modified" property="gmtModified"/>

dblayer-mbg/src/main/resources/mapper/base/BaseRoleServiceResourceMapper.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.lantone.dblayermbg.mapper.RoleServiceResourceMapper">
+<mapper namespace="com.lantone.dblayermbg.mapper.RoleSoftwareMenuMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.lantone.dblayermbg.entity.RoleServiceResource">
+    <resultMap id="BaseResultMap" type="com.lantone.dblayermbg.entity.RoleSoftwareMenu">
         <id column="id" property="id"/>
         <result column="role_id" property="roleId"/>
-        <result column="service_resource_id" property="serviceResourceId"/>
+        <result column="software_menu_id" property="softwareMenuId"/>
         <result column="is_deleted" property="isDeleted"/>
         <result column="gmt_create" property="gmtCreate"/>
         <result column="gmt_modified" property="gmtModified"/>

dblayer-mbg/src/main/resources/mapper/base/BaseRoleServiceDataAuthMapper.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.lantone.dblayermbg.mapper.RoleServiceDataAuthMapper">
+<mapper namespace="com.lantone.dblayermbg.mapper.RoleSoftwareResourceMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.lantone.dblayermbg.entity.RoleServiceDataAuth">
+    <resultMap id="BaseResultMap" type="com.lantone.dblayermbg.entity.RoleSoftwareResource">
         <id column="id" property="id"/>
         <result column="role_id" property="roleId"/>
-        <result column="service_data_auth_id" property="serviceDataAuthId"/>
+        <result column="software_resource_id" property="softwareResourceId"/>
         <result column="is_deleted" property="isDeleted"/>
         <result column="gmt_create" property="gmtCreate"/>
         <result column="gmt_modified" property="gmtModified"/>

dblayer-mbg/src/main/resources/mapper/base/BaseServiceDataAuthMapper.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.lantone.dblayermbg.mapper.ServiceDataAuthMapper">
+<mapper namespace="com.lantone.dblayermbg.mapper.SoftwareDataAuthMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.lantone.dblayermbg.entity.ServiceDataAuth">
+    <resultMap id="BaseResultMap" type="com.lantone.dblayermbg.entity.SoftwareDataAuth">
         <id column="id" property="id"/>
-        <result column="service_id" property="serviceId"/>
+        <result column="software_id" property="softwareId"/>
         <result column="data_auth_id" property="dataAuthId"/>
         <result column="is_deleted" property="isDeleted"/>
         <result column="gmt_create" property="gmtCreate"/>

dblayer-mbg/src/main/resources/mapper/base/BaseSoftwareMapper.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lantone.dblayermbg.mapper.SoftwareMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.lantone.dblayermbg.entity.Software">
+        <id column="id" property="id"/>
+        <result column="name" property="name"/>
+        <result column="order_no" property="orderNo"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="creator" property="creator"/>
+        <result column="modifier" property="modifier"/>
+        <result column="remark" property="remark"/>
+    </resultMap>
+
+</mapper>

dblayer-mbg/src/main/resources/mapper/base/BaseServiceMenuMapper.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.lantone.dblayermbg.mapper.ServiceMenuMapper">
+<mapper namespace="com.lantone.dblayermbg.mapper.SoftwareMenuMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.lantone.dblayermbg.entity.ServiceMenu">
+    <resultMap id="BaseResultMap" type="com.lantone.dblayermbg.entity.SoftwareMenu">
         <id column="id" property="id"/>
-        <result column="service_id" property="serviceId"/>
+        <result column="software_id" property="softwareId"/>
         <result column="menu_id" property="menuId"/>
         <result column="order_no" property="orderNo"/>
         <result column="is_deleted" property="isDeleted"/>