From 01ccc9f4b3786f05cba4851ee6e54f7023e6c76a Mon Sep 17 00:00:00 2001 From: hongawen <83944980@qq.com> Date: Sat, 21 Mar 2026 16:53:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rdms/module/system/api/file/FileApi.java | 73 ------------------- .../system/api/file/dto/FileCreateReqDTO.java | 24 ------ .../module/system/api/logger/LoginLogApi.java | 24 ------ .../api/logger/dto/LoginLogCreateReqDTO.java | 40 ---------- .../api/notify/NotifyMessageSendApi.java | 28 ------- .../dto/NotifySendSingleToUserReqDTO.java | 23 ------ .../module/system/api/permission/RoleApi.java | 25 ------- .../api/websocket/WebSocketSenderApi.java | 55 +++----------- .../websocket/dto/WebSocketSendReqDTO.java | 25 ------- .../module/system/enums/ApiConstants.java | 4 +- .../system/api/config/ConfigApiImpl.java | 2 + .../module/system/api/dept/DeptApiImpl.java | 2 + .../module/system/api/dept/PostApiImpl.java | 2 + .../system/api/dict/DictDataApiImpl.java | 2 + .../module/system/api/file/FileApiImpl.java | 30 -------- .../api/logger/ApiAccessLogApiImpl.java | 2 + .../system/api/logger/ApiErrorLogApiImpl.java | 2 + .../system/api/logger/LoginLogApiImpl.java | 26 ------- .../system/api/logger/OperateLogApiImpl.java | 2 + .../api/notify/NotifyMessageSendApiImpl.java | 32 -------- .../system/api/oauth2/OAuth2TokenApiImpl.java | 2 + .../api/permission/PermissionApiImpl.java | 2 + .../system/api/permission/RoleApiImpl.java | 25 ------- .../system/api/user/AdminUserApiImpl.java | 2 + .../api/websocket/WebSocketSenderApiImpl.java | 24 +++--- .../admin/notice/NoticeController.java | 8 +- .../rpc/config/RpcConfiguration.java | 3 +- .../service/auth/AdminAuthServiceImpl.java | 2 +- .../service/logger/LoginLogService.java | 2 +- .../service/logger/LoginLogServiceImpl.java | 2 +- 30 files changed, 54 insertions(+), 441 deletions(-) delete mode 100644 rdms-system/rdms-system-api/src/main/java/com/njcn/rdms/module/system/api/file/FileApi.java delete mode 100644 rdms-system/rdms-system-api/src/main/java/com/njcn/rdms/module/system/api/file/dto/FileCreateReqDTO.java delete mode 100644 rdms-system/rdms-system-api/src/main/java/com/njcn/rdms/module/system/api/logger/LoginLogApi.java delete mode 100644 rdms-system/rdms-system-api/src/main/java/com/njcn/rdms/module/system/api/logger/dto/LoginLogCreateReqDTO.java delete mode 100644 rdms-system/rdms-system-api/src/main/java/com/njcn/rdms/module/system/api/notify/NotifyMessageSendApi.java delete mode 100644 rdms-system/rdms-system-api/src/main/java/com/njcn/rdms/module/system/api/notify/dto/NotifySendSingleToUserReqDTO.java delete mode 100644 rdms-system/rdms-system-api/src/main/java/com/njcn/rdms/module/system/api/permission/RoleApi.java delete mode 100644 rdms-system/rdms-system-api/src/main/java/com/njcn/rdms/module/system/api/websocket/dto/WebSocketSendReqDTO.java delete mode 100644 rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/api/file/FileApiImpl.java delete mode 100644 rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/api/logger/LoginLogApiImpl.java delete mode 100644 rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/api/notify/NotifyMessageSendApiImpl.java delete mode 100644 rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/api/permission/RoleApiImpl.java diff --git a/rdms-system/rdms-system-api/src/main/java/com/njcn/rdms/module/system/api/file/FileApi.java b/rdms-system/rdms-system-api/src/main/java/com/njcn/rdms/module/system/api/file/FileApi.java deleted file mode 100644 index dbc25b2..0000000 --- a/rdms-system/rdms-system-api/src/main/java/com/njcn/rdms/module/system/api/file/FileApi.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.njcn.rdms.module.system.api.file; - -import com.njcn.rdms.framework.common.pojo.CommonResult; -import com.njcn.rdms.module.system.api.file.dto.FileCreateReqDTO; -import com.njcn.rdms.module.system.enums.ApiConstants; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.validation.Valid; -import jakarta.validation.constraints.NotEmpty; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestParam; - -@FeignClient(name = ApiConstants.NAME) -@Tag(name = "RPC 服务 - 文件") -public interface FileApi { - - String PREFIX = ApiConstants.PREFIX + "/file"; - - /** - * 保存文件，并返回文件的访问路径 - * - * @param content 文件内容 - * @return 文件路径 - */ - default String createFile(byte[] content) { - return createFile(content, null, null, null); - } - - /** - * 保存文件，并返回文件的访问路径 - * - * @param content 文件内容 - * @param name 文件名称，允许空 - * @return 文件路径 - */ - default String createFile(byte[] content, String name) { - return createFile(content, name, null, null); - } - - /** - * 保存文件，并返回文件的访问路径 - * - * @param content 文件内容 - * @param name 文件名称，允许空 - * @param directory 目录，允许空 - * @param type 文件的 MIME 类型，允许空 - * @return 文件路径 - */ - default String createFile(@NotEmpty(message = "文件内容不能为空") byte[] content, - String name, String directory, String type) { - return createFile(new FileCreateReqDTO().setName(name).setDirectory(directory).setType(type).setContent(content)).getCheckedData(); - } - - @PostMapping(PREFIX + "/create") - @Operation(summary = "保存文件，并返回文件的访问路径") - CommonResult createFile(@Valid @RequestBody FileCreateReqDTO createReqDTO); - - /** - * 生成文件预签名地址，用于读取 - * - * @param url 完整的文件访问地址 - * @param expirationSeconds 访问有效期，单位秒 - * @return 文件预签名地址 - */ - @GetMapping(PREFIX + "/presigned-url") - @Operation(summary = "生成文件预签名地址，用于读取") - CommonResult presignGetUrl(@NotEmpty(message = "URL 不能为空") @RequestParam("url") String url, - Integer expirationSeconds); - -} diff --git a/rdms-system/rdms-system-api/src/main/java/com/njcn/rdms/module/system/api/file/dto/FileCreateReqDTO.java b/rdms-system/rdms-system-api/src/main/java/com/njcn/rdms/module/system/api/file/dto/FileCreateReqDTO.java deleted file mode 100644 index 60b5486..0000000 --- a/rdms-system/rdms-system-api/src/main/java/com/njcn/rdms/module/system/api/file/dto/FileCreateReqDTO.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.njcn.rdms.module.system.api.file.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotEmpty; -import lombok.Data; - -@Schema(description = "RPC 服务 - 文件创建 Request DTO") -@Data -public class FileCreateReqDTO { - - @Schema(description = "原文件名称", example = "xxx.png") - private String name; - - @Schema(description = "文件目录", example = "xxx") - private String directory; - - @Schema(description = "文件的 MIME 类型", example = "image/png") - private String type; - - @Schema(description = "文件内容", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "文件内容不能为空") - private byte[] content; - -} diff --git a/rdms-system/rdms-system-api/src/main/java/com/njcn/rdms/module/system/api/logger/LoginLogApi.java b/rdms-system/rdms-system-api/src/main/java/com/njcn/rdms/module/system/api/logger/LoginLogApi.java deleted file mode 100644 index cc0247d..0000000 --- a/rdms-system/rdms-system-api/src/main/java/com/njcn/rdms/module/system/api/logger/LoginLogApi.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.njcn.rdms.module.system.api.logger; - -import com.njcn.rdms.framework.common.pojo.CommonResult; -import com.njcn.rdms.module.system.api.logger.dto.LoginLogCreateReqDTO; -import com.njcn.rdms.module.system.enums.ApiConstants; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Operation; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; - -import jakarta.validation.Valid; - -@FeignClient(name = ApiConstants.NAME) -@Tag(name = "RPC 服务 - 登录日志") -public interface LoginLogApi { - - String PREFIX = ApiConstants.PREFIX + "/login-log"; - - @PostMapping(PREFIX + "/create") - @Operation(summary = "创建登录日志") - CommonResult createLoginLog(@Valid @RequestBody LoginLogCreateReqDTO reqDTO); - -} diff --git a/rdms-system/rdms-system-api/src/main/java/com/njcn/rdms/module/system/api/logger/dto/LoginLogCreateReqDTO.java b/rdms-system/rdms-system-api/src/main/java/com/njcn/rdms/module/system/api/logger/dto/LoginLogCreateReqDTO.java deleted file mode 100644 index d890293..0000000 --- a/rdms-system/rdms-system-api/src/main/java/com/njcn/rdms/module/system/api/logger/dto/LoginLogCreateReqDTO.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.njcn.rdms.module.system.api.logger.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; -import lombok.Data; - -@Schema(description = "RPC 服务 - 登录日志创建 Request DTO") -@Data -public class LoginLogCreateReqDTO { - - @Schema(description = "日志类型，参见 LoginLogTypeEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1" ) - @NotNull(message = "日志类型不能为空") - private Integer logType; - - @Schema(description = "链路追踪编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "89aca178-a370-411c-ae02-3f0d672be4ab") - private String traceId; - - @Schema(description = "用户编号", example = "666") - private Long userId; - @Schema(description = "用户类型，参见 UserTypeEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "2" ) - @NotNull(message = "用户类型不能为空") - private Integer userType; - @Schema(description = "用户账号", example = "rdms") - @Size(max = 30, message = "用户账号长度不能超过30个字符") - private String username; // 不再强制校验 username 非空，兼容无 username 的登录场景 - - @Schema(description = "登录结果，参见 LoginResultEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - @NotNull(message = "登录结果不能为空") - private Integer result; - - @Schema(description = "用户 IP", requiredMode = Schema.RequiredMode.REQUIRED, example = "127.0.0.1") - @NotEmpty(message = "用户 IP 不能为空") - private String userIp; - - @Schema(description = "浏览器 UserAgent", requiredMode = Schema.RequiredMode.REQUIRED, example = "Mozilla/5.0") - private String userAgent; - -} diff --git a/rdms-system/rdms-system-api/src/main/java/com/njcn/rdms/module/system/api/notify/NotifyMessageSendApi.java b/rdms-system/rdms-system-api/src/main/java/com/njcn/rdms/module/system/api/notify/NotifyMessageSendApi.java deleted file mode 100644 index a60e6fb..0000000 --- a/rdms-system/rdms-system-api/src/main/java/com/njcn/rdms/module/system/api/notify/NotifyMessageSendApi.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.njcn.rdms.module.system.api.notify; - -import com.njcn.rdms.framework.common.pojo.CommonResult; -import com.njcn.rdms.module.system.api.notify.dto.NotifySendSingleToUserReqDTO; -import com.njcn.rdms.module.system.enums.ApiConstants; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Operation; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.PostMapping; - -import jakarta.validation.Valid; -import org.springframework.web.bind.annotation.RequestBody; - -@FeignClient(name = ApiConstants.NAME) -@Tag(name = "RPC 服务 - 站内信发送") -public interface NotifyMessageSendApi { - - String PREFIX = ApiConstants.PREFIX + "/notify/send"; - - @PostMapping(PREFIX + "/send-single-admin") - @Operation(summary = "发送单条站内信给 Admin 用户") - CommonResult sendSingleMessageToAdmin(@Valid @RequestBody NotifySendSingleToUserReqDTO reqDTO); - - @PostMapping(PREFIX + "/send-single-member") - @Operation(summary = "发送单条站内信给 Member 用户") - CommonResult sendSingleMessageToMember(@Valid @RequestBody NotifySendSingleToUserReqDTO reqDTO); - -} diff --git a/rdms-system/rdms-system-api/src/main/java/com/njcn/rdms/module/system/api/notify/dto/NotifySendSingleToUserReqDTO.java b/rdms-system/rdms-system-api/src/main/java/com/njcn/rdms/module/system/api/notify/dto/NotifySendSingleToUserReqDTO.java deleted file mode 100644 index a0e229a..0000000 --- a/rdms-system/rdms-system-api/src/main/java/com/njcn/rdms/module/system/api/notify/dto/NotifySendSingleToUserReqDTO.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.njcn.rdms.module.system.api.notify.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; -import java.util.Map; - -@Schema(description = "RPC 服务 - 站内信发送给 Admin 或者 Member 用户 Request DTO") -@Data -public class NotifySendSingleToUserReqDTO { - - @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") - @NotNull(message = "用户编号不能为空") - private Long userId; - - @Schema(description = "站内信模板编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "USER_SEND") - @NotEmpty(message = "站内信模板编号不能为空") - private String templateCode; - @Schema(description = "邮件模板参数") - private Map templateParams; -} diff --git a/rdms-system/rdms-system-api/src/main/java/com/njcn/rdms/module/system/api/permission/RoleApi.java b/rdms-system/rdms-system-api/src/main/java/com/njcn/rdms/module/system/api/permission/RoleApi.java deleted file mode 100644 index 88fe63a..0000000 --- a/rdms-system/rdms-system-api/src/main/java/com/njcn/rdms/module/system/api/permission/RoleApi.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.njcn.rdms.module.system.api.permission; - -import com.njcn.rdms.framework.common.pojo.CommonResult; -import com.njcn.rdms.module.system.enums.ApiConstants; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestParam; - -import java.util.Collection; - -@FeignClient(name = ApiConstants.NAME) -@Tag(name = "RPC 服务 - 角色") -public interface RoleApi { - - String PREFIX = ApiConstants.PREFIX + "/role"; - - @GetMapping(PREFIX + "/valid") - @Operation(summary = "校验角色是否合法") - @Parameter(name = "ids", description = "角色编号数组", example = "1,2", required = true) - CommonResult validRoleList(@RequestParam("ids") Collection ids); - -} \ No newline at end of file diff --git a/rdms-system/rdms-system-api/src/main/java/com/njcn/rdms/module/system/api/websocket/WebSocketSenderApi.java b/rdms-system/rdms-system-api/src/main/java/com/njcn/rdms/module/system/api/websocket/WebSocketSenderApi.java index 052e6c2..d762544 100644 --- a/rdms-system/rdms-system-api/src/main/java/com/njcn/rdms/module/system/api/websocket/WebSocketSenderApi.java +++ b/rdms-system/rdms-system-api/src/main/java/com/njcn/rdms/module/system/api/websocket/WebSocketSenderApi.java @@ -2,7 +2,7 @@ package com.njcn.rdms.module.system.api.websocket; import com.njcn.rdms.framework.common.pojo.CommonResult; import com.njcn.rdms.framework.common.util.json.JsonUtils; -import com.njcn.rdms.module.system.api.websocket.dto.WebSocketSendReqDTO; +import com.njcn.rdms.module.system.api.websocket.dto.WebSocketSendToUsersReqDTO; import com.njcn.rdms.module.system.enums.ApiConstants; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -11,63 +11,32 @@ import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; +import java.util.Collection; + @FeignClient(name = ApiConstants.NAME) @Tag(name = "RPC 服务 - WebSocket 发送器的") // 对 WebSocketMessageSender 进行封装，提供给其它模块使用 public interface WebSocketSenderApi { String PREFIX = ApiConstants.PREFIX + "/websocket"; - @PostMapping(PREFIX + "/send") - @Operation(summary = "发送 WebSocket 消息") - CommonResult send(@Valid @RequestBody WebSocketSendReqDTO message); + @PostMapping(PREFIX + "/send-to-users") + @Operation(summary = "按用户编号集合发送 WebSocket 消息") + CommonResult sendToUsers(@Valid @RequestBody WebSocketSendToUsersReqDTO message); /** - * 发送消息给指定用户 + * 发送消息给指定用户集合 * - * @param userType 用户类型 - * @param userId 用户编号 + * @param userIds 用户编号集合 * @param messageType 消息类型 * @param messageContent 消息内容，JSON 格式 */ - default void send(Integer userType, Long userId, String messageType, String messageContent) { - send(new WebSocketSendReqDTO().setUserType(userType).setUserId(userId) + default void send(Collection userIds, String messageType, String messageContent) { + sendToUsers(new WebSocketSendToUsersReqDTO().setUserIds(userIds) .setMessageType(messageType).setMessageContent(messageContent)).checkError(); } - /** - * 发送消息给指定用户类型 - * - * @param userType 用户类型 - * @param messageType 消息类型 - * @param messageContent 消息内容，JSON 格式 - */ - default void send(Integer userType, String messageType, String messageContent) { - send(new WebSocketSendReqDTO().setUserType(userType) - .setMessageType(messageType).setMessageContent(messageContent)).checkError(); - } - - /** - * 发送消息给指定 Session - * - * @param sessionId Session 编号 - * @param messageType 消息类型 - * @param messageContent 消息内容，JSON 格式 - */ - default void send(String sessionId, String messageType, String messageContent) { - send(new WebSocketSendReqDTO().setSessionId(sessionId) - .setMessageType(messageType).setMessageContent(messageContent)).checkError(); - } - - default void sendObject(Integer userType, Long userId, String messageType, Object messageContent) { - send(userType, userId, messageType, JsonUtils.toJsonString(messageContent)); - } - - default void sendObject(Integer userType, String messageType, Object messageContent) { - send(userType, messageType, JsonUtils.toJsonString(messageContent)); - } - - default void sendObject(String sessionId, String messageType, Object messageContent) { - send(sessionId, messageType, JsonUtils.toJsonString(messageContent)); + default void sendObject(Collection userIds, String messageType, Object messageContent) { + send(userIds, messageType, JsonUtils.toJsonString(messageContent)); } } diff --git a/rdms-system/rdms-system-api/src/main/java/com/njcn/rdms/module/system/api/websocket/dto/WebSocketSendReqDTO.java b/rdms-system/rdms-system-api/src/main/java/com/njcn/rdms/module/system/api/websocket/dto/WebSocketSendReqDTO.java deleted file mode 100644 index 33e8075..0000000 --- a/rdms-system/rdms-system-api/src/main/java/com/njcn/rdms/module/system/api/websocket/dto/WebSocketSendReqDTO.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.njcn.rdms.module.system.api.websocket.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotEmpty; -import lombok.Data; - -@Schema(description = "RPC 服务 - WebSocket 消息发送 Request DTO") -@Data -public class WebSocketSendReqDTO { - - @Schema(description = "Session 编号", example = "abc") - private String sessionId; - @Schema(description = "用户编号", example = "1024") - private Long userId; - @Schema(description = "用户类型", example = "1") - private Integer userType; - - @Schema(description = "消息类型", example = "demo-message") - @NotEmpty(message = "消息类型不能为空") - private String messageType; - @Schema(description = "消息内容", example = "{\"name\":\"李四\"}}") - @NotEmpty(message = "消息内容不能为空") - private String messageContent; - -} diff --git a/rdms-system/rdms-system-api/src/main/java/com/njcn/rdms/module/system/enums/ApiConstants.java b/rdms-system/rdms-system-api/src/main/java/com/njcn/rdms/module/system/enums/ApiConstants.java index 2cb507f..632e567 100644 --- a/rdms-system/rdms-system-api/src/main/java/com/njcn/rdms/module/system/enums/ApiConstants.java +++ b/rdms-system/rdms-system-api/src/main/java/com/njcn/rdms/module/system/enums/ApiConstants.java @@ -14,9 +14,9 @@ public class ApiConstants { * * 注意，需要保证和 spring.application.name 保持一致 */ - public static final String NAME = "rdms-system-server"; + public static final String NAME = RpcConstants.SYSTEM_NAME; - public static final String PREFIX = RpcConstants.RPC_API_PREFIX + "/system"; + public static final String PREFIX = RpcConstants.SYSTEM_PREFIX; public static final String VERSION = "1.0.0"; diff --git a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/api/config/ConfigApiImpl.java b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/api/config/ConfigApiImpl.java index 2aa5704..a6aae1a 100644 --- a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/api/config/ConfigApiImpl.java +++ b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/api/config/ConfigApiImpl.java @@ -3,6 +3,7 @@ package com.njcn.rdms.module.system.api.config; import com.njcn.rdms.framework.common.pojo.CommonResult; import com.njcn.rdms.module.system.dal.dataobject.config.ConfigDO; import com.njcn.rdms.module.system.service.config.ConfigService; +import io.swagger.v3.oas.annotations.Hidden; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RestController; @@ -11,6 +12,7 @@ import static com.njcn.rdms.framework.common.pojo.CommonResult.success; @RestController // 提供 RESTful API 接口，给 Feign 调用 @Validated +@Hidden public class ConfigApiImpl implements ConfigApi { @Resource diff --git a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/api/dept/DeptApiImpl.java b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/api/dept/DeptApiImpl.java index 15ee45c..9e91f8b 100644 --- a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/api/dept/DeptApiImpl.java +++ b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/api/dept/DeptApiImpl.java @@ -5,6 +5,7 @@ import com.njcn.rdms.framework.common.util.object.BeanUtils; import com.njcn.rdms.module.system.api.dept.dto.DeptRespDTO; import com.njcn.rdms.module.system.dal.dataobject.dept.DeptDO; import com.njcn.rdms.module.system.service.dept.DeptService; +import io.swagger.v3.oas.annotations.Hidden; import org.springframework.context.annotation.Bean; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RestController; @@ -17,6 +18,7 @@ import static com.njcn.rdms.framework.common.pojo.CommonResult.success; @RestController // 提供 RESTful API 接口，给 Feign 调用 @Validated +@Hidden public class DeptApiImpl implements DeptApi { @Resource diff --git a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/api/dept/PostApiImpl.java b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/api/dept/PostApiImpl.java index 74770a9..1429f34 100644 --- a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/api/dept/PostApiImpl.java +++ b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/api/dept/PostApiImpl.java @@ -5,6 +5,7 @@ import com.njcn.rdms.framework.common.util.object.BeanUtils; import com.njcn.rdms.module.system.api.dept.dto.PostRespDTO; import com.njcn.rdms.module.system.dal.dataobject.dept.PostDO; import com.njcn.rdms.module.system.service.dept.PostService; +import io.swagger.v3.oas.annotations.Hidden; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RestController; @@ -16,6 +17,7 @@ import static com.njcn.rdms.framework.common.pojo.CommonResult.success; @RestController // 提供 RESTful API 接口，给 Feign 调用 @Validated +@Hidden public class PostApiImpl implements PostApi { @Resource diff --git a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/api/dict/DictDataApiImpl.java b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/api/dict/DictDataApiImpl.java index 13f3cc9..9db8bd5 100644 --- a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/api/dict/DictDataApiImpl.java +++ b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/api/dict/DictDataApiImpl.java @@ -5,6 +5,7 @@ import com.njcn.rdms.framework.common.util.object.BeanUtils; import com.njcn.rdms.framework.common.biz.system.dict.dto.DictDataRespDTO; import com.njcn.rdms.module.system.dal.dataobject.dict.DictDataDO; import com.njcn.rdms.module.system.service.dict.DictDataService; +import io.swagger.v3.oas.annotations.Hidden; import org.springframework.context.annotation.Primary; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RestController; @@ -18,6 +19,7 @@ import static com.njcn.rdms.framework.common.pojo.CommonResult.success; @RestController // 提供 RESTful API 接口，给 Feign 调用 @Validated @Primary // 由于 DictDataCommonApi 的存在，必须声明为 @Primary Bean +@Hidden public class DictDataApiImpl implements DictDataApi { @Resource diff --git a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/api/file/FileApiImpl.java b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/api/file/FileApiImpl.java deleted file mode 100644 index ff56737..0000000 --- a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/api/file/FileApiImpl.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.njcn.rdms.module.system.api.file; - -import com.njcn.rdms.framework.common.pojo.CommonResult; -import com.njcn.rdms.module.system.api.file.dto.FileCreateReqDTO; -import com.njcn.rdms.module.system.service.file.FileService; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.RestController; - -import static com.njcn.rdms.framework.common.pojo.CommonResult.success; - -@RestController // 提供 RESTful API 接口，给 Feign 调用 -@Validated -public class FileApiImpl implements FileApi { - - @Resource - private FileService fileService; - - @Override - public CommonResult createFile(FileCreateReqDTO createReqDTO) { - return success(fileService.createFile(createReqDTO.getContent(), createReqDTO.getName(), - createReqDTO.getDirectory(), createReqDTO.getType())); - } - - @Override - public CommonResult presignGetUrl(String url, Integer expirationSeconds) { - return success(fileService.presignGetUrl(url, expirationSeconds)); - } - -} diff --git a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/api/logger/ApiAccessLogApiImpl.java b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/api/logger/ApiAccessLogApiImpl.java index a61516a..a6c26ff 100644 --- a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/api/logger/ApiAccessLogApiImpl.java +++ b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/api/logger/ApiAccessLogApiImpl.java @@ -4,6 +4,7 @@ import com.njcn.rdms.framework.common.biz.system.logger.ApiAccessLogCommonApi; import com.njcn.rdms.framework.common.biz.system.logger.dto.ApiAccessLogCreateReqDTO; import com.njcn.rdms.framework.common.pojo.CommonResult; import com.njcn.rdms.module.system.service.logger.ApiAccessLogService; +import io.swagger.v3.oas.annotations.Hidden; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RestController; @@ -12,6 +13,7 @@ import static com.njcn.rdms.framework.common.pojo.CommonResult.success; @RestController // 提供 RESTful API 接口，给 Feign 调用 @Validated +@Hidden public class ApiAccessLogApiImpl implements ApiAccessLogCommonApi { @Resource diff --git a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/api/logger/ApiErrorLogApiImpl.java b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/api/logger/ApiErrorLogApiImpl.java index 0f621d8..68dafb8 100644 --- a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/api/logger/ApiErrorLogApiImpl.java +++ b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/api/logger/ApiErrorLogApiImpl.java @@ -4,6 +4,7 @@ import com.njcn.rdms.framework.common.biz.system.logger.ApiErrorLogCommonApi; import com.njcn.rdms.framework.common.biz.system.logger.dto.ApiErrorLogCreateReqDTO; import com.njcn.rdms.framework.common.pojo.CommonResult; import com.njcn.rdms.module.system.service.logger.ApiErrorLogService; +import io.swagger.v3.oas.annotations.Hidden; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RestController; @@ -12,6 +13,7 @@ import static com.njcn.rdms.framework.common.pojo.CommonResult.success; @RestController // 提供 RESTful API 接口，给 Feign 调用 @Validated +@Hidden public class ApiErrorLogApiImpl implements ApiErrorLogCommonApi { @Resource diff --git a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/api/logger/LoginLogApiImpl.java b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/api/logger/LoginLogApiImpl.java deleted file mode 100644 index b1afd15..0000000 --- a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/api/logger/LoginLogApiImpl.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.njcn.rdms.module.system.api.logger; - -import com.njcn.rdms.framework.common.pojo.CommonResult; -import com.njcn.rdms.module.system.api.logger.dto.LoginLogCreateReqDTO; -import com.njcn.rdms.module.system.service.logger.LoginLogService; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.RestController; - -import jakarta.annotation.Resource; - -import static com.njcn.rdms.framework.common.pojo.CommonResult.success; - -@RestController // 提供 RESTful API 接口，给 Feign 调用 -@Validated -public class LoginLogApiImpl implements LoginLogApi { - - @Resource - private LoginLogService loginLogService; - - @Override - public CommonResult createLoginLog(LoginLogCreateReqDTO reqDTO) { - loginLogService.createLoginLog(reqDTO); - return success(true); - } - -} diff --git a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/api/logger/OperateLogApiImpl.java b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/api/logger/OperateLogApiImpl.java index 87598c7..656e9fd 100644 --- a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/api/logger/OperateLogApiImpl.java +++ b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/api/logger/OperateLogApiImpl.java @@ -8,6 +8,7 @@ import com.njcn.rdms.module.system.api.logger.dto.OperateLogPageReqDTO; import com.njcn.rdms.module.system.api.logger.dto.OperateLogRespDTO; import com.njcn.rdms.module.system.dal.dataobject.logger.OperateLogDO; import com.njcn.rdms.module.system.service.logger.OperateLogService; +import io.swagger.v3.oas.annotations.Hidden; import jakarta.annotation.Resource; import org.springframework.context.annotation.Primary; import org.springframework.validation.annotation.Validated; @@ -18,6 +19,7 @@ import static com.njcn.rdms.framework.common.pojo.CommonResult.success; @RestController // 提供 RESTful API 接口，给 Feign 调用 @Validated @Primary // 由于 OperateLogCommonApi 的存在，必须声明为 @Primary Bean +@Hidden public class OperateLogApiImpl implements OperateLogApi { @Resource diff --git a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/api/notify/NotifyMessageSendApiImpl.java b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/api/notify/NotifyMessageSendApiImpl.java deleted file mode 100644 index 78cd6ea..0000000 --- a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/api/notify/NotifyMessageSendApiImpl.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.njcn.rdms.module.system.api.notify; - -import com.njcn.rdms.framework.common.pojo.CommonResult; -import com.njcn.rdms.module.system.api.notify.dto.NotifySendSingleToUserReqDTO; -import com.njcn.rdms.module.system.service.notify.NotifySendService; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.RestController; - -import jakarta.annotation.Resource; - -import static com.njcn.rdms.framework.common.pojo.CommonResult.success; - -@RestController // 提供 RESTful API 接口，给 Feign 调用 -@Validated -public class NotifyMessageSendApiImpl implements NotifyMessageSendApi { - - @Resource - private NotifySendService notifySendService; - - @Override - public CommonResult sendSingleMessageToAdmin(NotifySendSingleToUserReqDTO reqDTO) { - return success(notifySendService.sendSingleNotifyToAdmin(reqDTO.getUserId(), - reqDTO.getTemplateCode(), reqDTO.getTemplateParams())); - } - - @Override - public CommonResult sendSingleMessageToMember(NotifySendSingleToUserReqDTO reqDTO) { - return success(notifySendService.sendSingleNotifyToMember(reqDTO.getUserId(), - reqDTO.getTemplateCode(), reqDTO.getTemplateParams())); - } - -} diff --git a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/api/oauth2/OAuth2TokenApiImpl.java b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/api/oauth2/OAuth2TokenApiImpl.java index 959ca7b..774cf39 100644 --- a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/api/oauth2/OAuth2TokenApiImpl.java +++ b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/api/oauth2/OAuth2TokenApiImpl.java @@ -8,6 +8,7 @@ import com.njcn.rdms.framework.common.pojo.CommonResult; import com.njcn.rdms.framework.common.util.object.BeanUtils; import com.njcn.rdms.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO; import com.njcn.rdms.module.system.service.oauth2.OAuth2TokenService; +import io.swagger.v3.oas.annotations.Hidden; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RestController; @@ -16,6 +17,7 @@ import static com.njcn.rdms.framework.common.pojo.CommonResult.success; @RestController @Validated +@Hidden public class OAuth2TokenApiImpl implements OAuth2TokenCommonApi { @Resource diff --git a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/api/permission/PermissionApiImpl.java b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/api/permission/PermissionApiImpl.java index 03093cf..4d978a7 100644 --- a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/api/permission/PermissionApiImpl.java +++ b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/api/permission/PermissionApiImpl.java @@ -2,6 +2,7 @@ package com.njcn.rdms.module.system.api.permission; import com.njcn.rdms.framework.common.pojo.CommonResult; import com.njcn.rdms.module.system.service.permission.PermissionService; +import io.swagger.v3.oas.annotations.Hidden; import org.springframework.context.annotation.Primary; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RestController; @@ -15,6 +16,7 @@ import static com.njcn.rdms.framework.common.pojo.CommonResult.success; @RestController // 提供 RESTful API 接口，给 Feign 调用 @Validated @Primary // 由于 PermissionCommonApi 的存在，必须声明为 @Primary Bean +@Hidden public class PermissionApiImpl implements PermissionApi { @Resource diff --git a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/api/permission/RoleApiImpl.java b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/api/permission/RoleApiImpl.java deleted file mode 100644 index 659c928..0000000 --- a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/api/permission/RoleApiImpl.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.njcn.rdms.module.system.api.permission; - -import com.njcn.rdms.framework.common.pojo.CommonResult; -import com.njcn.rdms.module.system.service.permission.RoleService; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.RestController; - -import jakarta.annotation.Resource; -import java.util.Collection; - -import static com.njcn.rdms.framework.common.pojo.CommonResult.success; - -@RestController // 提供 RESTful API 接口，给 Feign 调用 -@Validated -public class RoleApiImpl implements RoleApi { - - @Resource - private RoleService roleService; - - @Override - public CommonResult validRoleList(Collection ids) { - roleService.validateRoleList(ids); - return success(true); - } -} diff --git a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/api/user/AdminUserApiImpl.java b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/api/user/AdminUserApiImpl.java index 5cbff3a..4591326 100644 --- a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/api/user/AdminUserApiImpl.java +++ b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/api/user/AdminUserApiImpl.java @@ -5,6 +5,7 @@ import com.njcn.rdms.framework.common.util.object.BeanUtils; import com.njcn.rdms.module.system.api.user.dto.AdminUserRespDTO; import com.njcn.rdms.module.system.dal.dataobject.user.AdminUserDO; import com.njcn.rdms.module.system.service.user.AdminUserService; +import io.swagger.v3.oas.annotations.Hidden; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RestController; @@ -16,6 +17,7 @@ import static com.njcn.rdms.framework.common.pojo.CommonResult.success; @RestController // 提供 RESTful API 接口，给 Feign 调用 @Validated +@Hidden public class AdminUserApiImpl implements AdminUserApi { @Resource diff --git a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/api/websocket/WebSocketSenderApiImpl.java b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/api/websocket/WebSocketSenderApiImpl.java index 883bd44..1760c95 100644 --- a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/api/websocket/WebSocketSenderApiImpl.java +++ b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/api/websocket/WebSocketSenderApiImpl.java @@ -1,9 +1,11 @@ package com.njcn.rdms.module.system.api.websocket; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.collection.CollUtil; import com.njcn.rdms.framework.common.pojo.CommonResult; +import com.njcn.rdms.framework.common.enums.UserTypeEnum; import com.njcn.rdms.framework.websocket.core.sender.WebSocketMessageSender; -import com.njcn.rdms.module.system.api.websocket.dto.WebSocketSendReqDTO; +import com.njcn.rdms.module.system.api.websocket.dto.WebSocketSendToUsersReqDTO; +import io.swagger.v3.oas.annotations.Hidden; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RestController; @@ -12,22 +14,20 @@ import static com.njcn.rdms.framework.common.pojo.CommonResult.success; @RestController // 提供 RESTful API 接口，给 Feign 调用 @Validated +@Hidden public class WebSocketSenderApiImpl implements WebSocketSenderApi { + private static final Integer SYSTEM_USER_TYPE = UserTypeEnum.ADMIN.getValue(); + @Resource private WebSocketMessageSender webSocketMessageSender; @Override - public CommonResult send(WebSocketSendReqDTO message) { - if (StrUtil.isNotEmpty(message.getSessionId())) { - webSocketMessageSender.send(message.getSessionId(), - message.getMessageType(), message.getMessageContent()); - } else if (message.getUserType() != null && message.getUserId() != null) { - webSocketMessageSender.send(message.getUserType(), message.getUserId(), - message.getMessageType(), message.getMessageContent()); - } else if (message.getUserType() != null) { - webSocketMessageSender.send(message.getUserType(), - message.getMessageType(), message.getMessageContent()); + public CommonResult sendToUsers(WebSocketSendToUsersReqDTO message) { + if (CollUtil.isNotEmpty(message.getUserIds())) { + message.getUserIds().stream().distinct().forEach(userId -> + webSocketMessageSender.send(SYSTEM_USER_TYPE, userId, + message.getMessageType(), message.getMessageContent())); } return success(true); } diff --git a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/controller/admin/notice/NoticeController.java b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/controller/admin/notice/NoticeController.java index 2f24980..2874a52 100644 --- a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/controller/admin/notice/NoticeController.java +++ b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/controller/admin/notice/NoticeController.java @@ -1,16 +1,16 @@ package com.njcn.rdms.module.system.controller.admin.notice; import cn.hutool.core.lang.Assert; -import com.njcn.rdms.framework.common.enums.UserTypeEnum; import com.njcn.rdms.framework.common.pojo.CommonResult; import com.njcn.rdms.framework.common.pojo.PageResult; import com.njcn.rdms.framework.common.util.object.BeanUtils; -import com.njcn.rdms.module.system.api.websocket.WebSocketSenderApi; import com.njcn.rdms.module.system.controller.admin.notice.vo.NoticePageReqVO; import com.njcn.rdms.module.system.controller.admin.notice.vo.NoticeRespVO; import com.njcn.rdms.module.system.controller.admin.notice.vo.NoticeSaveReqVO; import com.njcn.rdms.module.system.dal.dataobject.notice.NoticeDO; import com.njcn.rdms.module.system.service.notice.NoticeService; +import com.njcn.rdms.framework.common.enums.UserTypeEnum; +import com.njcn.rdms.framework.websocket.core.sender.WebSocketMessageSender; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -34,7 +34,7 @@ public class NoticeController { private NoticeService noticeService; @Resource - private WebSocketSenderApi webSocketSenderApi; + private WebSocketMessageSender webSocketMessageSender; @PostMapping("/create") @Operation(summary = "创建通知公告") @@ -95,7 +95,7 @@ public class NoticeController { NoticeDO notice = noticeService.getNotice(id); Assert.notNull(notice, "公告不能为空"); // 通过 websocket 推送给在线的用户 - webSocketSenderApi.sendObject(UserTypeEnum.ADMIN.getValue(), "notice-push", notice); + webSocketMessageSender.sendObject(UserTypeEnum.ADMIN.getValue(), "notice-push", notice); return success(true); } diff --git a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/framework/rpc/config/RpcConfiguration.java b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/framework/rpc/config/RpcConfiguration.java index 07a7a1a..3160be1 100644 --- a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/framework/rpc/config/RpcConfiguration.java +++ b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/framework/rpc/config/RpcConfiguration.java @@ -1,12 +1,11 @@ package com.njcn.rdms.module.system.framework.rpc.config; import com.njcn.rdms.module.system.api.config.ConfigApi; -import com.njcn.rdms.module.system.api.file.FileApi; import com.njcn.rdms.module.system.api.websocket.WebSocketSenderApi; import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.Configuration; @Configuration(value = "systemRpcConfiguration", proxyBeanMethods = false) -@EnableFeignClients(clients = {FileApi.class, WebSocketSenderApi.class, ConfigApi.class}) +@EnableFeignClients(clients = {WebSocketSenderApi.class, ConfigApi.class}) public class RpcConfiguration { } diff --git a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/service/auth/AdminAuthServiceImpl.java b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/service/auth/AdminAuthServiceImpl.java index fc101ed..beb0dc5 100644 --- a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/service/auth/AdminAuthServiceImpl.java +++ b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/service/auth/AdminAuthServiceImpl.java @@ -11,7 +11,6 @@ import com.njcn.rdms.framework.common.util.monitor.TracerUtils; import com.njcn.rdms.framework.common.util.object.BeanUtils; import com.njcn.rdms.framework.common.util.servlet.ServletUtils; import com.njcn.rdms.framework.common.util.validation.ValidationUtils; -import com.njcn.rdms.module.system.api.logger.dto.LoginLogCreateReqDTO; import com.njcn.rdms.module.system.controller.admin.auth.vo.AuthLoginReqVO; import com.njcn.rdms.module.system.controller.admin.auth.vo.AuthLoginRespVO; import com.njcn.rdms.module.system.controller.admin.auth.vo.AuthRegisterReqVO; @@ -22,6 +21,7 @@ import com.njcn.rdms.module.system.enums.logger.LoginLogTypeEnum; import com.njcn.rdms.module.system.enums.logger.LoginResultEnum; import com.njcn.rdms.module.system.enums.oauth2.OAuth2ClientConstants; import com.njcn.rdms.module.system.service.logger.LoginLogService; +import com.njcn.rdms.module.system.service.logger.dto.LoginLogCreateReqDTO; import com.njcn.rdms.module.system.service.member.MemberService; import com.njcn.rdms.module.system.service.oauth2.OAuth2TokenService; import com.njcn.rdms.module.system.service.user.AdminUserService; diff --git a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/service/logger/LoginLogService.java b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/service/logger/LoginLogService.java index c34e355..b0ee651 100644 --- a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/service/logger/LoginLogService.java +++ b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/service/logger/LoginLogService.java @@ -1,7 +1,7 @@ package com.njcn.rdms.module.system.service.logger; import com.njcn.rdms.framework.common.pojo.PageResult; -import com.njcn.rdms.module.system.api.logger.dto.LoginLogCreateReqDTO; +import com.njcn.rdms.module.system.service.logger.dto.LoginLogCreateReqDTO; import com.njcn.rdms.module.system.controller.admin.logger.vo.loginlog.LoginLogPageReqVO; import com.njcn.rdms.module.system.dal.dataobject.logger.LoginLogDO; diff --git a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/service/logger/LoginLogServiceImpl.java b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/service/logger/LoginLogServiceImpl.java index 81d86e2..91b8ccc 100644 --- a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/service/logger/LoginLogServiceImpl.java +++ b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/service/logger/LoginLogServiceImpl.java @@ -2,7 +2,7 @@ package com.njcn.rdms.module.system.service.logger; import com.njcn.rdms.framework.common.pojo.PageResult; import com.njcn.rdms.framework.common.util.object.BeanUtils; -import com.njcn.rdms.module.system.api.logger.dto.LoginLogCreateReqDTO; +import com.njcn.rdms.module.system.service.logger.dto.LoginLogCreateReqDTO; import com.njcn.rdms.module.system.controller.admin.logger.vo.loginlog.LoginLogPageReqVO; import com.njcn.rdms.module.system.dal.dataobject.logger.LoginLogDO; import com.njcn.rdms.module.system.dal.mysql.logger.LoginLogMapper;