toolchaintechnologycenter/spdm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

用户租户id设置默认值

Browse Source
This commit is contained in:
gulongcheng
2025-11-03 20:55:01 +08:00
parent dcb6e8399c
commit 3324d9bca0
14 changed files with 32 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/src/main/java/com/sdm/common/entity/req/system/UserListReq.java
View File

@@ -2,13 +2,15 @@ package com.sdm.common.entity.req.system;
import com.sdm.common.entity.BaseReq;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
@Schema(description = "用户列表查询请求参数")
@Data
public class UserListReq extends BaseReq {
@Schema(description = "租户ID")
private Long tenantId;
@NotNull(message = "租户ID不能为空")
private Long tenantId = 1979091834410176514L;
@Schema(description = "用户ID")
private Long userId;

6
common/src/main/java/com/sdm/common/entity/req/system/UserQueryReq.java
View File

@@ -1,16 +1,20 @@
package com.sdm.common.entity.req.system;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import java.lang.annotation.Native;
@Schema(description = "用户详情查询请求参数")
@Data
public class UserQueryReq {
@Schema(description = "用户ID")
@NotNull(message = "用户ID不能为空")
private Long userId;
@Schema(description = "用户名")
private String userName;
private Long tenantId;
private Long tenantId = 1979091834410176514L;
}

39
system/src/main/java/com/sdm/grpc/server/CidApproveFlowServer.java
View File

@@ -1,39 +0,0 @@
package com.sdm.grpc.server;
import com.sdm.common.common.SdmResponse;
import com.sdm.grpc.lib.ApproveFlowReply;
import com.sdm.grpc.lib.ApproveFlowRequest;
import com.sdm.grpc.lib.ApproveFlowServiceGrpc;
import com.sdm.system.service.ISimulatinoApprovalService;
import com.sdm.system.service.impl.SimulationApproveServiceImpl;
import io.grpc.stub.StreamObserver;
import lombok.extern.slf4j.Slf4j;
import net.devh.boot.grpc.server.service.GrpcService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
@Slf4j
@GrpcService
public class CidApproveFlowServer extends ApproveFlowServiceGrpc.ApproveFlowServiceImplBase{
public CidApproveFlowServer(){
log.info("CidApproveFlowServer init");
}
@Autowired
ISimulatinoApprovalService approvalService ;
@Override
public void launchApproveFlow(ApproveFlowRequest request, StreamObserver<ApproveFlowReply> responseObserver) {
String approveTitle = request.getApproveTitle();
int innerFlowId = request.getInnerFlowId();
String comment = request.getComment();
int approveType = request.getApproveType();
String tenantId = request.getTenantId();
String user = request.getUser();
String replayUrl = request.getReplayUrl();
//responseObserver.onNext(reply.build());
//responseObserver.onCompleted();
}
}

20
system/src/main/java/com/sdm/grpc/server/ReceiveCidApproveFlowNoticeService.java
View File

@@ -1,20 +0,0 @@
package com.sdm.grpc.server;
import com.sdm.grpc.lib.ApproveFlowServiceGrpc;
import com.sdm.grpc.lib.ApproveNoticeReply;
import com.sdm.grpc.lib.ApproveResultRequest;
import io.grpc.stub.StreamObserver;
import net.devh.boot.grpc.server.service.GrpcService;
public class ReceiveCidApproveFlowNoticeService{// extends ApproveFlowServiceGrpc.ApproveFlowServiceImplBase {
//@Override
public void approveFlowResultNotice(ApproveResultRequest request, StreamObserver<ApproveNoticeReply> responseObserver) {
int approveStatus = request.getApproveStatus();
int innerApproveId = request.getInnerFlowId();
/******* ToDo ********/
/*********************/
ApproveNoticeReply.Builder reply = ApproveNoticeReply.newBuilder();
reply.setInnerFlowId(innerApproveId);
reply.setSuccess(true);
}
}

8
system/src/main/java/com/sdm/system/controller/SysRoleController.java
View File

@@ -42,7 +42,7 @@ 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",required = false) Long tenantId) {
public SdmResponse getRoleByRoleCode(@Parameter(description = "角色编码") @RequestParam("roleCode") String roleCode,@Parameter(description = "租户ID") @RequestParam(name = "tenantId",defaultValue = "1979091834410176514") Long tenantId) {
return sysRoleService.getRoleByRoleCode(roleCode, tenantId);
}
@@ -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("id") Long id) {
return sysRoleService.getRoleById(id);
@Parameter(description = "角色ID") @RequestParam("roleId") Long roleId,@Parameter(description = "租户id") @RequestParam(value = "tenantId",defaultValue = "1979091834410176514") Long tenantId) {
return sysRoleService.getRoleById(roleId, tenantId);
}
/**
@@ -64,7 +64,7 @@ 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",required = false) Long tenantId) {
public SdmResponse getRoleByRoleName(@Parameter(description = "角色名称") @RequestParam("roleName") String roleName,@Parameter(description = "租户ID") @RequestParam(name = "tenantId",defaultValue = "1979091834410176514") Long tenantId) {
return sysRoleService.getRoleByRoleName(roleName, tenantId);
}

4
system/src/main/java/com/sdm/system/controller/SysTenantController.java
View File

@@ -78,8 +78,8 @@ public class SysTenantController {
*/
@GetMapping("/getTenantDetailById")
@Operation(summary = "根据ID查询租户信息")
public SdmResponse getTenantDetailById(@RequestParam Long id) {
return tenantService.getTenantDetailById(id);
public SdmResponse getTenantDetailById(@RequestParam("tenantId") Long tenantId) {
return tenantService.getTenantDetailById(tenantId);
}
}

