diff --git a/common/src/main/java/com/sdm/common/entity/req/system/UserListReq.java b/common/src/main/java/com/sdm/common/entity/req/system/UserListReq.java index a90add7c..b9ee1ac9 100644 --- a/common/src/main/java/com/sdm/common/entity/req/system/UserListReq.java +++ b/common/src/main/java/com/sdm/common/entity/req/system/UserListReq.java @@ -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; diff --git a/common/src/main/java/com/sdm/common/entity/req/system/UserQueryReq.java b/common/src/main/java/com/sdm/common/entity/req/system/UserQueryReq.java index d766d941..4a041f03 100644 --- a/common/src/main/java/com/sdm/common/entity/req/system/UserQueryReq.java +++ b/common/src/main/java/com/sdm/common/entity/req/system/UserQueryReq.java @@ -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; } \ No newline at end of file diff --git a/system/src/main/java/com/sdm/grpc/server/CidApproveFlowServer.java b/system/src/main/java/com/sdm/grpc/server/CidApproveFlowServer.java deleted file mode 100644 index fb84adee..00000000 --- a/system/src/main/java/com/sdm/grpc/server/CidApproveFlowServer.java +++ /dev/null @@ -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 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(); - } -} diff --git a/system/src/main/java/com/sdm/grpc/server/ReceiveCidApproveFlowNoticeService.java b/system/src/main/java/com/sdm/grpc/server/ReceiveCidApproveFlowNoticeService.java deleted file mode 100644 index ef954571..00000000 --- a/system/src/main/java/com/sdm/grpc/server/ReceiveCidApproveFlowNoticeService.java +++ /dev/null @@ -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 responseObserver) { - int approveStatus = request.getApproveStatus(); - int innerApproveId = request.getInnerFlowId(); - /******* ToDo ********/ - /*********************/ - ApproveNoticeReply.Builder reply = ApproveNoticeReply.newBuilder(); - reply.setInnerFlowId(innerApproveId); - reply.setSuccess(true); - } -} diff --git a/system/src/main/java/com/sdm/system/controller/SysRoleController.java b/system/src/main/java/com/sdm/system/controller/SysRoleController.java index fd30382d..a2ce16e4 100644 --- a/system/src/main/java/com/sdm/system/controller/SysRoleController.java +++ b/system/src/main/java/com/sdm/system/controller/SysRoleController.java @@ -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); } diff --git a/system/src/main/java/com/sdm/system/controller/SysTenantController.java b/system/src/main/java/com/sdm/system/controller/SysTenantController.java index 8ec10ccb..a55c6fa8 100644 --- a/system/src/main/java/com/sdm/system/controller/SysTenantController.java +++ b/system/src/main/java/com/sdm/system/controller/SysTenantController.java @@ -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); } } diff --git a/system/src/main/java/com/sdm/system/controller/SysUserController.java b/system/src/main/java/com/sdm/system/controller/SysUserController.java index a9682842..8db7d6c1 100644 --- a/system/src/main/java/com/sdm/system/controller/SysUserController.java +++ b/system/src/main/java/com/sdm/system/controller/SysUserController.java @@ -130,7 +130,7 @@ public class SysUserController implements ISysUserFeignClient { */ @Operation(summary = "查询用户角色", description = "查询用户角色接口，用于查询指定用户的角色列表") @GetMapping("/queryUserRole") - public SdmResponse queryUserRole(@Parameter(description = "用户id") @RequestParam("userId") Long userId, @Parameter(description = "租户id") @RequestParam(name = "tenantId",required = false) Long tenantId) { + public SdmResponse queryUserRole(@Parameter(description = "用户id") @RequestParam("userId") Long userId, @Parameter(description = "租户id") @RequestParam(name = "tenantId",defaultValue = "1979091834410176514") Long tenantId) { return ISysUserService.queryUserRole(userId,tenantId); } diff --git a/system/src/main/java/com/sdm/system/model/req/role/QueryRoleReq.java b/system/src/main/java/com/sdm/system/model/req/role/QueryRoleReq.java index 5102ea7d..bddffd5d 100644 --- a/system/src/main/java/com/sdm/system/model/req/role/QueryRoleReq.java +++ b/system/src/main/java/com/sdm/system/model/req/role/QueryRoleReq.java @@ -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; } diff --git a/system/src/main/java/com/sdm/system/model/req/user/GroupQueryReq.java b/system/src/main/java/com/sdm/system/model/req/user/GroupQueryReq.java index c8444079..d39e4e0c 100644 --- a/system/src/main/java/com/sdm/system/model/req/user/GroupQueryReq.java +++ b/system/src/main/java/com/sdm/system/model/req/user/GroupQueryReq.java @@ -13,5 +13,5 @@ public class GroupQueryReq extends BaseReq { @Schema(description = "租户ID") @NotNull(message = "租户ID不能为空") - private Long tenantId; + private Long tenantId = 1979091834410176514L; } \ No newline at end of file diff --git a/system/src/main/java/com/sdm/system/model/req/user/QueryGroupDetailReq.java b/system/src/main/java/com/sdm/system/model/req/user/QueryGroupDetailReq.java index 359be139..9a320f6d 100644 --- a/system/src/main/java/com/sdm/system/model/req/user/QueryGroupDetailReq.java +++ b/system/src/main/java/com/sdm/system/model/req/user/QueryGroupDetailReq.java @@ -14,5 +14,5 @@ public class QueryGroupDetailReq extends BaseReq { Long id; @Parameter(description = "租户id") - Long tenantId; + Long tenantId =1979091834410176514L ; } diff --git a/system/src/main/java/com/sdm/system/service/ISysRoleService.java b/system/src/main/java/com/sdm/system/service/ISysRoleService.java index d088e952..b7386d66 100644 --- a/system/src/main/java/com/sdm/system/service/ISysRoleService.java +++ b/system/src/main/java/com/sdm/system/service/ISysRoleService.java @@ -37,10 +37,12 @@ public interface ISysRoleService extends IService { /** * 根据ID获取角色 - * @param id 角色ID + * + * @param roleId 角色ID + * @param tenantId * @return 角色信息 */ - SdmResponse getRoleById(Long id); + SdmResponse getRoleById(Long roleId, Long tenantId); /** * 根据角色名称查询 diff --git a/system/src/main/java/com/sdm/system/service/impl/CID/CIDISysUserServiceImpl.java b/system/src/main/java/com/sdm/system/service/impl/CID/CIDISysUserServiceImpl.java index aae29162..74ef5005 100644 --- a/system/src/main/java/com/sdm/system/service/impl/CID/CIDISysUserServiceImpl.java +++ b/system/src/main/java/com/sdm/system/service/impl/CID/CIDISysUserServiceImpl.java @@ -143,8 +143,8 @@ public class CIDISysUserServiceImpl extends ServiceImpl public SdmResponse queryUserRole(Long userId, Long tenantId) { try { Map 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 result = JSON.parseObject(resultJson, SdmResponse.class); return result; diff --git a/system/src/main/java/com/sdm/system/service/impl/CID/CIDSysRoleServiceImpl.java b/system/src/main/java/com/sdm/system/service/impl/CID/CIDSysRoleServiceImpl.java index 5068112b..c1020c12 100644 --- a/system/src/main/java/com/sdm/system/service/impl/CID/CIDSysRoleServiceImpl.java +++ b/system/src/main/java/com/sdm/system/service/impl/CID/CIDSysRoleServiceImpl.java @@ -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 i Map 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 respSdmResponse = JSON.parseObject(resultJson, SdmResponse.class); return respSdmResponse; } catch (Exception e) { @@ -84,10 +82,11 @@ public class CIDSysRoleServiceImpl extends ServiceImpl i } @Override - public SdmResponse getRoleById(Long id) { + public SdmResponse getRoleById(Long roleId, Long tenantId) { try { Map paramMap = new HashMap<>(); - paramMap.put("id", id); + paramMap.put("roleId", roleId); + paramMap.put("tenantId", tenantId); String resultJson = HttpUtil.get(cidUrl + getRoleById, paramMap); SdmResponse respSdmResponse = JSON.parseObject(resultJson, SdmResponse.class); return SdmResponse.success(respSdmResponse); diff --git a/system/src/main/java/com/sdm/system/service/impl/LocalSysRoleServiceImpl.java b/system/src/main/java/com/sdm/system/service/impl/LocalSysRoleServiceImpl.java index 75429d14..40c73198 100644 --- a/system/src/main/java/com/sdm/system/service/impl/LocalSysRoleServiceImpl.java +++ b/system/src/main/java/com/sdm/system/service/impl/LocalSysRoleServiceImpl.java @@ -83,9 +83,9 @@ public class LocalSysRoleServiceImpl extends ServiceImpl } @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); }