Merge remote-tracking branch 'origin/feature/REQ-1204' into feature/REQ-1204
# Conflicts: # tyr-api/pom.xml
This commit is contained in:
commit
8f1d1d90d4
@ -22,5 +22,9 @@
|
||||
<groupId>cn.axzo.framework</groupId>
|
||||
<artifactId>axzo-core</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>cn.axzo.basics</groupId>
|
||||
<artifactId>basics-common</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
|
||||
@ -0,0 +1,44 @@
|
||||
package cn.axzo.tyr.client.feign;
|
||||
|
||||
import cn.axzo.framework.domain.web.result.ApiPageResult;
|
||||
import cn.axzo.framework.domain.web.result.ApiResult;
|
||||
import cn.axzo.tyr.client.model.req.QuerySaasPermissionGroupReq;
|
||||
import cn.axzo.tyr.client.model.vo.SaasPermissionGroupVO;
|
||||
import org.springframework.cloud.openfeign.FeignClient;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
|
||||
/**
|
||||
* 权限集
|
||||
*/
|
||||
@FeignClient(name = "tyr", url = "${axzo.service.maokai:http://tyr:8080/api/saasPermissionGoup}")
|
||||
public interface SaasPermissionGroupApi {
|
||||
|
||||
/**
|
||||
* 保存/更新
|
||||
*/
|
||||
@PostMapping("saveOrUpdate")
|
||||
ApiResult<Void> saveOrUpdate(@RequestBody SaasPermissionGroupVO req);
|
||||
|
||||
/**
|
||||
* 根据id查询详情
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
@PostMapping("getById")
|
||||
ApiResult<SaasPermissionGroupVO> getById(@RequestParam("id") Long id);
|
||||
|
||||
/**
|
||||
* 查询
|
||||
*/
|
||||
@PostMapping("query")
|
||||
ApiPageResult<SaasPermissionGroupVO> query(@RequestBody QuerySaasPermissionGroupReq req);
|
||||
|
||||
/**
|
||||
* 删除
|
||||
*/
|
||||
@PostMapping("delete")
|
||||
ApiResult<Void> delete(@RequestParam(required = true) Long id);
|
||||
|
||||
}
|
||||
@ -0,0 +1,23 @@
|
||||
package cn.axzo.tyr.client.feign;
|
||||
|
||||
import cn.axzo.framework.domain.web.result.ApiResult;
|
||||
import org.springframework.cloud.openfeign.FeignClient;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
|
||||
/**
|
||||
* 权限集作用范围
|
||||
*/
|
||||
@FeignClient(name = "tyr", url = "${axzo.service.maokai:http://tyr:8080/api/saasPermissionGroup}")
|
||||
public interface SaasPermissionGroupScopeApi {
|
||||
|
||||
/**
|
||||
* 删除单位联系人
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
@PostMapping("api/organizational/unit/contact/delete")
|
||||
ApiResult<Void> deleteUnitContact(@RequestParam("id") Long id);
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,44 @@
|
||||
package cn.axzo.tyr.client.feign;
|
||||
|
||||
import cn.axzo.framework.domain.web.result.ApiListResult;
|
||||
import cn.axzo.framework.domain.web.result.ApiResult;
|
||||
import cn.axzo.tyr.client.model.req.QuerySaasRoleReq;
|
||||
import cn.axzo.tyr.client.model.vo.SaasRoleVO;
|
||||
import org.springframework.cloud.openfeign.FeignClient;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
|
||||
/**
|
||||
* 角色
|
||||
*/
|
||||
@FeignClient(name = "tyr", url = "${axzo.service.maokai:http://tyr:8080/api/saasRole}")
|
||||
public interface SaasRoleApi {
|
||||
|
||||
/**
|
||||
* 保存/更新
|
||||
* 标准角worksaceId ouId = -1,自定义跟随自定义分组赋值
|
||||
* 如果权限列表不为空则创建通用权限
|
||||
*/
|
||||
@PostMapping("saveOrUpdate")
|
||||
ApiResult<Void> saveOrUpdate(@RequestBody SaasRoleVO req);
|
||||
|
||||
/**
|
||||
* 根据id查询详情
|
||||
*/
|
||||
@PostMapping("getById")
|
||||
ApiResult<SaasRoleVO> getById(@RequestParam(required = true) Long id);
|
||||
|
||||
/**
|
||||
* 获取角色列表
|
||||
*/
|
||||
@PostMapping("query")
|
||||
ApiListResult<SaasRoleVO> query(@RequestBody QuerySaasRoleReq req);
|
||||
|
||||
/**
|
||||
* 删除
|
||||
*/
|
||||
@PostMapping("delete")
|
||||
ApiResult<Void> delete(@RequestParam(required = true) Long id);
|
||||
|
||||
}
|
||||
@ -0,0 +1,39 @@
|
||||
package cn.axzo.tyr.client.feign;
|
||||
|
||||
import cn.axzo.framework.domain.web.result.ApiListResult;
|
||||
import cn.axzo.framework.domain.web.result.ApiResult;
|
||||
import cn.axzo.tyr.client.model.vo.SaasRoleGroupVO;
|
||||
import cn.axzo.tyr.client.model.req.QuerySaasRoleGroupReq;
|
||||
import org.springframework.cloud.openfeign.FeignClient;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
|
||||
/**
|
||||
* 角色分组
|
||||
*/
|
||||
@FeignClient(name = "tyr", url = "${axzo.service.maokai:http://tyr:8080/api/saasRoleGroup}")
|
||||
public interface SaasRoleGoupApi {
|
||||
|
||||
/**
|
||||
* 保存/更新
|
||||
* @return
|
||||
*/
|
||||
@PostMapping("save")
|
||||
ApiResult<Void> saveOrUpdate(@RequestBody SaasRoleGroupVO req);
|
||||
|
||||
/**
|
||||
* 获取权限分组列表
|
||||
* @return
|
||||
*/
|
||||
@PostMapping("getList")
|
||||
ApiListResult<SaasRoleGroupVO> getList(@RequestBody QuerySaasRoleGroupReq req);
|
||||
|
||||
/**
|
||||
* 删除分组
|
||||
*/
|
||||
@PostMapping("delete")
|
||||
ApiResult<Void> delete(@RequestParam(required = true) Long id);
|
||||
|
||||
|
||||
}
|
||||
@ -1,29 +0,0 @@
|
||||
package cn.axzo.tyr.client.model;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
import javax.validation.constraints.NotNull;
|
||||
|
||||
/**
|
||||
* @Author: liyong.tian
|
||||
* @Date: 2022/9/2
|
||||
* @Description:
|
||||
*/
|
||||
@Data
|
||||
public class NewUserReq {
|
||||
|
||||
@NotBlank(message = "名称不能为空")
|
||||
private String name;
|
||||
|
||||
@NotNull
|
||||
private Integer sex;
|
||||
|
||||
private Integer age;
|
||||
|
||||
private String phone;
|
||||
|
||||
private String email;
|
||||
|
||||
private String address;
|
||||
}
|
||||
@ -1,22 +0,0 @@
|
||||
package cn.axzo.tyr.client.model;
|
||||
|
||||
import cn.axzo.framework.context.client.IQueryMap;
|
||||
import cn.axzo.framework.context.client.QueryMap;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class QueryUserReq implements IQueryMap {
|
||||
|
||||
private Long id;
|
||||
|
||||
private String name;
|
||||
|
||||
private String phone;
|
||||
|
||||
private String email;
|
||||
|
||||
@Override
|
||||
public void append(QueryMap.Builder builder) {
|
||||
builder.put("id", id).put("name", name).put("phone", phone).put("email", email);
|
||||
}
|
||||
}
|
||||
@ -1,19 +0,0 @@
|
||||
package cn.axzo.tyr.client.model;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class UpdateUserReq {
|
||||
|
||||
private String name;
|
||||
|
||||
private Integer sex;
|
||||
|
||||
private Integer age;
|
||||
|
||||
private String phone;
|
||||
|
||||
private String email;
|
||||
|
||||
private String address;
|
||||
}
|
||||
@ -1,21 +0,0 @@
|
||||
package cn.axzo.tyr.client.model;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class UserRes {
|
||||
|
||||
private Long id;
|
||||
|
||||
private String name;
|
||||
|
||||
private Integer sex;
|
||||
|
||||
private Integer age;
|
||||
|
||||
private String phone;
|
||||
|
||||
private String email;
|
||||
|
||||
private String address;
|
||||
}
|
||||
@ -0,0 +1,43 @@
|
||||
package cn.axzo.tyr.client.model.req;
|
||||
|
||||
|
||||
import cn.axzo.basics.common.page.PageRequest;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
public class QuerySaasPermissionGroupReq extends PageRequest {
|
||||
|
||||
private List<Long> ids;
|
||||
|
||||
/**
|
||||
* 权限集名称
|
||||
*/
|
||||
private String name;
|
||||
/**
|
||||
* 创建者
|
||||
*/
|
||||
private Long createBy;
|
||||
/**
|
||||
* 更新者
|
||||
*/
|
||||
private Long updateBy;
|
||||
|
||||
/**
|
||||
* 工作台Id
|
||||
*/
|
||||
private Long customSpaceId;
|
||||
|
||||
/**
|
||||
* 单位ID
|
||||
*/
|
||||
private Long ouId;
|
||||
|
||||
/**
|
||||
* 权限集类型:feature data
|
||||
*/
|
||||
private String type;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,38 @@
|
||||
package cn.axzo.tyr.client.model.req;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@Builder
|
||||
public class QuerySaasRoleGroupReq {
|
||||
|
||||
private List<Long> ids;
|
||||
|
||||
/**
|
||||
* 项目部id(不传或者传-1查询的是标准分组)
|
||||
*/
|
||||
private Long workspaceId;
|
||||
|
||||
/**
|
||||
* 单位id(不传或者传-1查询的是标准分组)
|
||||
*/
|
||||
private Long ouId;
|
||||
|
||||
/**
|
||||
* 系统域编码(不传所有)
|
||||
*/
|
||||
private List<String> topSysCode;
|
||||
|
||||
/**
|
||||
* 二级字典编码(不传查所有)
|
||||
*/
|
||||
private List<String> dictSysCode;
|
||||
|
||||
}
|
||||
@ -0,0 +1,57 @@
|
||||
package cn.axzo.tyr.client.model.req;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class QuerySaasRoleReq {
|
||||
|
||||
private List<Long> id;
|
||||
|
||||
/**
|
||||
* 角色名称
|
||||
*/
|
||||
private String name;
|
||||
|
||||
/**
|
||||
* 角色类型:common 普通角色 admin管理员
|
||||
*/
|
||||
private String roleType;
|
||||
|
||||
/**
|
||||
* 创建者
|
||||
*/
|
||||
private Long createBy;
|
||||
/**
|
||||
* 更新者
|
||||
*/
|
||||
private Long updateBy;
|
||||
|
||||
/**
|
||||
* 工作台Id
|
||||
*/
|
||||
private Long workspaceId;
|
||||
|
||||
/**
|
||||
* 角色owner单位Id 实际角色和用户的所属关系 具体查询relation的ouId
|
||||
*/
|
||||
private Long ownerOuId;
|
||||
|
||||
/**
|
||||
* 分组id
|
||||
*/
|
||||
private List<Long> sassRoleGroupIds;
|
||||
|
||||
/**
|
||||
* 权限组id
|
||||
*/
|
||||
private List<Long> saasPermissionGroupIds;
|
||||
|
||||
}
|
||||
@ -0,0 +1,52 @@
|
||||
package cn.axzo.tyr.client.model.vo;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@Builder
|
||||
public class SaasPermissionGroupVO {
|
||||
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 权限集名称
|
||||
*/
|
||||
private String name;
|
||||
|
||||
/**
|
||||
* 创建者
|
||||
*/
|
||||
private Long createBy;
|
||||
/**
|
||||
* 更新者
|
||||
*/
|
||||
private Long updateBy;
|
||||
|
||||
/**
|
||||
* 工作台Id
|
||||
*/
|
||||
private Long customSpaceId;
|
||||
|
||||
/**
|
||||
* 单位ID
|
||||
*/
|
||||
private Long ouId;
|
||||
|
||||
/**
|
||||
* 权限集类型:feature data
|
||||
*/
|
||||
private String type;
|
||||
|
||||
/**
|
||||
* 权限id
|
||||
*/
|
||||
private List<Long> featureIds;
|
||||
|
||||
}
|
||||
@ -0,0 +1,45 @@
|
||||
package cn.axzo.tyr.client.model.vo;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
@Data
|
||||
public class SaasRoleGroupVO {
|
||||
|
||||
private Long id;
|
||||
|
||||
private Date createAt;
|
||||
|
||||
private Date updateAt;
|
||||
|
||||
/**
|
||||
* 系统域编码
|
||||
*/
|
||||
private String topSysCode;
|
||||
|
||||
/**
|
||||
* 二级字典编码(单位类型)
|
||||
*/
|
||||
private String dictSysCode;
|
||||
|
||||
/**
|
||||
* 名称
|
||||
*/
|
||||
private String name;
|
||||
|
||||
/**
|
||||
* 项目部id
|
||||
*/
|
||||
private Long workspaceId;
|
||||
|
||||
/**
|
||||
* 单位id
|
||||
*/
|
||||
private Long ouId;
|
||||
|
||||
/**
|
||||
* 排序
|
||||
*/
|
||||
private Integer sort;
|
||||
}
|
||||
@ -0,0 +1,32 @@
|
||||
package cn.axzo.tyr.client.model.vo;
|
||||
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@Builder
|
||||
public class SaasRolePermissionScopeVO {
|
||||
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 选择类型: 1.正选 2.反选
|
||||
*/
|
||||
private Integer type;
|
||||
|
||||
/**
|
||||
* 作用范围类型: workspace ou
|
||||
*/
|
||||
private String scopeType;
|
||||
|
||||
/**
|
||||
* 作用范围id(workspace_id/ou_id)
|
||||
*/
|
||||
private Long scopeId;
|
||||
|
||||
}
|
||||
@ -0,0 +1,61 @@
|
||||
package cn.axzo.tyr.client.model.vo;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
public class SaasRoleVO {
|
||||
|
||||
private Long id;
|
||||
|
||||
private Date createAt;
|
||||
|
||||
private Date updateAt;
|
||||
|
||||
/**
|
||||
* 角色名称
|
||||
*/
|
||||
private String name;
|
||||
|
||||
/**
|
||||
* 角色类型:common 普通角色 admin管理员
|
||||
*/
|
||||
private String roleType;
|
||||
|
||||
/**
|
||||
* 创建者
|
||||
*/
|
||||
private Long createBy;
|
||||
/**
|
||||
* 更新者
|
||||
*/
|
||||
private Long updateBy;
|
||||
|
||||
/**
|
||||
* 工作台Id
|
||||
*/
|
||||
private Long workspaceId;
|
||||
|
||||
/**
|
||||
* 角色owner单位Id 实际角色和用户的所属关系 具体查询relation的ouId
|
||||
*/
|
||||
private Long ownerOuId;
|
||||
|
||||
/**
|
||||
* 分组id
|
||||
*/
|
||||
private List<Long> sassRoleGroupIds;
|
||||
|
||||
/**
|
||||
* 权限组id
|
||||
*/
|
||||
private List<Long> saasPermissionGroupIds;
|
||||
|
||||
/**
|
||||
* 权限id(用于创建权限集)
|
||||
*/
|
||||
private List<Long> featureIds;
|
||||
|
||||
}
|
||||
@ -56,5 +56,14 @@
|
||||
<groupId>cn.axzo.framework</groupId>
|
||||
<artifactId>axzo-logger-spring-boot-starter</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>cn.axzo.pokonyan</groupId>
|
||||
<artifactId>pokonyan</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>cn.axzo.basics</groupId>
|
||||
<artifactId>basics-common</artifactId>
|
||||
</dependency>
|
||||
|
||||
</dependencies>
|
||||
</project>
|
||||
|
||||
@ -0,0 +1,97 @@
|
||||
package cn.axzo.tyr.server.repository.entity;
|
||||
|
||||
import cn.axzo.pokonyan.config.mybatisplus.BaseEntity;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import lombok.ToString;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* 权限集(SaasPermissionGroup)表实体类
|
||||
*
|
||||
* @author makejava
|
||||
* @since 2022-05-24 11:18:41
|
||||
*/
|
||||
@Getter
|
||||
@Setter
|
||||
@ToString
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName("saas_permission_group")
|
||||
public class SaasPermissionGroup extends BaseEntity<SaasPermissionGroup> {
|
||||
|
||||
|
||||
/**
|
||||
* 权限集名称
|
||||
*/
|
||||
private String name;
|
||||
/**
|
||||
* 权限集描述
|
||||
*/
|
||||
private String description;
|
||||
|
||||
/**
|
||||
* 1:总包企业产品 2:总包项目产品 3:政企产品 4:分包企业产品 5:班组产品
|
||||
*/
|
||||
private Integer productType;
|
||||
|
||||
/**
|
||||
* 权限集类型 1查看 2操作管理
|
||||
*/
|
||||
private Integer legacyType;
|
||||
|
||||
/**
|
||||
* 创建者
|
||||
*/
|
||||
private Long createBy;
|
||||
/**
|
||||
* 更新者
|
||||
*/
|
||||
private Long updateBy;
|
||||
/**
|
||||
* 是否自定义 0:不是 1:是 如果为1 custom_space_id 不能为空
|
||||
*/
|
||||
private Integer isCustom;
|
||||
/**
|
||||
* 工作台Id
|
||||
*/
|
||||
private Long customSpaceId;
|
||||
|
||||
/**
|
||||
* 适用单位类型 1:总包 2:建设单位 3:监理单位 4:劳务分包 5:专业分包 6:班组 0都可以用
|
||||
*/
|
||||
private Long fitOuTypeBit;
|
||||
|
||||
/**
|
||||
* 适用节点类型 1:部门 2:班组 3:小组
|
||||
*/
|
||||
private Long fitOuNodeTypeBit;
|
||||
|
||||
/**
|
||||
* 单位ID
|
||||
*/
|
||||
private Long ouId;
|
||||
|
||||
/**
|
||||
* 功能分组ID
|
||||
*/
|
||||
private Long productCategoryId;
|
||||
|
||||
/**
|
||||
* 权限集类型:feature data
|
||||
*/
|
||||
private String type;
|
||||
|
||||
/**
|
||||
* 获取主键值
|
||||
*
|
||||
* @return 主键值
|
||||
*/
|
||||
@Override
|
||||
protected Serializable pkVal() {
|
||||
return this.id;
|
||||
}
|
||||
}
|
||||
|
||||
@ -0,0 +1,54 @@
|
||||
package cn.axzo.tyr.server.repository.entity;
|
||||
|
||||
import cn.axzo.pokonyan.config.mybatisplus.BaseEntity;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* 权限集作用范围
|
||||
*
|
||||
* @author makejava
|
||||
* @since 2022-06-05 10:59:29
|
||||
*/
|
||||
@TableName("saas_permission_group_scope")
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Accessors(chain = true)
|
||||
public class SaasPermissionGroupScope extends BaseEntity<SaasPermissionGroupScope> implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 972205950455439772L;
|
||||
|
||||
/**
|
||||
* 选择类型: 1.正选 2.反选
|
||||
*/
|
||||
@TableField("type")
|
||||
private Integer type;
|
||||
|
||||
/**
|
||||
* 作用范围类型: workspace ou
|
||||
*/
|
||||
@TableField("scope_type")
|
||||
private String scopeType;
|
||||
|
||||
/**
|
||||
* 作用范围id(workspace_id/ou_id)
|
||||
*/
|
||||
@TableField("scope_id")
|
||||
private Long scopeId;
|
||||
|
||||
/**
|
||||
* 获取主键值
|
||||
*
|
||||
* @return 主键值
|
||||
*/
|
||||
@Override
|
||||
protected Serializable pkVal() {
|
||||
return this.id;
|
||||
}
|
||||
}
|
||||
|
||||
@ -0,0 +1,55 @@
|
||||
package cn.axzo.tyr.server.repository.entity;
|
||||
|
||||
import cn.axzo.pokonyan.config.mybatisplus.BaseEntity;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import lombok.ToString;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* 角色权限集中间表(SaasPgroupRoleRelation)表实体类
|
||||
*
|
||||
* @author makejava
|
||||
* @since 2022-05-24 11:18:41
|
||||
*/
|
||||
@Getter
|
||||
@Setter
|
||||
@ToString
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName("saas_pgroup_role_relation")
|
||||
public class SaasPgroupRoleRelation extends BaseEntity<SaasPgroupRoleRelation> {
|
||||
|
||||
|
||||
/**
|
||||
* 角色id
|
||||
*/
|
||||
private Long roleId;
|
||||
/**
|
||||
* 权限集id
|
||||
*/
|
||||
private Long groupId;
|
||||
|
||||
/**
|
||||
* 创建者
|
||||
*/
|
||||
private Long createBy;
|
||||
/**
|
||||
* 更新者
|
||||
*/
|
||||
private Long updateBy;
|
||||
|
||||
|
||||
/**
|
||||
* 获取主键值
|
||||
*
|
||||
* @return 主键值
|
||||
*/
|
||||
@Override
|
||||
protected Serializable pkVal() {
|
||||
return this.id;
|
||||
}
|
||||
}
|
||||
|
||||
@ -0,0 +1,101 @@
|
||||
package cn.axzo.tyr.server.repository.entity;
|
||||
|
||||
import cn.axzo.pokonyan.config.mybatisplus.BaseEntity;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import lombok.ToString;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* saas-角色(SaasRole)表实体类
|
||||
*
|
||||
* @author makejava
|
||||
* @since 2022-05-24 11:18:41
|
||||
*/
|
||||
@Getter
|
||||
@Setter
|
||||
@ToString
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName("saas_role")
|
||||
public class SaasRole extends BaseEntity<SaasRole> {
|
||||
|
||||
/**
|
||||
* 角色名称
|
||||
*/
|
||||
private String name;
|
||||
/**
|
||||
* 来源的模版角色id
|
||||
*/
|
||||
private Long fromPreRoleId;
|
||||
/**
|
||||
* 角色描述
|
||||
*/
|
||||
private String description;
|
||||
/**
|
||||
* 角色类型:common 普通角色 super_admin超级管理员(禁止删除) admin子管理员(禁止删除) init初始化内置角色
|
||||
*/
|
||||
private String roleType;
|
||||
|
||||
/**
|
||||
* 创建者
|
||||
*/
|
||||
private Long createBy;
|
||||
/**
|
||||
* 更新者
|
||||
*/
|
||||
private Long updateBy;
|
||||
/**
|
||||
* 工作台Id
|
||||
*/
|
||||
private Long workspaceId;
|
||||
|
||||
/**
|
||||
* 角色owner单位Id 实际角色和用户的所属关系 具体查询relation的ouId
|
||||
*/
|
||||
private Long ownerOuId;
|
||||
|
||||
/**
|
||||
* 这个字段的解释工具= {@link cn.axzo.basics.auth.dto.consts.SaasRoleFits }
|
||||
* 适用单位类型 1:总包 2:建设单位 4:监理单位 8:劳务分包 16:专业分包 0都可以用 只会挂在最末级
|
||||
* <p>
|
||||
* 业务层,这个字段不要直接用。有变种的getter、setter,或者直接用解释工具。
|
||||
*/
|
||||
// @Deprecated //有些位运算会使用
|
||||
private Long fitOuTypeBit;
|
||||
|
||||
/**
|
||||
*
|
||||
* 这个字段的解释工具= {@link cn.axzo.basics.auth.dto.consts.SaasRoleFits }
|
||||
*
|
||||
* 适用节点类型 1:部门 2:班组 4:小组 只会挂在最末级
|
||||
*
|
||||
* 业务层,这个字段不要直接用
|
||||
*/
|
||||
// @Deprecated //有些位运算会使用
|
||||
private Long fitOuNodeTypeBit;
|
||||
|
||||
/**
|
||||
* 职位ID, 若此字段不为0则为专属角色,该角色专属于某个职位
|
||||
*/
|
||||
private Long positionTemplateId;
|
||||
|
||||
/**
|
||||
* 岗位字典中的编码
|
||||
*/
|
||||
private String jobCode;
|
||||
|
||||
|
||||
/**
|
||||
* 获取主键值
|
||||
*
|
||||
* @return 主键值
|
||||
*/
|
||||
@Override
|
||||
protected Serializable pkVal() {
|
||||
return this.id;
|
||||
}
|
||||
}
|
||||
|
||||
@ -0,0 +1,72 @@
|
||||
package cn.axzo.tyr.server.repository.entity;
|
||||
|
||||
import cn.axzo.pokonyan.config.mybatisplus.BaseEntity;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* 角色分组
|
||||
*
|
||||
* @author makejava
|
||||
* @since 2022-06-05 10:59:29
|
||||
*/
|
||||
@TableName("saas_role_group")
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Accessors(chain = true)
|
||||
public class SaasRoleGroup extends BaseEntity<SaasRoleGroup> implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 972205950455439772L;
|
||||
|
||||
/**
|
||||
* 系统域编码
|
||||
*/
|
||||
@TableField("top_sys_code")
|
||||
private String topSysCode;
|
||||
|
||||
/**
|
||||
* 二级字典编码(单位类型)
|
||||
*/
|
||||
@TableField("dict_sys_code")
|
||||
private String dictSysCode;
|
||||
|
||||
/**
|
||||
* 名称
|
||||
*/
|
||||
@TableField("name")
|
||||
private String name;
|
||||
|
||||
/**
|
||||
* 项目部id
|
||||
*/
|
||||
@TableField("workspace_id")
|
||||
private Long workspaceId;
|
||||
|
||||
/**
|
||||
* 单位id
|
||||
*/
|
||||
@TableField("ou_id")
|
||||
private Long ouId;
|
||||
|
||||
/**
|
||||
* 排序
|
||||
*/
|
||||
@TableField("sort")
|
||||
private Integer sort;
|
||||
|
||||
/**
|
||||
* 获取主键值
|
||||
*
|
||||
* @return 主键值
|
||||
*/
|
||||
@Override
|
||||
protected Serializable pkVal() {
|
||||
return this.id;
|
||||
}
|
||||
}
|
||||
|
||||
@ -0,0 +1,48 @@
|
||||
package cn.axzo.tyr.server.repository.entity;
|
||||
|
||||
import cn.axzo.pokonyan.config.mybatisplus.BaseEntity;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* 角色分组关联表
|
||||
*
|
||||
* @author makejava
|
||||
* @since 2022-06-05 10:59:29
|
||||
*/
|
||||
@TableName("saas_role_group_relation")
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Accessors(chain = true)
|
||||
public class SaasRoleGroupRelation extends BaseEntity<SaasRoleGroupRelation> implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 972205950455439772L;
|
||||
|
||||
/**
|
||||
* 角色id
|
||||
*/
|
||||
@TableField("role_id")
|
||||
private Long roleId;
|
||||
|
||||
/**
|
||||
* 角色分组id
|
||||
*/
|
||||
@TableField("saas_role_group_id")
|
||||
private Long saasRoleGroupId;
|
||||
|
||||
/**
|
||||
* 获取主键值
|
||||
*
|
||||
* @return 主键值
|
||||
*/
|
||||
@Override
|
||||
protected Serializable pkVal() {
|
||||
return this.id;
|
||||
}
|
||||
}
|
||||
|
||||
@ -0,0 +1,10 @@
|
||||
package cn.axzo.tyr.server.repository.mapper;
|
||||
|
||||
import cn.axzo.tyr.server.repository.entity.SaasPermissionGroup;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
@Mapper
|
||||
public interface SaasPermissionGroupMapper extends BaseMapper<SaasPermissionGroup> {
|
||||
|
||||
}
|
||||
|
||||
@ -0,0 +1,11 @@
|
||||
package cn.axzo.tyr.server.repository.mapper;
|
||||
|
||||
import cn.axzo.tyr.server.repository.entity.SaasPermissionGroupScope;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
||||
public interface SaasPermissionGroupScopeMapper extends BaseMapper<SaasPermissionGroupScope> {
|
||||
|
||||
}
|
||||
|
||||
@ -0,0 +1,11 @@
|
||||
package cn.axzo.tyr.server.repository.mapper;
|
||||
|
||||
import cn.axzo.tyr.server.repository.entity.SaasPgroupRoleRelation;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
||||
public interface SaasPgroupRoleRelationMapper extends BaseMapper<SaasPgroupRoleRelation> {
|
||||
|
||||
}
|
||||
|
||||
@ -0,0 +1,11 @@
|
||||
package cn.axzo.tyr.server.repository.mapper;
|
||||
|
||||
import cn.axzo.tyr.server.repository.entity.SaasRoleGroup;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
||||
public interface SaasRoleGroupMapper extends BaseMapper<SaasRoleGroup> {
|
||||
|
||||
}
|
||||
|
||||
@ -0,0 +1,11 @@
|
||||
package cn.axzo.tyr.server.repository.mapper;
|
||||
|
||||
import cn.axzo.tyr.server.repository.entity.SaasRoleGroupRelation;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
||||
public interface SaasRoleGroupRelationMapper extends BaseMapper<SaasRoleGroupRelation> {
|
||||
|
||||
}
|
||||
|
||||
@ -0,0 +1,11 @@
|
||||
package cn.axzo.tyr.server.repository.mapper;
|
||||
|
||||
import cn.axzo.tyr.server.repository.entity.SaasRole;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
||||
public interface SaasRoleMapper extends BaseMapper<SaasRole> {
|
||||
|
||||
}
|
||||
|
||||
@ -0,0 +1,12 @@
|
||||
package cn.axzo.tyr.server.repository.service;
|
||||
|
||||
import cn.axzo.tyr.server.repository.entity.SaasPermissionGroup;
|
||||
import cn.axzo.tyr.server.repository.mapper.SaasPermissionGroupMapper;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
public class SaasPermissionGroupDao extends ServiceImpl<SaasPermissionGroupMapper, SaasPermissionGroup> {
|
||||
|
||||
}
|
||||
|
||||
@ -0,0 +1,14 @@
|
||||
package cn.axzo.tyr.server.repository.service;
|
||||
|
||||
import cn.axzo.tyr.server.repository.entity.SaasPermissionGroup;
|
||||
import cn.axzo.tyr.server.repository.entity.SaasPermissionGroupScope;
|
||||
import cn.axzo.tyr.server.repository.mapper.SaasPermissionGroupMapper;
|
||||
import cn.axzo.tyr.server.repository.mapper.SaasPermissionGroupScopeMapper;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
public class SaasPermissionGroupScopeDao extends ServiceImpl<SaasPermissionGroupScopeMapper, SaasPermissionGroupScope> {
|
||||
|
||||
}
|
||||
|
||||
@ -0,0 +1,14 @@
|
||||
package cn.axzo.tyr.server.repository.service;
|
||||
|
||||
import cn.axzo.tyr.server.repository.entity.SaasPermissionGroup;
|
||||
import cn.axzo.tyr.server.repository.entity.SaasPgroupRoleRelation;
|
||||
import cn.axzo.tyr.server.repository.mapper.SaasPermissionGroupMapper;
|
||||
import cn.axzo.tyr.server.repository.mapper.SaasPgroupRoleRelationMapper;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
public class SaasPgroupRoleRelationDao extends ServiceImpl<SaasPgroupRoleRelationMapper, SaasPgroupRoleRelation> {
|
||||
|
||||
}
|
||||
|
||||
@ -0,0 +1,14 @@
|
||||
package cn.axzo.tyr.server.repository.service;
|
||||
|
||||
import cn.axzo.tyr.server.repository.entity.SaasRole;
|
||||
import cn.axzo.tyr.server.repository.entity.SaasRoleGroup;
|
||||
import cn.axzo.tyr.server.repository.mapper.SaasRoleGroupMapper;
|
||||
import cn.axzo.tyr.server.repository.mapper.SaasRoleMapper;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
public class SaasRoleDao extends ServiceImpl<SaasRoleMapper, SaasRole> {
|
||||
|
||||
}
|
||||
|
||||
@ -0,0 +1,14 @@
|
||||
package cn.axzo.tyr.server.repository.service;
|
||||
|
||||
import cn.axzo.tyr.server.repository.entity.SaasPgroupRoleRelation;
|
||||
import cn.axzo.tyr.server.repository.entity.SaasRoleGroup;
|
||||
import cn.axzo.tyr.server.repository.mapper.SaasPgroupRoleRelationMapper;
|
||||
import cn.axzo.tyr.server.repository.mapper.SaasRoleGroupMapper;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
public class SaasRoleGroupDao extends ServiceImpl<SaasRoleGroupMapper, SaasRoleGroup> {
|
||||
|
||||
}
|
||||
|
||||
@ -0,0 +1,14 @@
|
||||
package cn.axzo.tyr.server.repository.service;
|
||||
|
||||
import cn.axzo.tyr.server.repository.entity.SaasRoleGroup;
|
||||
import cn.axzo.tyr.server.repository.entity.SaasRoleGroupRelation;
|
||||
import cn.axzo.tyr.server.repository.mapper.SaasRoleGroupMapper;
|
||||
import cn.axzo.tyr.server.repository.mapper.SaasRoleGroupRelationMapper;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
public class SaasRoleGroupRelationDao extends ServiceImpl<SaasRoleGroupRelationMapper, SaasRoleGroupRelation> {
|
||||
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user