2
system/src/main/java/com/sdm/system/controller/SysUserController.java
View File

@@ -130,7 +130,7 @@ 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",required = false) Long tenantId) {
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);
}

4
system/src/main/java/com/sdm/system/model/req/role/QueryRoleReq.java
View File

@@ -3,6 +3,7 @@ package com.sdm.system.model.req.role;
import com.baomidou.mybatisplus.annotation.TableField;
import com.sdm.system.model.req.BaseReq;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
@Data
@@ -16,5 +17,6 @@ public class QueryRoleReq extends BaseReq {
private String roleName;
@Schema(description = "租户ID")
private Long tenantId;
@NotNull(message = "租户ID不能为空")
private Long tenantId = 1979091834410176514L;
}

2
system/src/main/java/com/sdm/system/model/req/user/GroupQueryReq.java
View File

@@ -13,5 +13,5 @@ public class GroupQueryReq extends BaseReq {
@Schema(description = "租户ID")
@NotNull(message = "租户ID不能为空")
private Long tenantId;
private Long tenantId = 1979091834410176514L;
}

2
system/src/main/java/com/sdm/system/model/req/user/QueryGroupDetailReq.java
View File

@@ -14,5 +14,5 @@ public class QueryGroupDetailReq extends BaseReq {
Long id;
@Parameter(description = "租户id")
Long tenantId;
Long tenantId =1979091834410176514L ;
}

6
system/src/main/java/com/sdm/system/service/ISysRoleService.java
View File

@@ -37,10 +37,12 @@ public interface ISysRoleService extends IService<SysRole> {
/**
* 根据ID获取角色
* @param id 角色ID
*
* @param roleId 角色ID
* @param tenantId
* @return 角色信息
*/
SdmResponse getRoleById(Long id);
SdmResponse getRoleById(Long roleId, Long tenantId);
/**
* 根据角色名称查询

4
system/src/main/java/com/sdm/system/service/impl/CID/CIDISysUserServiceImpl.java
View File

@@ -143,8 +143,8 @@ public class CIDISysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
public SdmResponse<CIDRoleResp> queryUserRole(Long userId, Long tenantId) {
try {
Map<String, Object> paramMap = new HashMap<>();
paramMap.put("id", userId);
paramMap.put("tenantId", userId);
paramMap.put("userId", userId);
paramMap.put("tenantId", tenantId);
String resultJson = HttpUtil.get(cidUrl + queryUserRole, paramMap);
SdmResponse<CIDRoleResp> result = JSON.parseObject(resultJson, SdmResponse.class);
return result;

9
system/src/main/java/com/sdm/system/service/impl/CID/CIDSysRoleServiceImpl.java
View File

@@ -2,7 +2,6 @@ package com.sdm.system.service.impl.CID;
import cn.hutool.http.HttpUtil;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.sdm.common.common.SdmResponse;
import com.sdm.common.entity.resp.PageDataResp;
@@ -13,7 +12,6 @@ import com.sdm.system.model.req.role.AddRoleReq;
import com.sdm.system.model.req.role.QueryRoleReq;
import com.sdm.system.model.req.role.UpdateRoleReq;
import com.sdm.system.model.req.system.AssignRolePermissionReq;
import com.sdm.system.model.resp.SysRoleResp;
import com.sdm.system.service.ISysRoleService;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -74,7 +72,7 @@ public class CIDSysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> i
Map<String, Object> paramMap = new HashMap<>();
paramMap.put("roleCode", roleCode);
paramMap.put("tenantId", tenantId);
String resultJson = HttpUtil.get(cidUrl + getRoleByRoleName, paramMap);
String resultJson = HttpUtil.get(cidUrl + getRoleByRoleCode, paramMap);
SdmResponse<CIDRoleResp> respSdmResponse = JSON.parseObject(resultJson, SdmResponse.class);
return respSdmResponse;
} catch (Exception e) {
@@ -84,10 +82,11 @@ public class CIDSysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> i
}
@Override
public SdmResponse getRoleById(Long id) {
public SdmResponse getRoleById(Long roleId, Long tenantId) {
try {
Map<String, Object> paramMap = new HashMap<>();
paramMap.put("id", id);
paramMap.put("roleId", roleId);
paramMap.put("tenantId", tenantId);
String resultJson = HttpUtil.get(cidUrl + getRoleById, paramMap);
SdmResponse<CIDRoleResp> respSdmResponse = JSON.parseObject(resultJson, SdmResponse.class);
return SdmResponse.success(respSdmResponse);

4
system/src/main/java/com/sdm/system/service/impl/LocalSysRoleServiceImpl.java
View File

@@ -83,9 +83,9 @@ public class LocalSysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole>
}
@Override
public SdmResponse getRoleById(Long id) {
public SdmResponse getRoleById(Long roleId, Long tenantId) {
try {
SysRole sysRole = this.getById(id);
SysRole sysRole = this.getById(roleId);
if (sysRole != null) {
return SdmResponse.success(sysRole);
}