启动脚本+数据总览
This commit is contained in:
@@ -42,8 +42,8 @@ public class SysRoleController {
|
||||
@Operation(summary = "通过角色编码查询", description = "通过角色编码查询")
|
||||
@ApiResponse(content = @Content(mediaType = "application/json", schema = @Schema(implementation = SysRole.class)))
|
||||
@GetMapping("/getRoleByRoleCode")
|
||||
public SdmResponse getRoleByRoleCode(@Parameter(description = "角色编码") @RequestParam("roleCode") String roleCode,@Parameter(description = "租户ID") @RequestParam(name = "tenantId",defaultValue = "1979091834410176514") Long tenantId) {
|
||||
return sysRoleService.getRoleByRoleCode(roleCode, tenantId);
|
||||
public SdmResponse getRoleByRoleCode(@Parameter(description = "角色编码") @RequestParam("roleCode") String roleCode) {
|
||||
return sysRoleService.getRoleByRoleCode(roleCode);
|
||||
}
|
||||
|
||||
|
||||
@@ -54,8 +54,8 @@ public class SysRoleController {
|
||||
@ApiResponse(content = @Content(mediaType = "application/json", schema = @Schema(implementation = SysRole.class)))
|
||||
@GetMapping("/getRoleById")
|
||||
public SdmResponse getRoleById(
|
||||
@Parameter(description = "角色ID") @RequestParam("roleId") Long roleId,@Parameter(description = "租户id") @RequestParam(value = "tenantId",defaultValue = "1979091834410176514") Long tenantId) {
|
||||
return sysRoleService.getRoleById(roleId, tenantId);
|
||||
@Parameter(description = "角色ID") @RequestParam("roleId") Long roleId) {
|
||||
return sysRoleService.getRoleById(roleId);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -64,8 +64,8 @@ public class SysRoleController {
|
||||
@Operation(summary = "通过角色名称查询", description = "通过角色名称查询")
|
||||
@ApiResponse(content = @Content(mediaType = "application/json", schema = @Schema(implementation = SysRole.class)))
|
||||
@GetMapping("/getRoleByRoleName")
|
||||
public SdmResponse getRoleByRoleName(@Parameter(description = "角色名称") @RequestParam("roleName") String roleName,@Parameter(description = "租户ID") @RequestParam(name = "tenantId",defaultValue = "1979091834410176514") Long tenantId) {
|
||||
return sysRoleService.getRoleByRoleName(roleName, tenantId);
|
||||
public SdmResponse getRoleByRoleName(@Parameter(description = "角色名称") @RequestParam("roleName") String roleName) {
|
||||
return sysRoleService.getRoleByRoleName(roleName);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -141,8 +141,8 @@ public class SysUserController implements ISysUserFeignClient {
|
||||
*/
|
||||
@Operation(summary = "查询用户角色", description = "查询用户角色接口,用于查询指定用户的角色列表")
|
||||
@GetMapping("/queryUserRole")
|
||||
public SdmResponse<CIDRoleResp> queryUserRole(@Parameter(description = "用户id") @RequestParam("userId") Long userId, @Parameter(description = "租户id") @RequestParam(name = "tenantId",defaultValue = "1979091834410176514") Long tenantId) {
|
||||
return ISysUserService.queryUserRole(userId,tenantId);
|
||||
public SdmResponse<CIDRoleResp> queryUserRole(@Parameter(description = "用户id") @RequestParam("userId") Long userId) {
|
||||
return ISysUserService.queryUserRole(userId);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -17,6 +17,5 @@ public class QueryRoleReq extends BaseReq {
|
||||
private String roleName;
|
||||
|
||||
@Schema(description = "租户ID")
|
||||
@NotNull(message = "租户ID不能为空")
|
||||
private Long tenantId = 1979091834410176514L;
|
||||
private Long tenantId;
|
||||
}
|
||||
|
||||
@@ -12,6 +12,5 @@ public class GroupQueryReq extends BaseReq {
|
||||
private String groupName;
|
||||
|
||||
@Schema(description = "租户ID")
|
||||
@NotNull(message = "租户ID不能为空")
|
||||
private Long tenantId = 1979091834410176514L;
|
||||
private Long tenantId;
|
||||
}
|
||||
@@ -14,5 +14,5 @@ public class QueryGroupDetailReq extends BaseReq {
|
||||
Long id;
|
||||
|
||||
@Parameter(description = "租户id")
|
||||
Long tenantId =1979091834410176514L ;
|
||||
Long tenantId ;
|
||||
}
|
||||
|
||||
@@ -30,24 +30,22 @@ public interface ISysRoleService extends IService<SysRole> {
|
||||
* 根据ID获取角色
|
||||
*
|
||||
* @param roleCode 角色编码
|
||||
* @param tenantId
|
||||
* @return 角色信息
|
||||
*/
|
||||
SdmResponse getRoleByRoleCode(String roleCode, Long tenantId);
|
||||
SdmResponse getRoleByRoleCode(String roleCode);
|
||||
|
||||
/**
|
||||
* 根据ID获取角色
|
||||
*
|
||||
* @param roleId 角色ID
|
||||
* @param tenantId
|
||||
* @return 角色信息
|
||||
*/
|
||||
SdmResponse getRoleById(Long roleId, Long tenantId);
|
||||
SdmResponse getRoleById(Long roleId);
|
||||
|
||||
/**
|
||||
* 根据角色名称查询
|
||||
*/
|
||||
SdmResponse getRoleByRoleName(String roleName, Long tenantId);
|
||||
SdmResponse getRoleByRoleName(String roleName);
|
||||
|
||||
/**
|
||||
* 创建角色
|
||||
|
||||
@@ -35,7 +35,7 @@ public interface ISysUserService extends IService<SysUser> {
|
||||
|
||||
SdmResponse updateUserRole(UpdateUserRole req);
|
||||
|
||||
SdmResponse<CIDRoleResp> queryUserRole(Long userId, Long tenantId);
|
||||
SdmResponse<CIDRoleResp> queryUserRole(Long userId);
|
||||
|
||||
SdmResponse addGroup(GroupAddReq req);
|
||||
|
||||
|
||||
@@ -5,6 +5,7 @@ import cn.hutool.json.JSONUtil;
|
||||
import com.alibaba.fastjson2.JSON;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.sdm.common.common.SdmResponse;
|
||||
import com.sdm.common.common.ThreadLocalContext;
|
||||
import com.sdm.common.entity.req.system.UserListReq;
|
||||
import com.sdm.common.entity.req.system.UserQueryReq;
|
||||
import com.sdm.common.entity.resp.PageDataResp;
|
||||
@@ -88,6 +89,7 @@ public class CIDISysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
|
||||
@Override
|
||||
public SdmResponse queryUserDetail(UserQueryReq req) {
|
||||
try {
|
||||
req.setTenantId(ThreadLocalContext.getTenantId());
|
||||
String userJson = HttpUtil.post(cidUrl + queryUserDetail, JSONUtil.toJsonStr(req));
|
||||
SdmResponse<CIDUserResp> CIDUserRespose = JSON.parseObject(userJson, SdmResponse.class);
|
||||
if (CIDUserRespose != null) {
|
||||
@@ -118,6 +120,7 @@ public class CIDISysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
|
||||
@Override
|
||||
public SdmResponse listUser(UserListReq req) {
|
||||
try {
|
||||
req.setTenantId(ThreadLocalContext.getTenantId());
|
||||
String userJson = HttpUtil.post(cidUrl + listUser, JSONUtil.toJsonStr(req));
|
||||
SdmResponse<PageDataResp<List<CIDUserResp>>> cidUserAddReq = JSON.parseObject(userJson, SdmResponse.class);
|
||||
return cidUserAddReq;
|
||||
@@ -158,11 +161,11 @@ public class CIDISysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
|
||||
}
|
||||
|
||||
@Override
|
||||
public SdmResponse<CIDRoleResp> queryUserRole(Long userId, Long tenantId) {
|
||||
public SdmResponse<CIDRoleResp> queryUserRole(Long userId) {
|
||||
try {
|
||||
Map<String, Object> paramMap = new HashMap<>();
|
||||
paramMap.put("userId", userId);
|
||||
paramMap.put("tenantId", tenantId);
|
||||
paramMap.put("tenantId", ThreadLocalContext.getTenantId());
|
||||
String resultJson = HttpUtil.get(cidUrl + queryUserRole, paramMap);
|
||||
SdmResponse<CIDRoleResp> result = JSON.parseObject(resultJson, SdmResponse.class);
|
||||
return result;
|
||||
@@ -185,6 +188,7 @@ public class CIDISysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
|
||||
@Override
|
||||
public SdmResponse<PageDataResp<List<SysUserGroupResp>>> queryGroup(GroupQueryReq req) {
|
||||
try {
|
||||
req.setTenantId(ThreadLocalContext.getTenantId());
|
||||
String userJson = HttpUtil.post(cidUrl + queryGroup, JSONUtil.toJsonStr(req));
|
||||
SdmResponse<PageDataResp<List<SysUserGroupResp>>> CIDGroupRespose = JSON.parseObject(userJson, SdmResponse.class);
|
||||
if (CIDGroupRespose != null) {
|
||||
@@ -200,6 +204,7 @@ public class CIDISysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
|
||||
@Override
|
||||
public SdmResponse<SysUserGroupDetailResp> queryGroupDetail(QueryGroupDetailReq req) {
|
||||
try {
|
||||
req.setTenantId(ThreadLocalContext.getTenantId());
|
||||
String userJson = HttpUtil.post(cidUrl + queryGroupDetail, JSONUtil.toJsonStr(req));
|
||||
SdmResponse<SysUserGroupDetailResp> CIDGroupDetailRespose = JSON.parseObject(userJson, SdmResponse.class);
|
||||
if (CIDGroupDetailRespose != null) {
|
||||
|
||||
@@ -4,6 +4,7 @@ import cn.hutool.http.HttpUtil;
|
||||
import com.alibaba.fastjson2.JSON;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.sdm.common.common.SdmResponse;
|
||||
import com.sdm.common.common.ThreadLocalContext;
|
||||
import com.sdm.common.entity.resp.PageDataResp;
|
||||
import com.sdm.common.entity.resp.system.CIDRoleResp;
|
||||
import com.sdm.system.dao.SysRoleMapper;
|
||||
@@ -56,6 +57,7 @@ public class CIDSysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> i
|
||||
@Override
|
||||
public SdmResponse listRoles(QueryRoleReq queryRoleReq) {
|
||||
try {
|
||||
queryRoleReq.setTenantId(ThreadLocalContext.getTenantId());
|
||||
String jsonResponse = HttpUtil.post(cidUrl + listRoles, JSON.toJSONString(queryRoleReq));
|
||||
SdmResponse<PageDataResp<List<CIDRoleResp>>> respSdmResponse = JSON.parseObject(jsonResponse, SdmResponse.class);
|
||||
return respSdmResponse;
|
||||
@@ -67,11 +69,11 @@ public class CIDSysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> i
|
||||
|
||||
|
||||
@Override
|
||||
public SdmResponse getRoleByRoleCode(String roleCode, Long tenantId) {
|
||||
public SdmResponse getRoleByRoleCode(String roleCode) {
|
||||
try {
|
||||
Map<String, Object> paramMap = new HashMap<>();
|
||||
paramMap.put("roleCode", roleCode);
|
||||
paramMap.put("tenantId", tenantId);
|
||||
paramMap.put("tenantId", ThreadLocalContext.getTenantId());
|
||||
String resultJson = HttpUtil.get(cidUrl + getRoleByRoleCode, paramMap);
|
||||
SdmResponse<CIDRoleResp> respSdmResponse = JSON.parseObject(resultJson, SdmResponse.class);
|
||||
return respSdmResponse;
|
||||
@@ -82,11 +84,11 @@ public class CIDSysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> i
|
||||
}
|
||||
|
||||
@Override
|
||||
public SdmResponse getRoleById(Long roleId, Long tenantId) {
|
||||
public SdmResponse getRoleById(Long roleId) {
|
||||
try {
|
||||
Map<String, Object> paramMap = new HashMap<>();
|
||||
paramMap.put("roleId", roleId);
|
||||
paramMap.put("tenantId", tenantId);
|
||||
paramMap.put("tenantId", ThreadLocalContext.getTenantId());
|
||||
String resultJson = HttpUtil.get(cidUrl + getRoleById, paramMap);
|
||||
SdmResponse<CIDRoleResp> respSdmResponse = JSON.parseObject(resultJson, SdmResponse.class);
|
||||
return SdmResponse.success(respSdmResponse);
|
||||
@@ -97,11 +99,11 @@ public class CIDSysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> i
|
||||
}
|
||||
|
||||
@Override
|
||||
public SdmResponse getRoleByRoleName(String roleName, Long tenantId){
|
||||
public SdmResponse getRoleByRoleName(String roleName){
|
||||
try {
|
||||
Map<String, Object> paramMap = new HashMap<>();
|
||||
paramMap.put("roleName", roleName);
|
||||
paramMap.put("tenantId", tenantId);
|
||||
paramMap.put("tenantId", ThreadLocalContext.getTenantId());
|
||||
String resultJson = HttpUtil.get(cidUrl + getRoleByRoleName, paramMap);
|
||||
SdmResponse<CIDRoleResp> respSdmResponse = JSON.parseObject(resultJson, SdmResponse.class);
|
||||
return respSdmResponse;
|
||||
|
||||
@@ -72,7 +72,7 @@ public class LocalSysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole>
|
||||
|
||||
|
||||
@Override
|
||||
public SdmResponse getRoleByRoleCode(String roleCode, Long tenantId) {
|
||||
public SdmResponse getRoleByRoleCode(String roleCode) {
|
||||
try {
|
||||
SysRole sysRole = this.lambdaQuery().eq(SysRole::getRoleCode, roleCode).one();
|
||||
return SdmResponse.success(sysRole);
|
||||
@@ -83,7 +83,7 @@ public class LocalSysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole>
|
||||
}
|
||||
|
||||
@Override
|
||||
public SdmResponse getRoleById(Long roleId, Long tenantId) {
|
||||
public SdmResponse getRoleById(Long roleId) {
|
||||
try {
|
||||
SysRole sysRole = this.getById(roleId);
|
||||
if (sysRole != null) {
|
||||
@@ -97,7 +97,7 @@ public class LocalSysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole>
|
||||
}
|
||||
|
||||
@Override
|
||||
public SdmResponse getRoleByRoleName(String roleName, Long tenantId) {
|
||||
public SdmResponse getRoleByRoleName(String roleName) {
|
||||
try {
|
||||
List<SysRole> list = this.lambdaQuery().like(SysRole::getRoleName, roleName).list();
|
||||
return SdmResponse.success(list);
|
||||
|
||||
@@ -167,7 +167,7 @@ public class LocalUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> im
|
||||
}
|
||||
|
||||
@Override
|
||||
public SdmResponse<CIDRoleResp> queryUserRole(Long userId, Long tenantId) {
|
||||
public SdmResponse<CIDRoleResp> queryUserRole(Long userId) {
|
||||
SysUserRoleRelation userRoleRelation = sysUserRoleRelationService.lambdaQuery().eq(SysUserRoleRelation::getUserId, userId).one();
|
||||
if (userRoleRelation == null) {
|
||||
return SdmResponse.failed("用户角色不存在");
|
||||
|
||||
@@ -42,5 +42,5 @@ fi
|
||||
echo "正在启动项目..."
|
||||
|
||||
# 启动项目,保留控制台输出
|
||||
nohup java ${JVM_OPTS} -jar "${FULL_JAR_PATH}" > "${LOG_FILE}" 2>&1 &
|
||||
nohup java ${JVM_OPTS} -Dspring.profiles.active=dev -jar "${FULL_JAR_PATH}" > "${LOG_FILE}" 2>&1 &
|
||||
|
||||
|
||||
@@ -44,8 +44,16 @@
|
||||
</appender>
|
||||
|
||||
<!-- 日志输出级别 -->
|
||||
<root level="DEBUG">
|
||||
<root level="INFO">
|
||||
<appender-ref ref="STDOUT" />
|
||||
<appender-ref ref="FILE" />
|
||||
</root>
|
||||
|
||||
<!-- local环境使用DEBUG级别 -->
|
||||
<springProfile name="local">
|
||||
<root level="DEBUG">
|
||||
<appender-ref ref="STDOUT" />
|
||||
<appender-ref ref="FILE" />
|
||||
</root>
|
||||
</springProfile>
|
||||
</configuration>
|
||||
|
||||
Reference in New Issue
Block a user