From d3fd80e24a6b779bdcb6960aa5abe585f79029a2 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Fri, 4 Sep 2026 10:00:15 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=A2=9E=E5=BC=BA=E5=AF=B9=20JDK8?= =?UTF-8?q?=20=E7=9A=84=E5=85=BC=E5=AE=B9=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...sKnowledgeContentPermissionController.java | 4 +-- .../PmsKnowledgeDocumentController.java | 4 +-- .../PmsKnowledgeDocumentLabelController.java | 4 +-- .../content/PmsKnowledgeFolderController.java | 4 +-- .../PmsKnowledgeDocumentCreateReqVO.java | 10 +++--- .../PmsKnowledgeDocumentMoveReqVO.java | 2 +- .../PmsKnowledgeDocumentUpdateReqVO.java | 8 ++--- .../folder/PmsKnowledgeFolderMoveReqVO.java | 2 +- .../folder/PmsKnowledgeFolderSaveReqVO.java | 6 ++-- .../PmsKnowledgeDocumentLabelPageReqVO.java | 2 +- .../PmsKnowledgeDocumentLabelSaveReqVO.java | 4 +-- ...KnowledgeContentPermissionUpdateReqVO.java | 6 ++-- ...PmsKnowledgeDocumentCommentController.java | 4 +-- .../PmsKnowledgeDocumentLikeController.java | 2 +- .../PmsKnowledgeDocumentShareController.java | 8 ++--- .../PmsKnowledgeFavoriteController.java | 4 +-- .../PmsKnowledgeViewRecordController.java | 2 +- .../PmsKnowledgeDocumentCommentSaveReqVO.java | 6 ++-- .../PmsKnowledgeFavoriteSaveReqVO.java | 2 +- .../PmsKnowledgeDocumentShareSaveReqVO.java | 2 +- ...dgeDocumentShareUpdateMemberListReqVO.java | 2 +- .../library/PmsKnowledgeGroupController.java | 4 +-- .../PmsKnowledgeLibraryController.java | 4 +-- .../PmsKnowledgeLibraryMemberController.java | 4 +-- ...PmsKnowledgeLibraryTemplateController.java | 4 +-- .../vo/group/PmsKnowledgeGroupSaveReqVO.java | 4 +-- .../vo/group/PmsKnowledgeGroupSortReqVO.java | 8 ++--- .../PmsKnowledgeLibraryMoveGroupReqVO.java | 2 +- .../library/PmsKnowledgeLibrarySaveReqVO.java | 8 ++--- ...KnowledgeLibraryUpdateMemberListReqVO.java | 6 ++-- .../PmsKnowledgeLibraryTemplateSaveReqVO.java | 12 +++---- .../PmsKnowledgeRecycleController.java | 2 +- .../pm/iteration/PmsIterationController.java | 4 +-- .../iteration/vo/PmsIterationPageReqVO.java | 2 +- .../iteration/vo/PmsIterationSaveReqVO.java | 8 ++--- .../iteration/vo/PmsIterationStartReqVO.java | 4 +-- .../PmsProjectAnnouncementController.java | 4 +-- .../pm/project/PmsProjectController.java | 4 +-- .../project/PmsProjectFavoriteController.java | 2 +- .../pm/project/PmsProjectGroupController.java | 4 +-- .../project/PmsProjectMemberController.java | 4 +-- .../project/PmsProjectTemplateController.java | 4 +-- .../PmsProjectAnnouncementSaveReqVO.java | 6 ++-- .../vo/group/PmsProjectGroupMoveReqVO.java | 2 +- .../vo/group/PmsProjectGroupSaveReqVO.java | 4 +-- .../vo/group/PmsProjectGroupSortReqVO.java | 8 ++--- .../vo/member/PmsProjectMemberSaveReqVO.java | 6 ++-- .../vo/project/PmsProjectSaveReqVO.java | 8 ++--- .../template/PmsProjectTemplateSaveReqVO.java | 10 +++--- .../pm/workbench/PmsWorkbenchController.java | 4 +-- .../PmsWorkItemActivityController.java | 2 +- .../PmsWorkItemCommentController.java | 4 +-- .../pm/workitem/PmsWorkItemController.java | 6 ++-- .../workitem/PmsWorkItemLabelController.java | 4 +-- .../workitem/PmsWorkItemStatusController.java | 4 +-- .../PmsWorkItemWorkLogController.java | 4 +-- .../comment/PmsWorkItemCommentSaveReqVO.java | 6 ++-- .../vo/label/PmsWorkItemLabelSaveReqVO.java | 4 +-- .../PmsWorkItemBoardConfigSaveReqVO.java | 8 ++--- .../PmsWorkItemStatusConfigUpdateReqVO.java | 6 ++-- .../status/PmsWorkItemStatusCreateReqVO.java | 6 ++-- .../status/PmsWorkItemStatusDeleteReqVO.java | 2 +- .../vo/status/PmsWorkItemStatusSortReqVO.java | 4 +-- .../status/PmsWorkItemStatusUpdateReqVO.java | 2 +- .../vo/workitem/PmsWorkItemBoardReqVO.java | 2 +- .../vo/workitem/PmsWorkItemImportExcelVO.java | 4 +-- .../PmsWorkItemIterationUpdateReqVO.java | 2 +- .../workitem/PmsWorkItemNameUpdateReqVO.java | 6 ++-- .../vo/workitem/PmsWorkItemPageReqVO.java | 2 +- .../PmsWorkItemPlanningSortReqVO.java | 4 +-- .../vo/workitem/PmsWorkItemSaveReqVO.java | 12 +++---- .../vo/workitem/PmsWorkItemSortReqVO.java | 4 +-- .../worklog/PmsProjectWorkLogReportReqVO.java | 4 +-- .../worklog/PmsWorkItemWorkLogSaveReqVO.java | 6 ++-- .../web/config/PmsWebConfiguration.java | 2 +- .../job/kb/PmsKnowledgeRecycleCleanJob.java | 2 +- ...KnowledgeContentPermissionServiceImpl.java | 2 +- .../PmsKnowledgeDocumentLabelServiceImpl.java | 2 +- .../PmsKnowledgeDocumentServiceImpl.java | 2 +- .../PmsKnowledgeFolderServiceImpl.java | 2 +- ...msKnowledgeDocumentCommentServiceImpl.java | 2 +- .../PmsKnowledgeDocumentLikeServiceImpl.java | 2 +- .../PmsKnowledgeDocumentShareServiceImpl.java | 2 +- .../PmsKnowledgeFavoriteServiceImpl.java | 2 +- .../PmsKnowledgeFolderReadServiceImpl.java | 2 +- ...KnowledgeInteractionTargetServiceImpl.java | 2 +- .../PmsKnowledgeViewRecordServiceImpl.java | 2 +- .../library/PmsKnowledgeGroupServiceImpl.java | 2 +- .../PmsKnowledgeLibraryMemberServiceImpl.java | 2 +- .../PmsKnowledgeLibraryServiceImpl.java | 2 +- ...msKnowledgeLibraryTemplateServiceImpl.java | 2 +- .../PmsKnowledgeRecycleServiceImpl.java | 2 +- .../pm/iteration/PmsIterationServiceImpl.java | 2 +- .../PmsProjectAnnouncementServiceImpl.java | 2 +- .../PmsProjectFavoriteServiceImpl.java | 2 +- .../project/PmsProjectGroupServiceImpl.java | 2 +- .../project/PmsProjectMemberServiceImpl.java | 2 +- .../pm/project/PmsProjectServiceImpl.java | 2 +- .../PmsProjectTemplateServiceImpl.java | 2 +- .../pm/workbench/PmsWorkbenchServiceImpl.java | 2 +- .../PmsWorkItemActivityServiceImpl.java | 2 +- .../workitem/PmsWorkItemBoardServiceImpl.java | 2 +- .../PmsWorkItemCommentServiceImpl.java | 2 +- .../workitem/PmsWorkItemLabelServiceImpl.java | 2 +- .../pm/workitem/PmsWorkItemServiceImpl.java | 2 +- .../PmsWorkItemStatusServiceImpl.java | 2 +- .../PmsWorkItemUserSortServiceImpl.java | 2 +- .../PmsWorkItemWorkLogServiceImpl.java | 2 +- ...ledgeContentPermissionServiceImplTest.java | 19 ++++++------ ...KnowledgeDocumentLabelServiceImplTest.java | 8 ++--- .../PmsKnowledgeDocumentServiceImplTest.java | 30 +++++++++--------- .../PmsKnowledgeFolderServiceImplTest.java | 28 ++++++++--------- ...owledgeDocumentCommentServiceImplTest.java | 6 ++-- ...sKnowledgeDocumentLikeServiceImplTest.java | 6 ++-- ...KnowledgeDocumentShareServiceImplTest.java | 10 +++--- .../PmsKnowledgeFavoriteServiceImplTest.java | 6 ++-- ...PmsKnowledgeViewRecordServiceImplTest.java | 8 ++--- .../PmsKnowledgeGroupServiceImplTest.java | 6 ++-- ...KnowledgeLibraryMemberServiceImplTest.java | 17 +++++----- .../PmsKnowledgeLibraryServiceImplTest.java | 17 +++++----- ...owledgeLibraryTemplateServiceImplTest.java | 6 ++-- .../PmsKnowledgeRecycleServiceImplTest.java | 31 ++++++++++--------- .../PmsIterationServiceImplTest.java | 12 +++---- ...PmsProjectAnnouncementServiceImplTest.java | 6 ++-- .../PmsProjectFavoriteServiceImplTest.java | 6 ++-- .../PmsProjectGroupServiceImplTest.java | 6 ++-- .../PmsProjectMemberServiceImplTest.java | 13 ++++---- .../pm/project/PmsProjectServiceImplTest.java | 25 ++++++++------- .../PmsProjectTemplateServiceImplTest.java | 2 +- .../PmsWorkbenchServiceImplTest.java | 10 +++--- .../PmsWorkItemActivityServiceImplTest.java | 12 +++---- .../PmsWorkItemCommentServiceImplTest.java | 8 ++--- .../PmsWorkItemLabelServiceImplTest.java | 2 +- .../workitem/PmsWorkItemServiceImplTest.java | 16 +++++----- .../PmsWorkItemStatusServiceImplTest.java | 22 ++++++------- .../PmsWorkItemWorkLogServiceImplTest.java | 12 +++---- 136 files changed, 383 insertions(+), 377 deletions(-) diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/content/PmsKnowledgeContentPermissionController.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/content/PmsKnowledgeContentPermissionController.java index 9cd6ac046..c1425dfe9 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/content/PmsKnowledgeContentPermissionController.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/content/PmsKnowledgeContentPermissionController.java @@ -15,8 +15,8 @@ import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.annotation.Resource; -import jakarta.validation.Valid; +import javax.annotation.Resource; +import javax.validation.Valid; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/content/PmsKnowledgeDocumentController.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/content/PmsKnowledgeDocumentController.java index aca906ca5..50c41023a 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/content/PmsKnowledgeDocumentController.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/content/PmsKnowledgeDocumentController.java @@ -26,8 +26,8 @@ import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.annotation.Resource; -import jakarta.validation.Valid; +import javax.annotation.Resource; +import javax.validation.Valid; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.DeleteMapping; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/content/PmsKnowledgeDocumentLabelController.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/content/PmsKnowledgeDocumentLabelController.java index 98452d826..c7f5454e5 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/content/PmsKnowledgeDocumentLabelController.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/content/PmsKnowledgeDocumentLabelController.java @@ -18,8 +18,8 @@ import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.annotation.Resource; -import jakarta.validation.Valid; +import javax.annotation.Resource; +import javax.validation.Valid; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.DeleteMapping; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/content/PmsKnowledgeFolderController.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/content/PmsKnowledgeFolderController.java index 693f667b7..7997aa32f 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/content/PmsKnowledgeFolderController.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/content/PmsKnowledgeFolderController.java @@ -19,8 +19,8 @@ import cn.iocoder.yudao.module.pms.service.kb.library.PmsKnowledgeLibraryMemberS import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.annotation.Resource; -import jakarta.validation.Valid; +import javax.annotation.Resource; +import javax.validation.Valid; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.DeleteMapping; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/content/vo/document/PmsKnowledgeDocumentCreateReqVO.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/content/vo/document/PmsKnowledgeDocumentCreateReqVO.java index e4ef99b5d..ebe1de307 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/content/vo/document/PmsKnowledgeDocumentCreateReqVO.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/content/vo/document/PmsKnowledgeDocumentCreateReqVO.java @@ -3,11 +3,11 @@ package cn.iocoder.yudao.module.pms.controller.admin.kb.content.vo.document; import cn.iocoder.yudao.framework.common.validation.InEnum; import cn.iocoder.yudao.module.pms.enums.kb.content.PmsKnowledgeDocumentTypeEnum; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.Max; -import jakarta.validation.constraints.Min; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; +import javax.validation.constraints.Max; +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; import lombok.Data; @Schema(description = "管理后台 - PMS 知识库文档新增 Request VO") diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/content/vo/document/PmsKnowledgeDocumentMoveReqVO.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/content/vo/document/PmsKnowledgeDocumentMoveReqVO.java index d5bc012ca..ee464d39e 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/content/vo/document/PmsKnowledgeDocumentMoveReqVO.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/content/vo/document/PmsKnowledgeDocumentMoveReqVO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.pms.controller.admin.kb.content.vo.document; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotNull; +import javax.validation.constraints.NotNull; import lombok.Data; @Schema(description = "管理后台 - PMS 知识库文档移动 Request VO") diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/content/vo/document/PmsKnowledgeDocumentUpdateReqVO.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/content/vo/document/PmsKnowledgeDocumentUpdateReqVO.java index 7afdd5fa3..99c6ed3f9 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/content/vo/document/PmsKnowledgeDocumentUpdateReqVO.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/content/vo/document/PmsKnowledgeDocumentUpdateReqVO.java @@ -1,10 +1,10 @@ package cn.iocoder.yudao.module.pms.controller.admin.kb.content.vo.document; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.Max; -import jakarta.validation.constraints.Min; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; +import javax.validation.constraints.Max; +import javax.validation.constraints.Min; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; import lombok.Data; import java.util.List; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/content/vo/folder/PmsKnowledgeFolderMoveReqVO.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/content/vo/folder/PmsKnowledgeFolderMoveReqVO.java index c30e02a87..33e4cc1ec 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/content/vo/folder/PmsKnowledgeFolderMoveReqVO.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/content/vo/folder/PmsKnowledgeFolderMoveReqVO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.pms.controller.admin.kb.content.vo.folder; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotNull; +import javax.validation.constraints.NotNull; import lombok.Data; @Schema(description = "管理后台 - PMS 知识库文件夹移动 Request VO") diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/content/vo/folder/PmsKnowledgeFolderSaveReqVO.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/content/vo/folder/PmsKnowledgeFolderSaveReqVO.java index 5e3e81957..941b484bf 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/content/vo/folder/PmsKnowledgeFolderSaveReqVO.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/content/vo/folder/PmsKnowledgeFolderSaveReqVO.java @@ -1,9 +1,9 @@ package cn.iocoder.yudao.module.pms.controller.admin.kb.content.vo.folder; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; import lombok.Data; @Schema(description = "管理后台 - PMS 知识库文件夹新增/修改 Request VO") diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/content/vo/label/PmsKnowledgeDocumentLabelPageReqVO.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/content/vo/label/PmsKnowledgeDocumentLabelPageReqVO.java index e675209cb..a4adc2301 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/content/vo/label/PmsKnowledgeDocumentLabelPageReqVO.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/content/vo/label/PmsKnowledgeDocumentLabelPageReqVO.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.pms.controller.admin.kb.content.vo.label; import cn.iocoder.yudao.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotNull; +import javax.validation.constraints.NotNull; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/content/vo/label/PmsKnowledgeDocumentLabelSaveReqVO.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/content/vo/label/PmsKnowledgeDocumentLabelSaveReqVO.java index 1f77d0e68..cdd35a492 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/content/vo/label/PmsKnowledgeDocumentLabelSaveReqVO.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/content/vo/label/PmsKnowledgeDocumentLabelSaveReqVO.java @@ -1,8 +1,8 @@ package cn.iocoder.yudao.module.pms.controller.admin.kb.content.vo.label; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.Size; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; import lombok.Data; @Schema(description = "管理后台 - PMS 知识库文档标签新增/修改 Request VO") diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/content/vo/permission/PmsKnowledgeContentPermissionUpdateReqVO.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/content/vo/permission/PmsKnowledgeContentPermissionUpdateReqVO.java index 3ccedbdf3..e2e938b39 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/content/vo/permission/PmsKnowledgeContentPermissionUpdateReqVO.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/content/vo/permission/PmsKnowledgeContentPermissionUpdateReqVO.java @@ -4,9 +4,9 @@ import cn.iocoder.yudao.framework.common.validation.InEnum; import cn.iocoder.yudao.module.pms.enums.kb.content.PmsKnowledgeContentLevelEnum; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.Valid; -import jakarta.validation.constraints.AssertTrue; -import jakarta.validation.constraints.NotNull; +import javax.validation.Valid; +import javax.validation.constraints.AssertTrue; +import javax.validation.constraints.NotNull; import lombok.Data; import java.util.List; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/interaction/PmsKnowledgeDocumentCommentController.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/interaction/PmsKnowledgeDocumentCommentController.java index 235e07cf7..903311b52 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/interaction/PmsKnowledgeDocumentCommentController.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/interaction/PmsKnowledgeDocumentCommentController.java @@ -12,8 +12,8 @@ import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.annotation.Resource; -import jakarta.validation.Valid; +import javax.annotation.Resource; +import javax.validation.Valid; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.DeleteMapping; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/interaction/PmsKnowledgeDocumentLikeController.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/interaction/PmsKnowledgeDocumentLikeController.java index 98cd56568..19dcd87f4 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/interaction/PmsKnowledgeDocumentLikeController.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/interaction/PmsKnowledgeDocumentLikeController.java @@ -5,7 +5,7 @@ import cn.iocoder.yudao.module.pms.service.kb.interaction.PmsKnowledgeDocumentLi import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.DeleteMapping; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/interaction/PmsKnowledgeDocumentShareController.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/interaction/PmsKnowledgeDocumentShareController.java index 361c81d29..b1177f4f3 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/interaction/PmsKnowledgeDocumentShareController.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/interaction/PmsKnowledgeDocumentShareController.java @@ -15,10 +15,10 @@ import cn.iocoder.yudao.module.pms.service.kb.interaction.PmsKnowledgeDocumentSh import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.annotation.Resource; -import jakarta.annotation.security.PermitAll; -import jakarta.validation.Valid; -import jakarta.validation.constraints.NotBlank; +import javax.annotation.Resource; +import javax.annotation.security.PermitAll; +import javax.validation.Valid; +import javax.validation.constraints.NotBlank; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/interaction/PmsKnowledgeFavoriteController.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/interaction/PmsKnowledgeFavoriteController.java index 0439bb2aa..8cbee1bd6 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/interaction/PmsKnowledgeFavoriteController.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/interaction/PmsKnowledgeFavoriteController.java @@ -11,8 +11,8 @@ import cn.iocoder.yudao.module.pms.service.kb.interaction.PmsKnowledgeFavoriteSe import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.annotation.Resource; -import jakarta.validation.Valid; +import javax.annotation.Resource; +import javax.validation.Valid; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.DeleteMapping; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/interaction/PmsKnowledgeViewRecordController.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/interaction/PmsKnowledgeViewRecordController.java index 16fc9b3ac..98c779bff 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/interaction/PmsKnowledgeViewRecordController.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/interaction/PmsKnowledgeViewRecordController.java @@ -6,7 +6,7 @@ import cn.iocoder.yudao.module.pms.service.kb.interaction.PmsKnowledgeViewRecord import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/interaction/vo/comment/PmsKnowledgeDocumentCommentSaveReqVO.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/interaction/vo/comment/PmsKnowledgeDocumentCommentSaveReqVO.java index efbed8db2..ab0b11ff5 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/interaction/vo/comment/PmsKnowledgeDocumentCommentSaveReqVO.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/interaction/vo/comment/PmsKnowledgeDocumentCommentSaveReqVO.java @@ -1,9 +1,9 @@ package cn.iocoder.yudao.module.pms.controller.admin.kb.interaction.vo.comment; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; import lombok.Data; @Schema(description = "管理后台 - PMS 知识库文档评论保存 Request VO") diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/interaction/vo/favorite/PmsKnowledgeFavoriteSaveReqVO.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/interaction/vo/favorite/PmsKnowledgeFavoriteSaveReqVO.java index e77b3f251..803964a84 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/interaction/vo/favorite/PmsKnowledgeFavoriteSaveReqVO.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/interaction/vo/favorite/PmsKnowledgeFavoriteSaveReqVO.java @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.pms.controller.admin.kb.interaction.vo.favorite; import cn.iocoder.yudao.framework.common.validation.InEnum; import cn.iocoder.yudao.module.pms.enums.kb.PmsKnowledgeObjectTypeEnum; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotNull; +import javax.validation.constraints.NotNull; import lombok.Data; @Schema(description = "管理后台 - PMS 知识收藏（关注）保存 Request VO") diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/interaction/vo/share/PmsKnowledgeDocumentShareSaveReqVO.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/interaction/vo/share/PmsKnowledgeDocumentShareSaveReqVO.java index 886e4a622..543d20861 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/interaction/vo/share/PmsKnowledgeDocumentShareSaveReqVO.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/interaction/vo/share/PmsKnowledgeDocumentShareSaveReqVO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.pms.controller.admin.kb.interaction.vo.share; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotNull; +import javax.validation.constraints.NotNull; import lombok.Data; import java.util.List; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/interaction/vo/share/PmsKnowledgeDocumentShareUpdateMemberListReqVO.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/interaction/vo/share/PmsKnowledgeDocumentShareUpdateMemberListReqVO.java index 36f503568..7a99a5df2 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/interaction/vo/share/PmsKnowledgeDocumentShareUpdateMemberListReqVO.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/interaction/vo/share/PmsKnowledgeDocumentShareUpdateMemberListReqVO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.pms.controller.admin.kb.interaction.vo.share; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotNull; +import javax.validation.constraints.NotNull; import lombok.Data; import java.util.List; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/library/PmsKnowledgeGroupController.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/library/PmsKnowledgeGroupController.java index c3b6424f0..6acfd83f8 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/library/PmsKnowledgeGroupController.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/library/PmsKnowledgeGroupController.java @@ -11,8 +11,8 @@ import cn.iocoder.yudao.module.pms.service.kb.library.PmsKnowledgeGroupService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.annotation.Resource; -import jakarta.validation.Valid; +import javax.annotation.Resource; +import javax.validation.Valid; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.DeleteMapping; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/library/PmsKnowledgeLibraryController.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/library/PmsKnowledgeLibraryController.java index 2ef286af2..6b464caa4 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/library/PmsKnowledgeLibraryController.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/library/PmsKnowledgeLibraryController.java @@ -24,8 +24,8 @@ import cn.iocoder.yudao.module.system.enums.permission.RoleCodeEnum; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.annotation.Resource; -import jakarta.validation.Valid; +import javax.annotation.Resource; +import javax.validation.Valid; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.DeleteMapping; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/library/PmsKnowledgeLibraryMemberController.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/library/PmsKnowledgeLibraryMemberController.java index 8cf710a73..f5e62a5ac 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/library/PmsKnowledgeLibraryMemberController.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/library/PmsKnowledgeLibraryMemberController.java @@ -14,8 +14,8 @@ import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.annotation.Resource; -import jakarta.validation.Valid; +import javax.annotation.Resource; +import javax.validation.Valid; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.DeleteMapping; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/library/PmsKnowledgeLibraryTemplateController.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/library/PmsKnowledgeLibraryTemplateController.java index cf023f5e8..7a102587e 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/library/PmsKnowledgeLibraryTemplateController.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/library/PmsKnowledgeLibraryTemplateController.java @@ -12,8 +12,8 @@ import cn.iocoder.yudao.module.pms.service.kb.library.PmsKnowledgeLibraryTemplat import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.annotation.Resource; -import jakarta.validation.Valid; +import javax.annotation.Resource; +import javax.validation.Valid; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.DeleteMapping; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/library/vo/group/PmsKnowledgeGroupSaveReqVO.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/library/vo/group/PmsKnowledgeGroupSaveReqVO.java index 5c567bf38..3e397d9bf 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/library/vo/group/PmsKnowledgeGroupSaveReqVO.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/library/vo/group/PmsKnowledgeGroupSaveReqVO.java @@ -1,8 +1,8 @@ package cn.iocoder.yudao.module.pms.controller.admin.kb.library.vo.group; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.Size; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; import lombok.Data; @Schema(description = "管理后台 - PMS 知识库分组新增/修改 Request VO") diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/library/vo/group/PmsKnowledgeGroupSortReqVO.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/library/vo/group/PmsKnowledgeGroupSortReqVO.java index d44f561f1..84ccb06e1 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/library/vo/group/PmsKnowledgeGroupSortReqVO.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/library/vo/group/PmsKnowledgeGroupSortReqVO.java @@ -1,10 +1,10 @@ package cn.iocoder.yudao.module.pms.controller.admin.kb.library.vo.group; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.Valid; -import jakarta.validation.constraints.Min; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; +import javax.validation.Valid; +import javax.validation.constraints.Min; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; import lombok.Data; import java.util.List; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/library/vo/group/PmsKnowledgeLibraryMoveGroupReqVO.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/library/vo/group/PmsKnowledgeLibraryMoveGroupReqVO.java index 4581020b8..c19eea263 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/library/vo/group/PmsKnowledgeLibraryMoveGroupReqVO.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/library/vo/group/PmsKnowledgeLibraryMoveGroupReqVO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.pms.controller.admin.kb.library.vo.group; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotNull; +import javax.validation.constraints.NotNull; import lombok.Data; @Schema(description = "管理后台 - PMS 知识库移动分组 Request VO") diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/library/vo/library/PmsKnowledgeLibrarySaveReqVO.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/library/vo/library/PmsKnowledgeLibrarySaveReqVO.java index 04daa730a..00ad40851 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/library/vo/library/PmsKnowledgeLibrarySaveReqVO.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/library/vo/library/PmsKnowledgeLibrarySaveReqVO.java @@ -1,10 +1,10 @@ package cn.iocoder.yudao.module.pms.controller.admin.kb.library.vo.library; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Positive; -import jakarta.validation.constraints.Size; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Positive; +import javax.validation.constraints.Size; import lombok.Data; import java.util.List; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/library/vo/member/PmsKnowledgeLibraryUpdateMemberListReqVO.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/library/vo/member/PmsKnowledgeLibraryUpdateMemberListReqVO.java index 849db7a25..161718206 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/library/vo/member/PmsKnowledgeLibraryUpdateMemberListReqVO.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/library/vo/member/PmsKnowledgeLibraryUpdateMemberListReqVO.java @@ -4,9 +4,9 @@ import cn.iocoder.yudao.framework.common.validation.InEnum; import cn.iocoder.yudao.module.pms.enums.kb.library.PmsKnowledgeLibraryMemberLevelEnum; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.Valid; -import jakarta.validation.constraints.AssertTrue; -import jakarta.validation.constraints.NotNull; +import javax.validation.Valid; +import javax.validation.constraints.AssertTrue; +import javax.validation.constraints.NotNull; import lombok.Data; import java.util.List; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/library/vo/template/PmsKnowledgeLibraryTemplateSaveReqVO.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/library/vo/template/PmsKnowledgeLibraryTemplateSaveReqVO.java index 5dcf251de..4381ad553 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/library/vo/template/PmsKnowledgeLibraryTemplateSaveReqVO.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/library/vo/template/PmsKnowledgeLibraryTemplateSaveReqVO.java @@ -3,12 +3,12 @@ package cn.iocoder.yudao.module.pms.controller.admin.kb.library.vo.template; import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; import cn.iocoder.yudao.framework.common.validation.InEnum; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.Valid; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.PositiveOrZero; -import jakarta.validation.constraints.Size; +import javax.validation.Valid; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.PositiveOrZero; +import javax.validation.constraints.Size; import lombok.Data; import java.util.List; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/recycle/PmsKnowledgeRecycleController.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/recycle/PmsKnowledgeRecycleController.java index 7699700e7..aedfb17e8 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/recycle/PmsKnowledgeRecycleController.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/kb/recycle/PmsKnowledgeRecycleController.java @@ -15,7 +15,7 @@ import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.DeleteMapping; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/iteration/PmsIterationController.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/iteration/PmsIterationController.java index 06f215bcd..28ef1452f 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/iteration/PmsIterationController.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/iteration/PmsIterationController.java @@ -16,8 +16,8 @@ import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.annotation.Resource; -import jakarta.validation.Valid; +import javax.annotation.Resource; +import javax.validation.Valid; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.DeleteMapping; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/iteration/vo/PmsIterationPageReqVO.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/iteration/vo/PmsIterationPageReqVO.java index 588fa4393..b938bff2d 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/iteration/vo/PmsIterationPageReqVO.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/iteration/vo/PmsIterationPageReqVO.java @@ -4,7 +4,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.validation.InEnum; import cn.iocoder.yudao.module.pms.enums.pm.iteration.PmsIterationStatusEnum; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotNull; +import javax.validation.constraints.NotNull; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/iteration/vo/PmsIterationSaveReqVO.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/iteration/vo/PmsIterationSaveReqVO.java index 6e3bf5b17..09f2f5fc0 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/iteration/vo/PmsIterationSaveReqVO.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/iteration/vo/PmsIterationSaveReqVO.java @@ -2,10 +2,10 @@ package cn.iocoder.yudao.module.pms.controller.admin.pm.iteration.vo; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.AssertTrue; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; +import javax.validation.constraints.AssertTrue; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; import lombok.Data; import java.time.LocalDateTime; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/iteration/vo/PmsIterationStartReqVO.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/iteration/vo/PmsIterationStartReqVO.java index dcfe68c12..66e80a261 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/iteration/vo/PmsIterationStartReqVO.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/iteration/vo/PmsIterationStartReqVO.java @@ -2,8 +2,8 @@ package cn.iocoder.yudao.module.pms.controller.admin.pm.iteration.vo; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.AssertTrue; -import jakarta.validation.constraints.NotNull; +import javax.validation.constraints.AssertTrue; +import javax.validation.constraints.NotNull; import lombok.Data; import java.time.LocalDateTime; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/project/PmsProjectAnnouncementController.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/project/PmsProjectAnnouncementController.java index 896afaaa0..b4cbcce42 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/project/PmsProjectAnnouncementController.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/project/PmsProjectAnnouncementController.java @@ -13,8 +13,8 @@ import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.annotation.Resource; -import jakarta.validation.Valid; +import javax.annotation.Resource; +import javax.validation.Valid; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.DeleteMapping; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/project/PmsProjectController.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/project/PmsProjectController.java index d6ea74a09..49234b776 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/project/PmsProjectController.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/project/PmsProjectController.java @@ -22,8 +22,8 @@ import cn.iocoder.yudao.module.system.enums.permission.RoleCodeEnum; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.annotation.Resource; -import jakarta.validation.Valid; +import javax.annotation.Resource; +import javax.validation.Valid; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.DeleteMapping; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/project/PmsProjectFavoriteController.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/project/PmsProjectFavoriteController.java index 85db30053..7740e8e54 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/project/PmsProjectFavoriteController.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/project/PmsProjectFavoriteController.java @@ -5,7 +5,7 @@ import cn.iocoder.yudao.module.pms.service.pm.project.PmsProjectFavoriteService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.DeleteMapping; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/project/PmsProjectGroupController.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/project/PmsProjectGroupController.java index ca2214da1..f2bbae2f0 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/project/PmsProjectGroupController.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/project/PmsProjectGroupController.java @@ -12,8 +12,8 @@ import cn.iocoder.yudao.module.pms.service.pm.project.PmsProjectMemberService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.annotation.Resource; -import jakarta.validation.Valid; +import javax.annotation.Resource; +import javax.validation.Valid; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.DeleteMapping; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/project/PmsProjectMemberController.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/project/PmsProjectMemberController.java index 40f8840f6..f0f4c5efc 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/project/PmsProjectMemberController.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/project/PmsProjectMemberController.java @@ -12,8 +12,8 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.annotation.Resource; -import jakarta.validation.Valid; +import javax.annotation.Resource; +import javax.validation.Valid; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.DeleteMapping; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/project/PmsProjectTemplateController.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/project/PmsProjectTemplateController.java index cb7e932b0..e4c0becdd 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/project/PmsProjectTemplateController.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/project/PmsProjectTemplateController.java @@ -11,8 +11,8 @@ import cn.iocoder.yudao.module.pms.service.pm.project.PmsProjectTemplateService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.annotation.Resource; -import jakarta.validation.Valid; +import javax.annotation.Resource; +import javax.validation.Valid; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.DeleteMapping; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/project/vo/announcement/PmsProjectAnnouncementSaveReqVO.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/project/vo/announcement/PmsProjectAnnouncementSaveReqVO.java index f3b280a6b..fa549c738 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/project/vo/announcement/PmsProjectAnnouncementSaveReqVO.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/project/vo/announcement/PmsProjectAnnouncementSaveReqVO.java @@ -1,9 +1,9 @@ package cn.iocoder.yudao.module.pms.controller.admin.pm.project.vo.announcement; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; import lombok.Data; import java.util.List; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/project/vo/group/PmsProjectGroupMoveReqVO.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/project/vo/group/PmsProjectGroupMoveReqVO.java index 58a74b009..c0d54d37e 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/project/vo/group/PmsProjectGroupMoveReqVO.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/project/vo/group/PmsProjectGroupMoveReqVO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.pms.controller.admin.pm.project.vo.group; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotNull; +import javax.validation.constraints.NotNull; import lombok.Data; @Schema(description = "管理后台 - PMS 项目移动分组 Request VO") diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/project/vo/group/PmsProjectGroupSaveReqVO.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/project/vo/group/PmsProjectGroupSaveReqVO.java index 1f368f4c5..68853d813 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/project/vo/group/PmsProjectGroupSaveReqVO.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/project/vo/group/PmsProjectGroupSaveReqVO.java @@ -1,8 +1,8 @@ package cn.iocoder.yudao.module.pms.controller.admin.pm.project.vo.group; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.Size; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; import lombok.Data; @Schema(description = "管理后台 - PMS 项目分组新增/修改 Request VO") diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/project/vo/group/PmsProjectGroupSortReqVO.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/project/vo/group/PmsProjectGroupSortReqVO.java index 464b5f8e1..032fd3c16 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/project/vo/group/PmsProjectGroupSortReqVO.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/project/vo/group/PmsProjectGroupSortReqVO.java @@ -1,10 +1,10 @@ package cn.iocoder.yudao.module.pms.controller.admin.pm.project.vo.group; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.Valid; -import jakarta.validation.constraints.Min; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; +import javax.validation.Valid; +import javax.validation.constraints.Min; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; import lombok.Data; import java.util.List; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/project/vo/member/PmsProjectMemberSaveReqVO.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/project/vo/member/PmsProjectMemberSaveReqVO.java index cde7b2468..076d0293d 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/project/vo/member/PmsProjectMemberSaveReqVO.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/project/vo/member/PmsProjectMemberSaveReqVO.java @@ -3,9 +3,9 @@ package cn.iocoder.yudao.module.pms.controller.admin.pm.project.vo.member; import cn.iocoder.yudao.framework.common.validation.InEnum; import cn.iocoder.yudao.module.pms.enums.pm.project.PmsProjectMemberLevelEnum; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.Valid; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; +import javax.validation.Valid; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; import lombok.Data; import java.util.List; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/project/vo/project/PmsProjectSaveReqVO.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/project/vo/project/PmsProjectSaveReqVO.java index 8094bc2b9..e6edca1f9 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/project/vo/project/PmsProjectSaveReqVO.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/project/vo/project/PmsProjectSaveReqVO.java @@ -5,10 +5,10 @@ import cn.iocoder.yudao.module.pms.enums.pm.project.PmsProjectLevelEnum; import cn.iocoder.yudao.module.pms.enums.pm.project.PmsProjectTypeEnum; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.AssertTrue; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; +import javax.validation.constraints.AssertTrue; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/project/vo/template/PmsProjectTemplateSaveReqVO.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/project/vo/template/PmsProjectTemplateSaveReqVO.java index 4202291c8..32443dd50 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/project/vo/template/PmsProjectTemplateSaveReqVO.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/project/vo/template/PmsProjectTemplateSaveReqVO.java @@ -5,11 +5,11 @@ import cn.iocoder.yudao.module.pms.enums.pm.project.PmsProjectTypeEnum; import cn.iocoder.yudao.module.pms.enums.pm.workitem.PmsWorkItemStatusTypeEnum; import cn.iocoder.yudao.module.pms.enums.pm.workitem.PmsWorkItemTypeEnum; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.Valid; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; +import javax.validation.Valid; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; import lombok.Data; import java.util.List; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workbench/PmsWorkbenchController.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workbench/PmsWorkbenchController.java index eca2f134a..49576f137 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workbench/PmsWorkbenchController.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workbench/PmsWorkbenchController.java @@ -22,8 +22,8 @@ import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; import cn.iocoder.yudao.module.system.enums.permission.RoleCodeEnum; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.annotation.Resource; -import jakarta.validation.Valid; +import javax.annotation.Resource; +import javax.validation.Valid; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/PmsWorkItemActivityController.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/PmsWorkItemActivityController.java index f9508dfb4..39009c4d1 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/PmsWorkItemActivityController.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/PmsWorkItemActivityController.java @@ -11,7 +11,7 @@ import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/PmsWorkItemCommentController.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/PmsWorkItemCommentController.java index d741003fd..5ea101402 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/PmsWorkItemCommentController.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/PmsWorkItemCommentController.java @@ -11,8 +11,8 @@ import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.annotation.Resource; -import jakarta.validation.Valid; +import javax.annotation.Resource; +import javax.validation.Valid; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.DeleteMapping; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/PmsWorkItemController.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/PmsWorkItemController.java index 48d0dc12c..934bae7c8 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/PmsWorkItemController.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/PmsWorkItemController.java @@ -34,9 +34,9 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.annotation.Resource; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.validation.Valid; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.DeleteMapping; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/PmsWorkItemLabelController.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/PmsWorkItemLabelController.java index 2a0b24b64..7e4971ecc 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/PmsWorkItemLabelController.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/PmsWorkItemLabelController.java @@ -9,8 +9,8 @@ import cn.iocoder.yudao.module.pms.service.pm.workitem.PmsWorkItemLabelService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.annotation.Resource; -import jakarta.validation.Valid; +import javax.annotation.Resource; +import javax.validation.Valid; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.DeleteMapping; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/PmsWorkItemStatusController.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/PmsWorkItemStatusController.java index 3469acdfd..ecce6476b 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/PmsWorkItemStatusController.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/PmsWorkItemStatusController.java @@ -16,8 +16,8 @@ import cn.iocoder.yudao.module.pms.service.pm.workitem.PmsWorkItemStatusService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.annotation.Resource; -import jakarta.validation.Valid; +import javax.annotation.Resource; +import javax.validation.Valid; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.DeleteMapping; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/PmsWorkItemWorkLogController.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/PmsWorkItemWorkLogController.java index b44d1c0f3..2e25e361f 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/PmsWorkItemWorkLogController.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/PmsWorkItemWorkLogController.java @@ -18,8 +18,8 @@ import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.annotation.Resource; -import jakarta.validation.Valid; +import javax.annotation.Resource; +import javax.validation.Valid; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/comment/PmsWorkItemCommentSaveReqVO.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/comment/PmsWorkItemCommentSaveReqVO.java index 2832b4848..25d6672bc 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/comment/PmsWorkItemCommentSaveReqVO.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/comment/PmsWorkItemCommentSaveReqVO.java @@ -1,9 +1,9 @@ package cn.iocoder.yudao.module.pms.controller.admin.pm.workitem.vo.comment; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; import lombok.Data; @Schema(description = "管理后台 - PMS 工作项评论新增/修改 Request VO") diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/label/PmsWorkItemLabelSaveReqVO.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/label/PmsWorkItemLabelSaveReqVO.java index 326afbfaa..c728d9d49 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/label/PmsWorkItemLabelSaveReqVO.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/label/PmsWorkItemLabelSaveReqVO.java @@ -1,8 +1,8 @@ package cn.iocoder.yudao.module.pms.controller.admin.pm.workitem.vo.label; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.Size; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; import lombok.Data; @Schema(description = "管理后台 - PMS 工作项标签新增/修改 Request VO") diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/status/PmsWorkItemBoardConfigSaveReqVO.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/status/PmsWorkItemBoardConfigSaveReqVO.java index 96baa402d..5ad680f69 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/status/PmsWorkItemBoardConfigSaveReqVO.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/status/PmsWorkItemBoardConfigSaveReqVO.java @@ -3,10 +3,10 @@ package cn.iocoder.yudao.module.pms.controller.admin.pm.workitem.vo.status; import cn.iocoder.yudao.framework.common.validation.InEnum; import cn.iocoder.yudao.module.pms.enums.pm.workitem.PmsWorkItemTypeEnum; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.Valid; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; +import javax.validation.Valid; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; import lombok.Data; import java.util.List; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/status/PmsWorkItemStatusConfigUpdateReqVO.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/status/PmsWorkItemStatusConfigUpdateReqVO.java index 5634c54f5..8f1dd568c 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/status/PmsWorkItemStatusConfigUpdateReqVO.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/status/PmsWorkItemStatusConfigUpdateReqVO.java @@ -3,9 +3,9 @@ package cn.iocoder.yudao.module.pms.controller.admin.pm.workitem.vo.status; import cn.iocoder.yudao.framework.common.validation.InEnum; import cn.iocoder.yudao.module.pms.enums.pm.workitem.PmsWorkItemStatusTypeEnum; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; import lombok.Data; @Schema(description = "管理后台 - PMS 更新工作项状态配置 Request VO") diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/status/PmsWorkItemStatusCreateReqVO.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/status/PmsWorkItemStatusCreateReqVO.java index 49a7e7b2c..3fbada0f3 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/status/PmsWorkItemStatusCreateReqVO.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/status/PmsWorkItemStatusCreateReqVO.java @@ -4,9 +4,9 @@ import cn.iocoder.yudao.framework.common.validation.InEnum; import cn.iocoder.yudao.module.pms.enums.pm.workitem.PmsWorkItemStatusTypeEnum; import cn.iocoder.yudao.module.pms.enums.pm.workitem.PmsWorkItemTypeEnum; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; import lombok.Data; @Schema(description = "管理后台 - PMS 创建工作项状态 Request VO") diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/status/PmsWorkItemStatusDeleteReqVO.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/status/PmsWorkItemStatusDeleteReqVO.java index 58318a8f2..5727ca652 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/status/PmsWorkItemStatusDeleteReqVO.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/status/PmsWorkItemStatusDeleteReqVO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.pms.controller.admin.pm.workitem.vo.status; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotNull; +import javax.validation.constraints.NotNull; import lombok.Data; @Schema(description = "管理后台 - PMS 删除工作项状态 Request VO") diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/status/PmsWorkItemStatusSortReqVO.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/status/PmsWorkItemStatusSortReqVO.java index 62aa73d92..4f0e8d97b 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/status/PmsWorkItemStatusSortReqVO.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/status/PmsWorkItemStatusSortReqVO.java @@ -1,8 +1,8 @@ package cn.iocoder.yudao.module.pms.controller.admin.pm.workitem.vo.status; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; import lombok.Data; import java.util.List; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/status/PmsWorkItemStatusUpdateReqVO.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/status/PmsWorkItemStatusUpdateReqVO.java index 916932a94..c3278af12 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/status/PmsWorkItemStatusUpdateReqVO.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/status/PmsWorkItemStatusUpdateReqVO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.pms.controller.admin.pm.workitem.vo.status; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotNull; +import javax.validation.constraints.NotNull; import lombok.Data; @Schema(description = "管理后台 - PMS 更新工作项看板状态 Request VO") diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/workitem/PmsWorkItemBoardReqVO.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/workitem/PmsWorkItemBoardReqVO.java index 83f65d2d1..d6646d06f 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/workitem/PmsWorkItemBoardReqVO.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/workitem/PmsWorkItemBoardReqVO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.pms.controller.admin.pm.workitem.vo.workitem; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotNull; +import javax.validation.constraints.NotNull; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/workitem/PmsWorkItemImportExcelVO.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/workitem/PmsWorkItemImportExcelVO.java index faff64860..6325086b5 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/workitem/PmsWorkItemImportExcelVO.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/workitem/PmsWorkItemImportExcelVO.java @@ -9,8 +9,8 @@ import cn.iocoder.yudao.framework.excel.core.convert.StringListConvert; import cn.iocoder.yudao.module.pms.enums.DictTypeConstants; import cn.iocoder.yudao.module.pms.enums.pm.workitem.PmsWorkItemTypeEnum; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.AssertTrue; -import jakarta.validation.constraints.Min; +import javax.validation.constraints.AssertTrue; +import javax.validation.constraints.Min; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/workitem/PmsWorkItemIterationUpdateReqVO.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/workitem/PmsWorkItemIterationUpdateReqVO.java index 58ee23b03..0620ac33b 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/workitem/PmsWorkItemIterationUpdateReqVO.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/workitem/PmsWorkItemIterationUpdateReqVO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.pms.controller.admin.pm.workitem.vo.workitem; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotNull; +import javax.validation.constraints.NotNull; import lombok.Data; import lombok.experimental.Accessors; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/workitem/PmsWorkItemNameUpdateReqVO.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/workitem/PmsWorkItemNameUpdateReqVO.java index 5963bdb10..16839af08 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/workitem/PmsWorkItemNameUpdateReqVO.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/workitem/PmsWorkItemNameUpdateReqVO.java @@ -1,9 +1,9 @@ package cn.iocoder.yudao.module.pms.controller.admin.pm.workitem.vo.workitem; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; import lombok.Data; @Schema(description = "管理后台 - PMS 工作项名称更新 Request VO") diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/workitem/PmsWorkItemPageReqVO.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/workitem/PmsWorkItemPageReqVO.java index 2248482aa..9d27a2dc2 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/workitem/PmsWorkItemPageReqVO.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/workitem/PmsWorkItemPageReqVO.java @@ -7,7 +7,7 @@ import cn.iocoder.yudao.module.pms.enums.pm.workitem.PmsWorkItemPriorityEnum; import cn.iocoder.yudao.module.pms.enums.pm.workitem.PmsWorkItemStatusTypeEnum; import cn.iocoder.yudao.module.pms.enums.pm.workitem.PmsWorkItemTypeEnum; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotNull; +import javax.validation.constraints.NotNull; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/workitem/PmsWorkItemPlanningSortReqVO.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/workitem/PmsWorkItemPlanningSortReqVO.java index a7fb2783e..d562004ea 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/workitem/PmsWorkItemPlanningSortReqVO.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/workitem/PmsWorkItemPlanningSortReqVO.java @@ -1,8 +1,8 @@ package cn.iocoder.yudao.module.pms.controller.admin.pm.workitem.vo.workitem; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; import lombok.Data; import java.util.List; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/workitem/PmsWorkItemSaveReqVO.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/workitem/PmsWorkItemSaveReqVO.java index 97ca93a8b..86d5a63fa 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/workitem/PmsWorkItemSaveReqVO.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/workitem/PmsWorkItemSaveReqVO.java @@ -5,12 +5,12 @@ import cn.iocoder.yudao.module.pms.enums.pm.workitem.PmsWorkItemDefectTypeEnum; import cn.iocoder.yudao.module.pms.enums.pm.workitem.PmsWorkItemPriorityEnum; import cn.iocoder.yudao.module.pms.enums.pm.workitem.PmsWorkItemTypeEnum; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.AssertTrue; -import jakarta.validation.constraints.Max; -import jakarta.validation.constraints.Min; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; +import javax.validation.constraints.AssertTrue; +import javax.validation.constraints.Max; +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; import lombok.Data; import java.time.LocalDateTime; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/workitem/PmsWorkItemSortReqVO.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/workitem/PmsWorkItemSortReqVO.java index 550ea3fc5..c842b9de3 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/workitem/PmsWorkItemSortReqVO.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/workitem/PmsWorkItemSortReqVO.java @@ -1,8 +1,8 @@ package cn.iocoder.yudao.module.pms.controller.admin.pm.workitem.vo.workitem; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; import lombok.Data; import java.util.List; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/worklog/PmsProjectWorkLogReportReqVO.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/worklog/PmsProjectWorkLogReportReqVO.java index 45ab7e8ff..afbb2daae 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/worklog/PmsProjectWorkLogReportReqVO.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/worklog/PmsProjectWorkLogReportReqVO.java @@ -1,8 +1,8 @@ package cn.iocoder.yudao.module.pms.controller.admin.pm.workitem.vo.worklog; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/worklog/PmsWorkItemWorkLogSaveReqVO.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/worklog/PmsWorkItemWorkLogSaveReqVO.java index 07e60d6ae..9e292d4c6 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/worklog/PmsWorkItemWorkLogSaveReqVO.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/pm/workitem/vo/worklog/PmsWorkItemWorkLogSaveReqVO.java @@ -1,9 +1,9 @@ package cn.iocoder.yudao.module.pms.controller.admin.pm.workitem.vo.worklog; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.Min; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; +import javax.validation.constraints.Min; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; import lombok.Data; @Schema(description = "管理后台 - PMS 工作项工时记录新增/修改 Request VO") diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/framework/web/config/PmsWebConfiguration.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/framework/web/config/PmsWebConfiguration.java index 288746dfe..f7a5e89d7 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/framework/web/config/PmsWebConfiguration.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/framework/web/config/PmsWebConfiguration.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.pms.framework.web.config; import cn.iocoder.yudao.framework.swagger.config.YudaoSwaggerAutoConfiguration; -import org.springdoc.core.models.GroupedOpenApi; +import org.springdoc.core.GroupedOpenApi; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/job/kb/PmsKnowledgeRecycleCleanJob.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/job/kb/PmsKnowledgeRecycleCleanJob.java index 0d270e412..ffb69f2bc 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/job/kb/PmsKnowledgeRecycleCleanJob.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/job/kb/PmsKnowledgeRecycleCleanJob.java @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.pms.job.kb; import cn.iocoder.yudao.framework.tenant.core.job.TenantJob; import cn.iocoder.yudao.module.pms.service.kb.recycle.PmsKnowledgeRecycleService; import com.xxl.job.core.handler.annotation.XxlJob; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/content/PmsKnowledgeContentPermissionServiceImpl.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/content/PmsKnowledgeContentPermissionServiceImpl.java index f18dcb580..ec3bb8a29 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/content/PmsKnowledgeContentPermissionServiceImpl.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/content/PmsKnowledgeContentPermissionServiceImpl.java @@ -20,7 +20,7 @@ import cn.iocoder.yudao.module.system.api.permission.PermissionApi; import cn.iocoder.yudao.module.system.api.user.AdminUserApi; import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; import cn.iocoder.yudao.module.system.enums.permission.RoleCodeEnum; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/content/PmsKnowledgeDocumentLabelServiceImpl.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/content/PmsKnowledgeDocumentLabelServiceImpl.java index 4a91d81fd..6bbbc442d 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/content/PmsKnowledgeDocumentLabelServiceImpl.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/content/PmsKnowledgeDocumentLabelServiceImpl.java @@ -12,7 +12,7 @@ import cn.iocoder.yudao.module.pms.dal.mysql.kb.content.PmsKnowledgeDocumentLabe import cn.iocoder.yudao.module.pms.dal.mysql.kb.content.PmsKnowledgeDocumentMapper; import cn.iocoder.yudao.module.pms.enums.kb.content.PmsKnowledgeDocumentStatusEnum; import cn.iocoder.yudao.module.pms.service.kb.library.PmsKnowledgeLibraryMemberService; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/content/PmsKnowledgeDocumentServiceImpl.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/content/PmsKnowledgeDocumentServiceImpl.java index c1e4f6890..c1bab3485 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/content/PmsKnowledgeDocumentServiceImpl.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/content/PmsKnowledgeDocumentServiceImpl.java @@ -15,7 +15,7 @@ import cn.iocoder.yudao.module.pms.service.kb.interaction.PmsKnowledgeFavoriteSe import cn.iocoder.yudao.module.pms.service.kb.interaction.PmsKnowledgeViewRecordService; import cn.iocoder.yudao.module.pms.service.kb.library.PmsKnowledgeLibraryMemberService; import cn.iocoder.yudao.module.pms.service.kb.recycle.PmsKnowledgeRecycleService; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/content/PmsKnowledgeFolderServiceImpl.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/content/PmsKnowledgeFolderServiceImpl.java index 3c357535f..4ce70cab0 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/content/PmsKnowledgeFolderServiceImpl.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/content/PmsKnowledgeFolderServiceImpl.java @@ -14,7 +14,7 @@ import cn.iocoder.yudao.module.pms.service.kb.interaction.PmsKnowledgeFavoriteSe import cn.iocoder.yudao.module.pms.service.kb.interaction.PmsKnowledgeViewRecordService; import cn.iocoder.yudao.module.pms.service.kb.library.PmsKnowledgeLibraryMemberService; import cn.iocoder.yudao.module.pms.service.kb.recycle.PmsKnowledgeRecycleService; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/interaction/PmsKnowledgeDocumentCommentServiceImpl.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/interaction/PmsKnowledgeDocumentCommentServiceImpl.java index 33382d374..05586b8c1 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/interaction/PmsKnowledgeDocumentCommentServiceImpl.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/interaction/PmsKnowledgeDocumentCommentServiceImpl.java @@ -9,7 +9,7 @@ import cn.iocoder.yudao.module.pms.dal.dataobject.kb.interaction.PmsKnowledgeDoc import cn.iocoder.yudao.module.pms.dal.mysql.kb.interaction.PmsKnowledgeDocumentCommentMapper; import cn.iocoder.yudao.module.pms.enums.kb.content.PmsKnowledgeDocumentTypeEnum; import cn.iocoder.yudao.module.pms.service.kb.content.PmsKnowledgeDocumentService; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/interaction/PmsKnowledgeDocumentLikeServiceImpl.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/interaction/PmsKnowledgeDocumentLikeServiceImpl.java index de9993ee0..b5296d97d 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/interaction/PmsKnowledgeDocumentLikeServiceImpl.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/interaction/PmsKnowledgeDocumentLikeServiceImpl.java @@ -4,7 +4,7 @@ import cn.hutool.core.collection.CollUtil; import cn.iocoder.yudao.module.pms.dal.dataobject.kb.interaction.PmsKnowledgeDocumentLikeDO; import cn.iocoder.yudao.module.pms.dal.mysql.kb.interaction.PmsKnowledgeDocumentLikeMapper; import cn.iocoder.yudao.module.pms.enums.kb.PmsKnowledgeObjectTypeEnum; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/interaction/PmsKnowledgeDocumentShareServiceImpl.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/interaction/PmsKnowledgeDocumentShareServiceImpl.java index 78ff8c835..6e45c60de 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/interaction/PmsKnowledgeDocumentShareServiceImpl.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/interaction/PmsKnowledgeDocumentShareServiceImpl.java @@ -14,7 +14,7 @@ import cn.iocoder.yudao.module.system.api.notify.NotifyMessageSendApi; import cn.iocoder.yudao.module.system.api.notify.dto.NotifySendSingleToUserReqDTO; import cn.iocoder.yudao.module.system.api.user.AdminUserApi; import com.google.common.collect.Maps; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/interaction/PmsKnowledgeFavoriteServiceImpl.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/interaction/PmsKnowledgeFavoriteServiceImpl.java index b1d9b515e..737d3ed1a 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/interaction/PmsKnowledgeFavoriteServiceImpl.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/interaction/PmsKnowledgeFavoriteServiceImpl.java @@ -9,7 +9,7 @@ import cn.iocoder.yudao.module.pms.controller.admin.kb.interaction.vo.favorite.P import cn.iocoder.yudao.module.pms.dal.dataobject.kb.interaction.PmsKnowledgeFavoriteDO; import cn.iocoder.yudao.module.pms.dal.mysql.kb.interaction.PmsKnowledgeFavoriteMapper; import cn.iocoder.yudao.module.pms.enums.kb.PmsKnowledgeObjectTypeEnum; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/interaction/PmsKnowledgeFolderReadServiceImpl.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/interaction/PmsKnowledgeFolderReadServiceImpl.java index 8cb93cbfa..b5deac56d 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/interaction/PmsKnowledgeFolderReadServiceImpl.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/interaction/PmsKnowledgeFolderReadServiceImpl.java @@ -7,7 +7,7 @@ import cn.iocoder.yudao.module.pms.dal.mysql.kb.content.PmsKnowledgeFolderMapper import cn.iocoder.yudao.module.pms.enums.kb.content.PmsKnowledgeDocumentStatusEnum; import cn.iocoder.yudao.module.pms.service.kb.content.PmsKnowledgeContentPermissionService; import cn.iocoder.yudao.module.pms.service.kb.library.PmsKnowledgeLibraryMemberService; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/interaction/PmsKnowledgeInteractionTargetServiceImpl.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/interaction/PmsKnowledgeInteractionTargetServiceImpl.java index 9cdccb124..6e079b25e 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/interaction/PmsKnowledgeInteractionTargetServiceImpl.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/interaction/PmsKnowledgeInteractionTargetServiceImpl.java @@ -12,7 +12,7 @@ import cn.iocoder.yudao.module.pms.service.kb.content.PmsKnowledgeContentPermiss import cn.iocoder.yudao.module.pms.service.kb.content.PmsKnowledgeDocumentService; import cn.iocoder.yudao.module.pms.service.kb.library.PmsKnowledgeLibraryMemberService; import cn.iocoder.yudao.module.pms.service.kb.library.PmsKnowledgeLibraryService; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/interaction/PmsKnowledgeViewRecordServiceImpl.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/interaction/PmsKnowledgeViewRecordServiceImpl.java index e390a84fb..56c1aa002 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/interaction/PmsKnowledgeViewRecordServiceImpl.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/interaction/PmsKnowledgeViewRecordServiceImpl.java @@ -8,7 +8,7 @@ import cn.iocoder.yudao.module.pms.dal.dataobject.kb.interaction.PmsKnowledgeVie import cn.iocoder.yudao.module.pms.dal.mysql.kb.interaction.PmsKnowledgeViewRecordMapper; import cn.iocoder.yudao.module.pms.enums.kb.PmsKnowledgeObjectTypeEnum; import cn.iocoder.yudao.module.pms.service.kb.library.PmsKnowledgeLibraryMemberService; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/library/PmsKnowledgeGroupServiceImpl.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/library/PmsKnowledgeGroupServiceImpl.java index 25252dbde..84cc44ccf 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/library/PmsKnowledgeGroupServiceImpl.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/library/PmsKnowledgeGroupServiceImpl.java @@ -11,7 +11,7 @@ import cn.iocoder.yudao.module.pms.dal.dataobject.kb.library.PmsKnowledgeGroupRe import cn.iocoder.yudao.module.pms.dal.mysql.kb.library.PmsKnowledgeGroupMapper; import cn.iocoder.yudao.module.pms.dal.mysql.kb.library.PmsKnowledgeGroupRelationMapper; import cn.iocoder.yudao.module.pms.enums.kb.library.PmsKnowledgeGroupTypeEnum; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/library/PmsKnowledgeLibraryMemberServiceImpl.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/library/PmsKnowledgeLibraryMemberServiceImpl.java index 9d6788462..1c52f0539 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/library/PmsKnowledgeLibraryMemberServiceImpl.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/library/PmsKnowledgeLibraryMemberServiceImpl.java @@ -14,7 +14,7 @@ import cn.iocoder.yudao.module.system.api.permission.PermissionApi; import cn.iocoder.yudao.module.system.api.user.AdminUserApi; import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; import cn.iocoder.yudao.module.system.enums.permission.RoleCodeEnum; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/library/PmsKnowledgeLibraryServiceImpl.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/library/PmsKnowledgeLibraryServiceImpl.java index 24d2b13fd..cdf010786 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/library/PmsKnowledgeLibraryServiceImpl.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/library/PmsKnowledgeLibraryServiceImpl.java @@ -11,7 +11,7 @@ import cn.iocoder.yudao.module.pms.enums.kb.content.PmsKnowledgeDocumentStatusEn import cn.iocoder.yudao.module.pms.service.kb.recycle.PmsKnowledgeRecycleService; import cn.iocoder.yudao.module.system.api.permission.PermissionApi; import cn.iocoder.yudao.module.system.enums.permission.RoleCodeEnum; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/library/PmsKnowledgeLibraryTemplateServiceImpl.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/library/PmsKnowledgeLibraryTemplateServiceImpl.java index 1c3e1ef71..382adb6dc 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/library/PmsKnowledgeLibraryTemplateServiceImpl.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/library/PmsKnowledgeLibraryTemplateServiceImpl.java @@ -14,7 +14,7 @@ import cn.iocoder.yudao.module.pms.dal.dataobject.kb.library.PmsKnowledgeLibrary import cn.iocoder.yudao.module.pms.dal.mysql.kb.library.PmsKnowledgeLibraryTemplateMapper; import cn.iocoder.yudao.module.pms.enums.kb.content.PmsKnowledgeDocumentTypeEnum; import cn.iocoder.yudao.module.pms.service.kb.content.PmsKnowledgeDocumentService; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/recycle/PmsKnowledgeRecycleServiceImpl.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/recycle/PmsKnowledgeRecycleServiceImpl.java index bfc6f9555..800a32d43 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/recycle/PmsKnowledgeRecycleServiceImpl.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/kb/recycle/PmsKnowledgeRecycleServiceImpl.java @@ -31,7 +31,7 @@ import cn.iocoder.yudao.module.system.api.permission.PermissionApi; import cn.iocoder.yudao.module.system.api.user.AdminUserApi; import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; import cn.iocoder.yudao.module.system.enums.permission.RoleCodeEnum; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/iteration/PmsIterationServiceImpl.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/iteration/PmsIterationServiceImpl.java index 5753a17ee..0f3f2c89d 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/iteration/PmsIterationServiceImpl.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/iteration/PmsIterationServiceImpl.java @@ -21,7 +21,7 @@ import cn.iocoder.yudao.module.pms.service.pm.project.PmsProjectMemberService; import cn.iocoder.yudao.module.pms.service.pm.workitem.PmsWorkItemActivityService; import cn.iocoder.yudao.module.pms.service.pm.workitem.PmsWorkItemService; import cn.iocoder.yudao.module.pms.service.pm.workitem.PmsWorkItemWorkLogService; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/project/PmsProjectAnnouncementServiceImpl.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/project/PmsProjectAnnouncementServiceImpl.java index 3b4975958..62e68d325 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/project/PmsProjectAnnouncementServiceImpl.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/project/PmsProjectAnnouncementServiceImpl.java @@ -5,7 +5,7 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.pms.controller.admin.pm.project.vo.announcement.PmsProjectAnnouncementSaveReqVO; import cn.iocoder.yudao.module.pms.dal.dataobject.pm.project.PmsProjectAnnouncementDO; import cn.iocoder.yudao.module.pms.dal.mysql.pm.project.PmsProjectAnnouncementMapper; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/project/PmsProjectFavoriteServiceImpl.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/project/PmsProjectFavoriteServiceImpl.java index d0713ddb6..a150056a4 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/project/PmsProjectFavoriteServiceImpl.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/project/PmsProjectFavoriteServiceImpl.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.pms.service.pm.project; import cn.iocoder.yudao.module.pms.dal.dataobject.pm.project.PmsProjectFavoriteDO; import cn.iocoder.yudao.module.pms.dal.mysql.pm.project.PmsProjectFavoriteMapper; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/project/PmsProjectGroupServiceImpl.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/project/PmsProjectGroupServiceImpl.java index a110f9bf3..db4a261f4 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/project/PmsProjectGroupServiceImpl.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/project/PmsProjectGroupServiceImpl.java @@ -11,7 +11,7 @@ import cn.iocoder.yudao.module.pms.dal.dataobject.pm.project.PmsProjectGroupRela import cn.iocoder.yudao.module.pms.dal.mysql.pm.project.PmsProjectGroupMapper; import cn.iocoder.yudao.module.pms.dal.mysql.pm.project.PmsProjectGroupRelationMapper; import cn.iocoder.yudao.module.pms.enums.pm.project.PmsProjectGroupTypeEnum; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/project/PmsProjectMemberServiceImpl.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/project/PmsProjectMemberServiceImpl.java index 4f5678ffa..df8045acf 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/project/PmsProjectMemberServiceImpl.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/project/PmsProjectMemberServiceImpl.java @@ -15,7 +15,7 @@ import cn.iocoder.yudao.module.pms.enums.pm.project.PmsProjectStatusEnum; import cn.iocoder.yudao.module.system.api.permission.PermissionApi; import cn.iocoder.yudao.module.system.api.user.AdminUserApi; import cn.iocoder.yudao.module.system.enums.permission.RoleCodeEnum; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/project/PmsProjectServiceImpl.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/project/PmsProjectServiceImpl.java index b5775944b..5e4f0d753 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/project/PmsProjectServiceImpl.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/project/PmsProjectServiceImpl.java @@ -19,7 +19,7 @@ import cn.iocoder.yudao.module.pms.service.pm.workitem.PmsWorkItemStatusService; import cn.iocoder.yudao.module.pms.service.pm.workitem.PmsWorkItemWorkLogService; import cn.iocoder.yudao.module.system.api.permission.PermissionApi; import cn.iocoder.yudao.module.system.enums.permission.RoleCodeEnum; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/project/PmsProjectTemplateServiceImpl.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/project/PmsProjectTemplateServiceImpl.java index 0937ef399..9b7e3c6c6 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/project/PmsProjectTemplateServiceImpl.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/project/PmsProjectTemplateServiceImpl.java @@ -8,7 +8,7 @@ import cn.iocoder.yudao.module.pms.controller.admin.pm.project.vo.template.PmsPr import cn.iocoder.yudao.module.pms.dal.dataobject.pm.project.PmsProjectTemplateDO; import cn.iocoder.yudao.module.pms.dal.mysql.pm.project.PmsProjectTemplateMapper; import cn.iocoder.yudao.module.pms.enums.pm.workitem.PmsWorkItemTypeEnum; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/workbench/PmsWorkbenchServiceImpl.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/workbench/PmsWorkbenchServiceImpl.java index 5da2a863a..e0f0ea3ef 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/workbench/PmsWorkbenchServiceImpl.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/workbench/PmsWorkbenchServiceImpl.java @@ -10,7 +10,7 @@ import cn.iocoder.yudao.module.pms.enums.pm.workitem.PmsWorkItemTypeEnum; import cn.iocoder.yudao.module.pms.service.pm.iteration.PmsIterationService; import cn.iocoder.yudao.module.pms.service.pm.project.PmsProjectMemberService; import cn.iocoder.yudao.module.pms.service.pm.workitem.PmsWorkItemService; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/workitem/PmsWorkItemActivityServiceImpl.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/workitem/PmsWorkItemActivityServiceImpl.java index 98c855745..f9c2b0271 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/workitem/PmsWorkItemActivityServiceImpl.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/workitem/PmsWorkItemActivityServiceImpl.java @@ -14,7 +14,7 @@ import cn.iocoder.yudao.module.pms.enums.pm.workitem.PmsWorkItemPriorityEnum; import cn.iocoder.yudao.module.pms.service.pm.iteration.PmsIterationService; import cn.iocoder.yudao.module.system.api.user.AdminUserApi; import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/workitem/PmsWorkItemBoardServiceImpl.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/workitem/PmsWorkItemBoardServiceImpl.java index f022d0aa3..203378301 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/workitem/PmsWorkItemBoardServiceImpl.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/workitem/PmsWorkItemBoardServiceImpl.java @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.pms.service.pm.workitem; import cn.hutool.core.collection.CollUtil; import cn.iocoder.yudao.module.pms.dal.dataobject.pm.workitem.PmsWorkItemBoardDO; import cn.iocoder.yudao.module.pms.dal.mysql.pm.workitem.PmsWorkItemBoardMapper; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/workitem/PmsWorkItemCommentServiceImpl.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/workitem/PmsWorkItemCommentServiceImpl.java index 415bce153..627bd2901 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/workitem/PmsWorkItemCommentServiceImpl.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/workitem/PmsWorkItemCommentServiceImpl.java @@ -7,7 +7,7 @@ import cn.iocoder.yudao.module.pms.controller.admin.pm.workitem.vo.comment.PmsWo import cn.iocoder.yudao.module.pms.dal.dataobject.pm.workitem.PmsWorkItemCommentDO; import cn.iocoder.yudao.module.pms.dal.dataobject.pm.workitem.PmsWorkItemDO; import cn.iocoder.yudao.module.pms.dal.mysql.pm.workitem.PmsWorkItemCommentMapper; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/workitem/PmsWorkItemLabelServiceImpl.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/workitem/PmsWorkItemLabelServiceImpl.java index 4e8b70e79..17a920752 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/workitem/PmsWorkItemLabelServiceImpl.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/workitem/PmsWorkItemLabelServiceImpl.java @@ -6,7 +6,7 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.pms.controller.admin.pm.workitem.vo.label.PmsWorkItemLabelSaveReqVO; import cn.iocoder.yudao.module.pms.dal.dataobject.pm.workitem.PmsWorkItemLabelDO; import cn.iocoder.yudao.module.pms.dal.mysql.pm.workitem.PmsWorkItemLabelMapper; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/workitem/PmsWorkItemServiceImpl.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/workitem/PmsWorkItemServiceImpl.java index 73825968d..74671b4a2 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/workitem/PmsWorkItemServiceImpl.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/workitem/PmsWorkItemServiceImpl.java @@ -44,7 +44,7 @@ import cn.iocoder.yudao.module.system.api.notify.NotifyMessageSendApi; import cn.iocoder.yudao.module.system.api.notify.dto.NotifySendSingleToUserReqDTO; import cn.iocoder.yudao.module.system.api.user.AdminUserApi; import com.google.common.collect.Maps; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/workitem/PmsWorkItemStatusServiceImpl.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/workitem/PmsWorkItemStatusServiceImpl.java index fa24a748b..1075bb089 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/workitem/PmsWorkItemStatusServiceImpl.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/workitem/PmsWorkItemStatusServiceImpl.java @@ -18,7 +18,7 @@ import cn.iocoder.yudao.module.pms.enums.pm.project.PmsProjectTypeEnum; import cn.iocoder.yudao.module.pms.enums.pm.workitem.PmsWorkItemStatusTypeEnum; import cn.iocoder.yudao.module.pms.enums.pm.workitem.PmsWorkItemTypeEnum; import cn.iocoder.yudao.module.pms.service.pm.project.PmsProjectMemberService; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.springframework.context.annotation.Lazy; import org.springframework.dao.DuplicateKeyException; import org.springframework.stereotype.Service; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/workitem/PmsWorkItemUserSortServiceImpl.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/workitem/PmsWorkItemUserSortServiceImpl.java index c40f3db0f..93799fc28 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/workitem/PmsWorkItemUserSortServiceImpl.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/workitem/PmsWorkItemUserSortServiceImpl.java @@ -4,7 +4,7 @@ import cn.hutool.core.collection.CollUtil; import cn.iocoder.yudao.module.pms.dal.dataobject.pm.workitem.PmsWorkItemDO; import cn.iocoder.yudao.module.pms.dal.dataobject.pm.workitem.PmsWorkItemUserSortDO; import cn.iocoder.yudao.module.pms.dal.mysql.pm.workitem.PmsWorkItemUserSortMapper; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; diff --git a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/workitem/PmsWorkItemWorkLogServiceImpl.java b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/workitem/PmsWorkItemWorkLogServiceImpl.java index e58d3daf5..4fa22afc1 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/workitem/PmsWorkItemWorkLogServiceImpl.java +++ b/yudao-module-pms/yudao-module-pms-server/src/main/java/cn/iocoder/yudao/module/pms/service/pm/workitem/PmsWorkItemWorkLogServiceImpl.java @@ -16,7 +16,7 @@ import cn.iocoder.yudao.module.pms.dal.dataobject.pm.workitem.PmsWorkItemWorkLog import cn.iocoder.yudao.module.pms.dal.mysql.pm.workitem.PmsWorkItemWorkLogMapper; import cn.iocoder.yudao.module.pms.service.pm.iteration.PmsIterationService; import cn.iocoder.yudao.module.pms.service.pm.project.PmsProjectMemberService; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; diff --git a/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/kb/content/PmsKnowledgeContentPermissionServiceImplTest.java b/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/kb/content/PmsKnowledgeContentPermissionServiceImplTest.java index 59f10c095..e3d45a878 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/kb/content/PmsKnowledgeContentPermissionServiceImplTest.java +++ b/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/kb/content/PmsKnowledgeContentPermissionServiceImplTest.java @@ -16,11 +16,11 @@ import cn.iocoder.yudao.module.system.api.dept.DeptApi; import cn.iocoder.yudao.module.system.api.permission.PermissionApi; import cn.iocoder.yudao.module.system.api.user.AdminUserApi; import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Import; -import org.springframework.test.context.bean.override.mockito.MockitoBean; +import org.springframework.boot.test.mock.mockito.MockBean; import java.util.Arrays; import java.util.Collections; @@ -40,6 +40,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.anyCollection; import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.lenient; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -65,22 +66,22 @@ public class PmsKnowledgeContentPermissionServiceImplTest extends BaseDbUnitTest @Resource private PmsKnowledgeLibraryMemberMapper libraryMemberMapper; - @MockitoBean + @MockBean private PmsKnowledgeLibraryMemberService libraryMemberService; - @MockitoBean + @MockBean private PmsKnowledgeFolderService folderService; - @MockitoBean + @MockBean private PmsKnowledgeDocumentService documentService; - @MockitoBean + @MockBean private AdminUserApi adminUserApi; - @MockitoBean + @MockBean private DeptApi deptApi; - @MockitoBean + @MockBean private PermissionApi permissionApi; @BeforeEach public void setUpCloudApiMocks() { - lenient().when(permissionApi.hasAnyRoles(anyLong(), any(String[].class))).thenReturn(success(false)); + lenient().when(permissionApi.hasAnyRoles(anyLong(), anyString())).thenReturn(success(false)); lenient().when(adminUserApi.getUser(anyLong())).thenReturn(success(null)); lenient().when(adminUserApi.validateUserList(anyCollection())).thenReturn(success(true)); lenient().when(deptApi.validateDeptList(anyCollection())).thenReturn(success(true)); diff --git a/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/kb/content/PmsKnowledgeDocumentLabelServiceImplTest.java b/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/kb/content/PmsKnowledgeDocumentLabelServiceImplTest.java index daa10a767..75e81239f 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/kb/content/PmsKnowledgeDocumentLabelServiceImplTest.java +++ b/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/kb/content/PmsKnowledgeDocumentLabelServiceImplTest.java @@ -12,10 +12,10 @@ import cn.iocoder.yudao.module.pms.dal.mysql.kb.content.PmsKnowledgeDocumentMapp import cn.iocoder.yudao.module.pms.enums.kb.content.PmsKnowledgeDocumentStatusEnum; import cn.iocoder.yudao.module.pms.enums.kb.content.PmsKnowledgeDocumentTypeEnum; import cn.iocoder.yudao.module.pms.service.kb.library.PmsKnowledgeLibraryMemberService; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Import; -import org.springframework.test.context.bean.override.mockito.MockitoBean; +import org.springframework.boot.test.mock.mockito.MockBean; import java.util.Arrays; import java.util.Collections; @@ -46,9 +46,9 @@ public class PmsKnowledgeDocumentLabelServiceImplTest extends BaseDbUnitTest { @Resource private PmsKnowledgeDocumentMapper documentMapper; - @MockitoBean + @MockBean private PmsKnowledgeLibraryMemberService libraryMemberService; - @MockitoBean + @MockBean private PmsKnowledgeContentPermissionService contentPermissionService; @Test diff --git a/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/kb/content/PmsKnowledgeDocumentServiceImplTest.java b/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/kb/content/PmsKnowledgeDocumentServiceImplTest.java index 08bb98692..90b341a1c 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/kb/content/PmsKnowledgeDocumentServiceImplTest.java +++ b/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/kb/content/PmsKnowledgeDocumentServiceImplTest.java @@ -28,10 +28,10 @@ import cn.iocoder.yudao.module.pms.service.kb.library.PmsKnowledgeLibraryService import cn.iocoder.yudao.module.pms.service.kb.recycle.PmsKnowledgeRecycleServiceImpl; import cn.iocoder.yudao.module.system.api.permission.PermissionApi; import cn.iocoder.yudao.module.system.api.user.AdminUserApi; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Import; -import org.springframework.test.context.bean.override.mockito.MockitoBean; +import org.springframework.boot.test.mock.mockito.MockBean; import java.util.Arrays; import java.util.Collections; @@ -69,31 +69,31 @@ public class PmsKnowledgeDocumentServiceImplTest extends BaseDbUnitTest { private PmsKnowledgeFolderMapper folderMapper; @Resource private PmsKnowledgeDocumentMapper documentMapper; - @MockitoBean + @MockBean private PermissionApi permissionApi; - @MockitoBean + @MockBean private AdminUserApi adminUserApi; - @MockitoBean + @MockBean private PmsKnowledgeLibraryService libraryService; - @MockitoBean + @MockBean private PmsKnowledgeLibraryMemberService memberService; - @MockitoBean + @MockBean private PmsKnowledgeGroupService knowledgeGroupService; - @MockitoBean + @MockBean private PmsKnowledgeDocumentShareService knowledgeDocumentShareService; - @MockitoBean + @MockBean private PmsKnowledgeDocumentCommentService knowledgeDocumentCommentService; - @MockitoBean + @MockBean private PmsKnowledgeContentPermissionService contentPermissionService; - @MockitoBean + @MockBean private PmsKnowledgeDocumentLabelService documentLabelService; - @MockitoBean + @MockBean private PmsKnowledgeFolderService folderService; - @MockitoBean + @MockBean private PmsKnowledgeFavoriteService favoriteService; - @MockitoBean + @MockBean private PmsKnowledgeDocumentLikeService documentLikeService; - @MockitoBean + @MockBean private PmsKnowledgeViewRecordService viewRecordService; @Test diff --git a/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/kb/content/PmsKnowledgeFolderServiceImplTest.java b/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/kb/content/PmsKnowledgeFolderServiceImplTest.java index d990a04d0..83b04e975 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/kb/content/PmsKnowledgeFolderServiceImplTest.java +++ b/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/kb/content/PmsKnowledgeFolderServiceImplTest.java @@ -26,10 +26,10 @@ import cn.iocoder.yudao.module.pms.service.kb.library.PmsKnowledgeLibraryService import cn.iocoder.yudao.module.pms.service.kb.recycle.PmsKnowledgeRecycleServiceImpl; import cn.iocoder.yudao.module.system.api.permission.PermissionApi; import cn.iocoder.yudao.module.system.api.user.AdminUserApi; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Import; -import org.springframework.test.context.bean.override.mockito.MockitoBean; +import org.springframework.boot.test.mock.mockito.MockBean; import java.util.Arrays; import java.util.Collections; @@ -70,29 +70,29 @@ public class PmsKnowledgeFolderServiceImplTest extends BaseDbUnitTest { @Resource private PmsKnowledgeDocumentMapper documentMapper; - @MockitoBean + @MockBean private PermissionApi permissionApi; - @MockitoBean + @MockBean private AdminUserApi adminUserApi; - @MockitoBean + @MockBean private PmsKnowledgeLibraryService libraryService; - @MockitoBean + @MockBean private PmsKnowledgeLibraryMemberService memberService; - @MockitoBean + @MockBean private PmsKnowledgeGroupService knowledgeGroupService; - @MockitoBean + @MockBean private PmsKnowledgeDocumentShareService knowledgeDocumentShareService; - @MockitoBean + @MockBean private PmsKnowledgeDocumentCommentService knowledgeDocumentCommentService; - @MockitoBean + @MockBean private PmsKnowledgeContentPermissionService contentPermissionService; - @MockitoBean + @MockBean private PmsKnowledgeDocumentService documentService; - @MockitoBean + @MockBean private PmsKnowledgeFavoriteService favoriteService; - @MockitoBean + @MockBean private PmsKnowledgeDocumentLikeService documentLikeService; - @MockitoBean + @MockBean private PmsKnowledgeViewRecordService viewRecordService; @Test diff --git a/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/kb/interaction/PmsKnowledgeDocumentCommentServiceImplTest.java b/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/kb/interaction/PmsKnowledgeDocumentCommentServiceImplTest.java index 0425aca6a..d67934a9e 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/kb/interaction/PmsKnowledgeDocumentCommentServiceImplTest.java +++ b/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/kb/interaction/PmsKnowledgeDocumentCommentServiceImplTest.java @@ -8,10 +8,10 @@ import cn.iocoder.yudao.module.pms.dal.dataobject.kb.interaction.PmsKnowledgeDoc import cn.iocoder.yudao.module.pms.dal.mysql.kb.interaction.PmsKnowledgeDocumentCommentMapper; import cn.iocoder.yudao.module.pms.enums.kb.content.PmsKnowledgeDocumentTypeEnum; import cn.iocoder.yudao.module.pms.service.kb.content.PmsKnowledgeDocumentService; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Import; -import org.springframework.test.context.bean.override.mockito.MockitoBean; +import org.springframework.boot.test.mock.mockito.MockBean; import java.util.List; @@ -39,7 +39,7 @@ public class PmsKnowledgeDocumentCommentServiceImplTest extends BaseDbUnitTest { @Resource private PmsKnowledgeDocumentCommentMapper commentMapper; - @MockitoBean + @MockBean private PmsKnowledgeDocumentService documentService; @Test diff --git a/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/kb/interaction/PmsKnowledgeDocumentLikeServiceImplTest.java b/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/kb/interaction/PmsKnowledgeDocumentLikeServiceImplTest.java index 9e915a99b..68e2da175 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/kb/interaction/PmsKnowledgeDocumentLikeServiceImplTest.java +++ b/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/kb/interaction/PmsKnowledgeDocumentLikeServiceImplTest.java @@ -4,10 +4,10 @@ import cn.hutool.core.collection.CollUtil; import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; import cn.iocoder.yudao.module.pms.dal.mysql.kb.interaction.PmsKnowledgeDocumentLikeMapper; import cn.iocoder.yudao.module.pms.enums.kb.PmsKnowledgeObjectTypeEnum; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Import; -import org.springframework.test.context.bean.override.mockito.MockitoBean; +import org.springframework.boot.test.mock.mockito.MockBean; import java.util.Collections; @@ -31,7 +31,7 @@ public class PmsKnowledgeDocumentLikeServiceImplTest extends BaseDbUnitTest { @Resource private PmsKnowledgeDocumentLikeMapper documentLikeMapper; - @MockitoBean + @MockBean private PmsKnowledgeInteractionTargetService interactionTargetService; @Test diff --git a/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/kb/interaction/PmsKnowledgeDocumentShareServiceImplTest.java b/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/kb/interaction/PmsKnowledgeDocumentShareServiceImplTest.java index 7e3d690c8..34815f4ea 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/kb/interaction/PmsKnowledgeDocumentShareServiceImplTest.java +++ b/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/kb/interaction/PmsKnowledgeDocumentShareServiceImplTest.java @@ -12,12 +12,12 @@ import cn.iocoder.yudao.module.pms.service.kb.content.PmsKnowledgeContentPermiss import cn.iocoder.yudao.module.system.api.notify.NotifyMessageSendApi; import cn.iocoder.yudao.module.system.api.notify.dto.NotifySendSingleToUserReqDTO; import cn.iocoder.yudao.module.system.api.user.AdminUserApi; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.springframework.context.annotation.Import; -import org.springframework.test.context.bean.override.mockito.MockitoBean; +import org.springframework.boot.test.mock.mockito.MockBean; import java.util.Arrays; import java.util.Collections; @@ -58,11 +58,11 @@ public class PmsKnowledgeDocumentShareServiceImplTest extends BaseDbUnitTest { @Resource private PmsKnowledgeLibraryMapper libraryMapper; - @MockitoBean + @MockBean private PmsKnowledgeContentPermissionService contentPermissionService; - @MockitoBean + @MockBean private NotifyMessageSendApi notifyMessageSendApi; - @MockitoBean + @MockBean private AdminUserApi adminUserApi; @BeforeEach diff --git a/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/kb/interaction/PmsKnowledgeFavoriteServiceImplTest.java b/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/kb/interaction/PmsKnowledgeFavoriteServiceImplTest.java index bbaa46153..623beac4f 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/kb/interaction/PmsKnowledgeFavoriteServiceImplTest.java +++ b/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/kb/interaction/PmsKnowledgeFavoriteServiceImplTest.java @@ -9,10 +9,10 @@ import cn.iocoder.yudao.module.pms.controller.admin.kb.interaction.vo.favorite.P import cn.iocoder.yudao.module.pms.dal.dataobject.kb.interaction.PmsKnowledgeFavoriteDO; import cn.iocoder.yudao.module.pms.dal.mysql.kb.interaction.PmsKnowledgeFavoriteMapper; import cn.iocoder.yudao.module.pms.enums.kb.PmsKnowledgeObjectTypeEnum; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Import; -import org.springframework.test.context.bean.override.mockito.MockitoBean; +import org.springframework.boot.test.mock.mockito.MockBean; import java.util.Arrays; import java.util.Collections; @@ -45,7 +45,7 @@ public class PmsKnowledgeFavoriteServiceImplTest extends BaseDbUnitTest { @Resource private PmsKnowledgeFavoriteMapper favoriteMapper; - @MockitoBean + @MockBean private PmsKnowledgeInteractionTargetService interactionTargetService; @Test diff --git a/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/kb/interaction/PmsKnowledgeViewRecordServiceImplTest.java b/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/kb/interaction/PmsKnowledgeViewRecordServiceImplTest.java index 91f04f185..27ad73c91 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/kb/interaction/PmsKnowledgeViewRecordServiceImplTest.java +++ b/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/kb/interaction/PmsKnowledgeViewRecordServiceImplTest.java @@ -8,10 +8,10 @@ import cn.iocoder.yudao.module.pms.dal.dataobject.kb.interaction.PmsKnowledgeVie import cn.iocoder.yudao.module.pms.dal.mysql.kb.interaction.PmsKnowledgeViewRecordMapper; import cn.iocoder.yudao.module.pms.enums.kb.PmsKnowledgeObjectTypeEnum; import cn.iocoder.yudao.module.pms.service.kb.library.PmsKnowledgeLibraryMemberService; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Import; -import org.springframework.test.context.bean.override.mockito.MockitoBean; +import org.springframework.boot.test.mock.mockito.MockBean; import java.time.LocalDateTime; import java.util.Arrays; @@ -40,9 +40,9 @@ public class PmsKnowledgeViewRecordServiceImplTest extends BaseDbUnitTest { @Resource private PmsKnowledgeViewRecordMapper viewRecordMapper; - @MockitoBean + @MockBean private PmsKnowledgeInteractionTargetService interactionTargetService; - @MockitoBean + @MockBean private PmsKnowledgeLibraryMemberService libraryMemberService; @Test diff --git a/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/kb/library/PmsKnowledgeGroupServiceImplTest.java b/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/kb/library/PmsKnowledgeGroupServiceImplTest.java index 80f48a64e..e91bee940 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/kb/library/PmsKnowledgeGroupServiceImplTest.java +++ b/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/kb/library/PmsKnowledgeGroupServiceImplTest.java @@ -9,10 +9,10 @@ import cn.iocoder.yudao.module.pms.dal.dataobject.kb.library.PmsKnowledgeLibrary import cn.iocoder.yudao.module.pms.dal.mysql.kb.library.PmsKnowledgeGroupMapper; import cn.iocoder.yudao.module.pms.dal.mysql.kb.library.PmsKnowledgeGroupRelationMapper; import cn.iocoder.yudao.module.pms.enums.kb.library.PmsKnowledgeGroupTypeEnum; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Import; -import org.springframework.test.context.bean.override.mockito.MockitoBean; +import org.springframework.boot.test.mock.mockito.MockBean; import java.util.Arrays; import java.util.Collections; @@ -44,7 +44,7 @@ public class PmsKnowledgeGroupServiceImplTest extends BaseDbUnitTest { @Resource private PmsKnowledgeGroupRelationMapper relationMapper; - @MockitoBean + @MockBean private PmsKnowledgeLibraryMemberService libraryMemberService; @Test diff --git a/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/kb/library/PmsKnowledgeLibraryMemberServiceImplTest.java b/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/kb/library/PmsKnowledgeLibraryMemberServiceImplTest.java index ec074e8d6..538ca792c 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/kb/library/PmsKnowledgeLibraryMemberServiceImplTest.java +++ b/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/kb/library/PmsKnowledgeLibraryMemberServiceImplTest.java @@ -13,11 +13,11 @@ import cn.iocoder.yudao.module.system.api.dept.DeptApi; import cn.iocoder.yudao.module.system.api.permission.PermissionApi; import cn.iocoder.yudao.module.system.api.user.AdminUserApi; import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Import; -import org.springframework.test.context.bean.override.mockito.MockitoBean; +import org.springframework.boot.test.mock.mockito.MockBean; import java.util.Arrays; import java.util.Collections; @@ -39,6 +39,7 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.anyCollection; import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.lenient; import static org.mockito.Mockito.when; @@ -57,20 +58,20 @@ public class PmsKnowledgeLibraryMemberServiceImplTest extends BaseDbUnitTest { @Resource private PmsKnowledgeLibraryMemberMapper memberMapper; - @MockitoBean + @MockBean private PmsKnowledgeLibraryService libraryService; - @MockitoBean + @MockBean private PmsKnowledgeContentPermissionService contentPermissionService; - @MockitoBean + @MockBean private PermissionApi permissionApi; - @MockitoBean + @MockBean private AdminUserApi adminUserApi; - @MockitoBean + @MockBean private DeptApi deptApi; @BeforeEach public void setUpCloudApiMocks() { - lenient().when(permissionApi.hasAnyRoles(anyLong(), org.mockito.ArgumentMatchers.any(String[].class))) + lenient().when(permissionApi.hasAnyRoles(anyLong(), anyString())) .thenReturn(success(false)); lenient().when(adminUserApi.getUser(anyLong())).thenReturn(success(null)); lenient().when(adminUserApi.validateUserList(anyCollection())).thenReturn(success(true)); diff --git a/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/kb/library/PmsKnowledgeLibraryServiceImplTest.java b/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/kb/library/PmsKnowledgeLibraryServiceImplTest.java index ca82affbf..a810de891 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/kb/library/PmsKnowledgeLibraryServiceImplTest.java +++ b/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/kb/library/PmsKnowledgeLibraryServiceImplTest.java @@ -9,11 +9,11 @@ import cn.iocoder.yudao.module.pms.dal.mysql.kb.library.PmsKnowledgeLibraryMappe import cn.iocoder.yudao.module.pms.enums.kb.content.PmsKnowledgeDocumentStatusEnum; import cn.iocoder.yudao.module.pms.service.kb.recycle.PmsKnowledgeRecycleService; import cn.iocoder.yudao.module.system.api.permission.PermissionApi; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Import; -import org.springframework.test.context.bean.override.mockito.MockitoBean; +import org.springframework.boot.test.mock.mockito.MockBean; import java.util.Arrays; import java.util.Collections; @@ -27,6 +27,7 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.lenient; import static org.mockito.Mockito.verify; @@ -46,20 +47,20 @@ public class PmsKnowledgeLibraryServiceImplTest extends BaseDbUnitTest { @Resource private PmsKnowledgeLibraryMapper libraryMapper; - @MockitoBean + @MockBean private PmsKnowledgeLibraryMemberService memberService; - @MockitoBean + @MockBean private PmsKnowledgeGroupService knowledgeGroupService; - @MockitoBean + @MockBean private PmsKnowledgeRecycleService recycleService; - @MockitoBean + @MockBean private PmsKnowledgeLibraryTemplateService libraryTemplateService; - @MockitoBean + @MockBean private PermissionApi permissionApi; @BeforeEach public void setUpCloudApiMocks() { - lenient().when(permissionApi.hasAnyRoles(anyLong(), any(String[].class))).thenReturn(success(false)); + lenient().when(permissionApi.hasAnyRoles(anyLong(), anyString())).thenReturn(success(false)); } @Test diff --git a/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/kb/library/PmsKnowledgeLibraryTemplateServiceImplTest.java b/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/kb/library/PmsKnowledgeLibraryTemplateServiceImplTest.java index ea45497d0..0cfd7880c 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/kb/library/PmsKnowledgeLibraryTemplateServiceImplTest.java +++ b/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/kb/library/PmsKnowledgeLibraryTemplateServiceImplTest.java @@ -8,11 +8,11 @@ import cn.iocoder.yudao.module.pms.controller.admin.kb.library.vo.template.PmsKn import cn.iocoder.yudao.module.pms.dal.dataobject.kb.library.PmsKnowledgeLibraryTemplateDO; import cn.iocoder.yudao.module.pms.dal.mysql.kb.library.PmsKnowledgeLibraryTemplateMapper; import cn.iocoder.yudao.module.pms.service.kb.content.PmsKnowledgeDocumentService; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.springframework.context.annotation.Import; -import org.springframework.test.context.bean.override.mockito.MockitoBean; +import org.springframework.boot.test.mock.mockito.MockBean; import java.util.ArrayList; import java.util.Arrays; @@ -47,7 +47,7 @@ public class PmsKnowledgeLibraryTemplateServiceImplTest extends BaseDbUnitTest { @Resource private PmsKnowledgeLibraryTemplateMapper templateMapper; - @MockitoBean + @MockBean private PmsKnowledgeDocumentService documentService; @org.junit.jupiter.api.BeforeEach diff --git a/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/kb/recycle/PmsKnowledgeRecycleServiceImplTest.java b/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/kb/recycle/PmsKnowledgeRecycleServiceImplTest.java index 30de0aecc..ed6910f62 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/kb/recycle/PmsKnowledgeRecycleServiceImplTest.java +++ b/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/kb/recycle/PmsKnowledgeRecycleServiceImplTest.java @@ -31,11 +31,11 @@ import cn.iocoder.yudao.module.pms.service.kb.library.PmsKnowledgeLibraryService import cn.iocoder.yudao.module.pms.service.kb.library.PmsKnowledgeLibraryTemplateService; import cn.iocoder.yudao.module.system.api.permission.PermissionApi; import cn.iocoder.yudao.module.system.api.user.AdminUserApi; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Import; -import org.springframework.test.context.bean.override.mockito.MockitoBean; +import org.springframework.boot.test.mock.mockito.MockBean; import java.time.LocalDateTime; import java.util.Arrays; @@ -55,6 +55,7 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.mockito.ArgumentMatchers.anyCollection; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.lenient; import static org.mockito.Mockito.when; @@ -82,34 +83,34 @@ public class PmsKnowledgeRecycleServiceImplTest extends BaseDbUnitTest { @Resource private PmsKnowledgeRecycleRecordMapper recycleRecordMapper; - @MockitoBean + @MockBean private PmsKnowledgeGroupService knowledgeGroupService; - @MockitoBean + @MockBean private PmsKnowledgeFavoriteService favoriteService; - @MockitoBean + @MockBean private PmsKnowledgeDocumentLikeService documentLikeService; - @MockitoBean + @MockBean private PmsKnowledgeViewRecordService viewRecordService; - @MockitoBean + @MockBean private PmsKnowledgeDocumentShareService documentShareService; - @MockitoBean + @MockBean private PmsKnowledgeDocumentCommentService documentCommentService; - @MockitoBean + @MockBean private PmsKnowledgeContentPermissionService contentPermissionService; - @MockitoBean + @MockBean private PmsKnowledgeDocumentLabelService documentLabelService; - @MockitoBean + @MockBean private PermissionApi permissionApi; - @MockitoBean + @MockBean private AdminUserApi adminUserApi; - @MockitoBean + @MockBean private PmsKnowledgeLibraryTemplateService libraryTemplateService; - @MockitoBean + @MockBean private PmsKnowledgeLibraryMemberService memberService; @BeforeEach public void setUpCloudApiMocks() { - lenient().when(permissionApi.hasAnyRoles(anyLong(), any(String[].class))).thenReturn(success(false)); + lenient().when(permissionApi.hasAnyRoles(anyLong(), anyString())).thenReturn(success(false)); lenient().when(adminUserApi.getUser(anyLong())).thenReturn(success(null)); } diff --git a/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/pm/iteration/PmsIterationServiceImplTest.java b/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/pm/iteration/PmsIterationServiceImplTest.java index d6fc459b9..cd47de412 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/pm/iteration/PmsIterationServiceImplTest.java +++ b/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/pm/iteration/PmsIterationServiceImplTest.java @@ -21,11 +21,11 @@ import cn.iocoder.yudao.module.pms.service.pm.project.PmsProjectMemberService; import cn.iocoder.yudao.module.pms.service.pm.workitem.PmsWorkItemActivityService; import cn.iocoder.yudao.module.pms.service.pm.workitem.PmsWorkItemService; import cn.iocoder.yudao.module.pms.service.pm.workitem.PmsWorkItemWorkLogService; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.junit.jupiter.api.Test; import org.mockito.ArgumentMatchers; import org.springframework.context.annotation.Import; -import org.springframework.test.context.bean.override.mockito.MockitoBean; +import org.springframework.boot.test.mock.mockito.MockBean; import java.time.LocalDateTime; import java.util.Arrays; @@ -58,13 +58,13 @@ public class PmsIterationServiceImplTest extends BaseDbUnitTest { @Resource private PmsIterationMapper iterationMapper; - @MockitoBean + @MockBean private PmsProjectMemberService projectMemberService; - @MockitoBean + @MockBean private PmsWorkItemService workItemService; - @MockitoBean + @MockBean private PmsWorkItemActivityService workItemActivityService; - @MockitoBean + @MockBean private PmsWorkItemWorkLogService workItemWorkLogService; @Test diff --git a/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/pm/project/PmsProjectAnnouncementServiceImplTest.java b/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/pm/project/PmsProjectAnnouncementServiceImplTest.java index 06c8c49bc..92ad1efc9 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/pm/project/PmsProjectAnnouncementServiceImplTest.java +++ b/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/pm/project/PmsProjectAnnouncementServiceImplTest.java @@ -6,10 +6,10 @@ import cn.iocoder.yudao.module.pms.controller.admin.pm.project.vo.announcement.P import cn.iocoder.yudao.module.pms.dal.dataobject.pm.project.PmsProjectAnnouncementDO; import cn.iocoder.yudao.module.pms.dal.dataobject.pm.project.PmsProjectDO; import cn.iocoder.yudao.module.pms.dal.mysql.pm.project.PmsProjectAnnouncementMapper; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Import; -import org.springframework.test.context.bean.override.mockito.MockitoBean; +import org.springframework.boot.test.mock.mockito.MockBean; import java.util.Collections; @@ -33,7 +33,7 @@ public class PmsProjectAnnouncementServiceImplTest extends BaseDbUnitTest { @Resource private PmsProjectAnnouncementMapper announcementMapper; - @MockitoBean + @MockBean private PmsProjectMemberService projectMemberService; @Test diff --git a/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/pm/project/PmsProjectFavoriteServiceImplTest.java b/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/pm/project/PmsProjectFavoriteServiceImplTest.java index d05e223b6..8a8ed82e6 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/pm/project/PmsProjectFavoriteServiceImplTest.java +++ b/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/pm/project/PmsProjectFavoriteServiceImplTest.java @@ -4,10 +4,10 @@ import cn.hutool.core.collection.CollUtil; import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; import cn.iocoder.yudao.module.pms.dal.dataobject.pm.project.PmsProjectDO; import cn.iocoder.yudao.module.pms.dal.mysql.pm.project.PmsProjectFavoriteMapper; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Import; -import org.springframework.test.context.bean.override.mockito.MockitoBean; +import org.springframework.boot.test.mock.mockito.MockBean; import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -29,7 +29,7 @@ public class PmsProjectFavoriteServiceImplTest extends BaseDbUnitTest { @Resource private PmsProjectFavoriteMapper favoriteMapper; - @MockitoBean + @MockBean private PmsProjectMemberService projectMemberService; @Test diff --git a/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/pm/project/PmsProjectGroupServiceImplTest.java b/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/pm/project/PmsProjectGroupServiceImplTest.java index 49a6e84f6..6af7718c9 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/pm/project/PmsProjectGroupServiceImplTest.java +++ b/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/pm/project/PmsProjectGroupServiceImplTest.java @@ -10,10 +10,10 @@ import cn.iocoder.yudao.module.pms.dal.dataobject.pm.project.PmsProjectGroupRela import cn.iocoder.yudao.module.pms.dal.mysql.pm.project.PmsProjectGroupMapper; import cn.iocoder.yudao.module.pms.dal.mysql.pm.project.PmsProjectGroupRelationMapper; import cn.iocoder.yudao.module.pms.enums.pm.project.PmsProjectGroupTypeEnum; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Import; -import org.springframework.test.context.bean.override.mockito.MockitoBean; +import org.springframework.boot.test.mock.mockito.MockBean; import java.util.List; import java.util.Map; @@ -49,7 +49,7 @@ public class PmsProjectGroupServiceImplTest extends BaseDbUnitTest { @Resource private PmsProjectGroupRelationMapper projectGroupRelationMapper; - @MockitoBean + @MockBean private PmsProjectMemberService projectMemberService; @Test diff --git a/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/pm/project/PmsProjectMemberServiceImplTest.java b/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/pm/project/PmsProjectMemberServiceImplTest.java index 3397c9e8e..d4f757de4 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/pm/project/PmsProjectMemberServiceImplTest.java +++ b/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/pm/project/PmsProjectMemberServiceImplTest.java @@ -12,11 +12,11 @@ import cn.iocoder.yudao.module.pms.enums.pm.project.PmsProjectStatusEnum; import cn.iocoder.yudao.module.system.api.permission.PermissionApi; import cn.iocoder.yudao.module.system.api.user.AdminUserApi; import cn.iocoder.yudao.module.system.enums.permission.RoleCodeEnum; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Import; -import org.springframework.test.context.bean.override.mockito.MockitoBean; +import org.springframework.boot.test.mock.mockito.MockBean; import java.util.List; @@ -38,6 +38,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyCollection; import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.lenient; import static org.mockito.Mockito.when; @@ -55,16 +56,16 @@ public class PmsProjectMemberServiceImplTest extends BaseDbUnitTest { @Resource private PmsProjectMemberMapper projectMemberMapper; - @MockitoBean + @MockBean private PmsProjectService projectService; - @MockitoBean + @MockBean private AdminUserApi adminUserApi; - @MockitoBean + @MockBean private PermissionApi permissionApi; @BeforeEach public void setUpCloudApiMocks() { - lenient().when(permissionApi.hasAnyRoles(anyLong(), any(String[].class))).thenReturn(success(false)); + lenient().when(permissionApi.hasAnyRoles(anyLong(), anyString())).thenReturn(success(false)); lenient().when(adminUserApi.validateUserList(anyCollection())).thenReturn(success(true)); } diff --git a/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/pm/project/PmsProjectServiceImplTest.java b/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/pm/project/PmsProjectServiceImplTest.java index 37274e57b..b1775a6ef 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/pm/project/PmsProjectServiceImplTest.java +++ b/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/pm/project/PmsProjectServiceImplTest.java @@ -19,11 +19,11 @@ import cn.iocoder.yudao.module.pms.service.pm.workitem.PmsWorkItemService; import cn.iocoder.yudao.module.pms.service.pm.workitem.PmsWorkItemStatusService; import cn.iocoder.yudao.module.pms.service.pm.workitem.PmsWorkItemWorkLogService; import cn.iocoder.yudao.module.system.api.permission.PermissionApi; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Import; -import org.springframework.test.context.bean.override.mockito.MockitoBean; +import org.springframework.boot.test.mock.mockito.MockBean; import java.time.LocalDateTime; import java.util.Arrays; @@ -44,6 +44,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.lenient; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -62,28 +63,28 @@ public class PmsProjectServiceImplTest extends BaseDbUnitTest { @Resource private PmsProjectMapper projectMapper; - @MockitoBean + @MockBean private PmsProjectMemberService projectMemberService; - @MockitoBean + @MockBean private PmsProjectGroupService projectGroupService; - @MockitoBean + @MockBean private PmsProjectFavoriteService projectFavoriteService; - @MockitoBean + @MockBean private PmsProjectAnnouncementService projectAnnouncementService; - @MockitoBean + @MockBean private PmsIterationService iterationService; - @MockitoBean + @MockBean private PmsWorkItemService workItemService; - @MockitoBean + @MockBean private PmsWorkItemStatusService workItemStatusService; - @MockitoBean + @MockBean private PmsWorkItemWorkLogService workItemWorkLogService; - @MockitoBean + @MockBean private PermissionApi permissionApi; @BeforeEach public void setUpCloudApiMocks() { - lenient().when(permissionApi.hasAnyRoles(anyLong(), any(String[].class))).thenReturn(success(false)); + lenient().when(permissionApi.hasAnyRoles(anyLong(), anyString())).thenReturn(success(false)); } @Test diff --git a/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/pm/project/PmsProjectTemplateServiceImplTest.java b/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/pm/project/PmsProjectTemplateServiceImplTest.java index 2bec6b0db..ae796773a 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/pm/project/PmsProjectTemplateServiceImplTest.java +++ b/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/pm/project/PmsProjectTemplateServiceImplTest.java @@ -7,7 +7,7 @@ import cn.iocoder.yudao.module.pms.dal.mysql.pm.project.PmsProjectTemplateMapper import cn.iocoder.yudao.module.pms.enums.pm.project.PmsProjectTypeEnum; import cn.iocoder.yudao.module.pms.enums.pm.workitem.PmsWorkItemStatusTypeEnum; import cn.iocoder.yudao.module.pms.enums.pm.workitem.PmsWorkItemTypeEnum; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Import; diff --git a/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/pm/workbench/PmsWorkbenchServiceImplTest.java b/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/pm/workbench/PmsWorkbenchServiceImplTest.java index af9f16c62..43e60cc4e 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/pm/workbench/PmsWorkbenchServiceImplTest.java +++ b/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/pm/workbench/PmsWorkbenchServiceImplTest.java @@ -11,10 +11,10 @@ import cn.iocoder.yudao.module.pms.enums.pm.workitem.PmsWorkItemTypeEnum; import cn.iocoder.yudao.module.pms.service.pm.iteration.PmsIterationService; import cn.iocoder.yudao.module.pms.service.pm.project.PmsProjectMemberService; import cn.iocoder.yudao.module.pms.service.pm.workitem.PmsWorkItemService; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Import; -import org.springframework.test.context.bean.override.mockito.MockitoBean; +import org.springframework.boot.test.mock.mockito.MockBean; import java.time.LocalDateTime; import java.util.Collections; @@ -35,11 +35,11 @@ public class PmsWorkbenchServiceImplTest extends BaseDbUnitTest { @Resource private PmsWorkbenchServiceImpl workbenchService; - @MockitoBean + @MockBean private PmsProjectMemberService projectMemberService; - @MockitoBean + @MockBean private PmsWorkItemService workItemService; - @MockitoBean + @MockBean private PmsIterationService iterationService; @Test diff --git a/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/pm/workitem/PmsWorkItemActivityServiceImplTest.java b/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/pm/workitem/PmsWorkItemActivityServiceImplTest.java index 208d34865..9243552d7 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/pm/workitem/PmsWorkItemActivityServiceImplTest.java +++ b/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/pm/workitem/PmsWorkItemActivityServiceImplTest.java @@ -6,10 +6,10 @@ import cn.iocoder.yudao.module.pms.dal.dataobject.pm.workitem.PmsWorkItemActivit import cn.iocoder.yudao.module.pms.dal.mysql.pm.workitem.PmsWorkItemActivityMapper; import cn.iocoder.yudao.module.pms.service.pm.iteration.PmsIterationService; import cn.iocoder.yudao.module.system.api.user.AdminUserApi; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Import; -import org.springframework.test.context.bean.override.mockito.MockitoBean; +import org.springframework.boot.test.mock.mockito.MockBean; import java.util.List; @@ -31,13 +31,13 @@ public class PmsWorkItemActivityServiceImplTest extends BaseDbUnitTest { @Resource private PmsWorkItemActivityMapper activityMapper; - @MockitoBean + @MockBean private PmsWorkItemLabelService workItemLabelService; - @MockitoBean + @MockBean private PmsWorkItemService workItemService; - @MockitoBean + @MockBean private PmsIterationService iterationService; - @MockitoBean + @MockBean private AdminUserApi adminUserApi; @Test diff --git a/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/pm/workitem/PmsWorkItemCommentServiceImplTest.java b/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/pm/workitem/PmsWorkItemCommentServiceImplTest.java index 23345e4fb..b602348e1 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/pm/workitem/PmsWorkItemCommentServiceImplTest.java +++ b/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/pm/workitem/PmsWorkItemCommentServiceImplTest.java @@ -5,10 +5,10 @@ import cn.iocoder.yudao.module.pms.controller.admin.pm.workitem.vo.comment.PmsWo import cn.iocoder.yudao.module.pms.dal.dataobject.pm.workitem.PmsWorkItemCommentDO; import cn.iocoder.yudao.module.pms.dal.dataobject.pm.workitem.PmsWorkItemDO; import cn.iocoder.yudao.module.pms.dal.mysql.pm.workitem.PmsWorkItemCommentMapper; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Import; -import org.springframework.test.context.bean.override.mockito.MockitoBean; +import org.springframework.boot.test.mock.mockito.MockBean; import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException; import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId; @@ -35,9 +35,9 @@ public class PmsWorkItemCommentServiceImplTest extends BaseDbUnitTest { @Resource private PmsWorkItemCommentMapper commentMapper; - @MockitoBean + @MockBean private PmsWorkItemService workItemService; - @MockitoBean + @MockBean private PmsWorkItemActivityService workItemActivityService; @Test diff --git a/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/pm/workitem/PmsWorkItemLabelServiceImplTest.java b/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/pm/workitem/PmsWorkItemLabelServiceImplTest.java index 3e61fbb24..3be6b109a 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/pm/workitem/PmsWorkItemLabelServiceImplTest.java +++ b/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/pm/workitem/PmsWorkItemLabelServiceImplTest.java @@ -4,7 +4,7 @@ import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; import cn.iocoder.yudao.module.pms.controller.admin.pm.workitem.vo.label.PmsWorkItemLabelSaveReqVO; import cn.iocoder.yudao.module.pms.dal.dataobject.pm.workitem.PmsWorkItemLabelDO; import cn.iocoder.yudao.module.pms.dal.mysql.pm.workitem.PmsWorkItemLabelMapper; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Import; diff --git a/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/pm/workitem/PmsWorkItemServiceImplTest.java b/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/pm/workitem/PmsWorkItemServiceImplTest.java index 0dfd682a8..1120c04cc 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/pm/workitem/PmsWorkItemServiceImplTest.java +++ b/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/pm/workitem/PmsWorkItemServiceImplTest.java @@ -44,11 +44,11 @@ import cn.iocoder.yudao.module.system.api.notify.NotifyMessageSendApi; import cn.iocoder.yudao.module.system.api.notify.dto.NotifySendSingleToUserReqDTO; import cn.iocoder.yudao.module.system.api.user.AdminUserApi; import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.springframework.context.annotation.Import; -import org.springframework.test.context.bean.override.mockito.MockitoBean; +import org.springframework.boot.test.mock.mockito.MockBean; import java.time.LocalDateTime; import java.util.Arrays; @@ -111,20 +111,20 @@ public class PmsWorkItemServiceImplTest extends BaseDbUnitTest { @Resource private PmsWorkItemUserSortMapper workItemUserSortMapper; - @MockitoBean + @MockBean private PmsProjectMemberService projectMemberService; - @MockitoBean + @MockBean private PmsIterationService iterationService; - @MockitoBean + @MockBean private PmsWorkItemLabelService workItemLabelService; - @MockitoBean + @MockBean private PmsWorkItemActivityService workItemActivityService; @Resource private PmsWorkItemStatusServiceImpl workItemStatusService; - @MockitoBean + @MockBean private NotifyMessageSendApi notifyMessageSendApi; - @MockitoBean + @MockBean private AdminUserApi adminUserApi; @Test diff --git a/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/pm/workitem/PmsWorkItemStatusServiceImplTest.java b/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/pm/workitem/PmsWorkItemStatusServiceImplTest.java index 418da46fa..677c4f7e4 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/pm/workitem/PmsWorkItemStatusServiceImplTest.java +++ b/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/pm/workitem/PmsWorkItemStatusServiceImplTest.java @@ -23,10 +23,10 @@ import cn.iocoder.yudao.module.pms.service.pm.iteration.PmsIterationService; import cn.iocoder.yudao.module.pms.service.pm.project.PmsProjectMemberService; import cn.iocoder.yudao.module.system.api.notify.NotifyMessageSendApi; import cn.iocoder.yudao.module.system.api.user.AdminUserApi; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Import; -import org.springframework.test.context.bean.override.mockito.MockitoBean; +import org.springframework.boot.test.mock.mockito.MockBean; import java.util.Arrays; import java.util.Collections; @@ -62,23 +62,23 @@ public class PmsWorkItemStatusServiceImplTest extends BaseDbUnitTest { @Resource private PmsWorkItemMapper workItemMapper; - @MockitoBean + @MockBean private PmsProjectMemberService projectMemberService; - @MockitoBean + @MockBean private PmsIterationService iterationService; - @MockitoBean + @MockBean private PmsWorkItemCommentService workItemCommentService; - @MockitoBean + @MockBean private PmsWorkItemWorkLogService workItemWorkLogService; - @MockitoBean + @MockBean private PmsWorkItemUserSortService workItemUserSortService; - @MockitoBean + @MockBean private PmsWorkItemLabelService workItemLabelService; - @MockitoBean + @MockBean private PmsWorkItemActivityService workItemActivityService; - @MockitoBean + @MockBean private NotifyMessageSendApi notifyMessageSendApi; - @MockitoBean + @MockBean private AdminUserApi adminUserApi; @Test diff --git a/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/pm/workitem/PmsWorkItemWorkLogServiceImplTest.java b/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/pm/workitem/PmsWorkItemWorkLogServiceImplTest.java index 3f78aff1a..249de1e09 100644 --- a/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/pm/workitem/PmsWorkItemWorkLogServiceImplTest.java +++ b/yudao-module-pms/yudao-module-pms-server/src/test/java/cn/iocoder/yudao/module/pms/service/pm/workitem/PmsWorkItemWorkLogServiceImplTest.java @@ -13,10 +13,10 @@ import cn.iocoder.yudao.module.pms.dal.dataobject.pm.workitem.PmsWorkItemWorkLog import cn.iocoder.yudao.module.pms.dal.mysql.pm.workitem.PmsWorkItemWorkLogMapper; import cn.iocoder.yudao.module.pms.service.pm.iteration.PmsIterationService; import cn.iocoder.yudao.module.pms.service.pm.project.PmsProjectMemberService; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Import; -import org.springframework.test.context.bean.override.mockito.MockitoBean; +import org.springframework.boot.test.mock.mockito.MockBean; import java.time.LocalDate; import java.time.LocalDateTime; @@ -46,13 +46,13 @@ public class PmsWorkItemWorkLogServiceImplTest extends BaseDbUnitTest { @Resource private PmsWorkItemWorkLogMapper workLogMapper; - @MockitoBean + @MockBean private PmsWorkItemService workItemService; - @MockitoBean + @MockBean private PmsProjectMemberService projectMemberService; - @MockitoBean + @MockBean private PmsWorkItemActivityService workItemActivityService; - @MockitoBean + @MockBean private PmsIterationService iterationService; @Test