From 7c343a217ce0f883fce021a34ca2908f038e613c Mon Sep 17 00:00:00 2001 From: Tpj <295983632@qq.com> Date: Fri, 3 Jan 2025 15:22:08 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=E8=B7=9F=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yudao-module-hrmrg/pom.xml | 19 +++--- .../yudao-module-hrmrg-api/pom.xml | 23 ++++--- .../yudao-module-hrmrg-biz/pom.xml | 66 +++++++++++++++++-- .../admin/adminatmk/AdminAtmkController.java | 9 +-- .../adminatmk/vo/AdminAtmkPageReqVO.java | 2 +- .../admin/adminatmk/vo/AdminAtmkRespVO.java | 2 +- .../adminatmk/vo/AdminAtmkSaveReqVO.java | 4 +- .../AdminAtmkFaceController.java | 10 +-- .../vo/AdminAtmkFacePageReqVO.java | 2 +- .../adminatmkface/vo/AdminAtmkFaceRespVO.java | 2 +- .../vo/AdminAtmkFaceSaveReqVO.java | 5 +- .../AdminAtmkGroutCfgController.java | 9 +-- .../vo/AdminAtmkGroutCfgPageReqVO.java | 2 +- .../vo/AdminAtmkGroutCfgRespVO.java | 2 +- .../vo/AdminAtmkGroutCfgSaveReqVO.java | 6 +- .../adminperfcfg/AdminPerfCfgController.java | 10 +-- .../vo/AdminPerfCfgPageReqVO.java | 2 +- .../adminperfcfg/vo/AdminPerfCfgRespVO.java | 2 +- .../vo/AdminPerfCfgSaveReqVO.java | 7 +- .../adminpostcfg/AdminPostCfgController.java | 10 +-- .../vo/AdminPostCfgPageReqVO.java | 2 +- .../adminpostcfg/vo/AdminPostCfgRespVO.java | 2 +- .../vo/AdminPostCfgSaveReqVO.java | 4 +- .../dal/dataobject/adminatmk/AdminAtmkDO.java | 2 +- .../adminatmkface/AdminAtmkFaceDO.java | 2 +- .../AdminAtmkGroutCfgDO.java | 2 +- .../adminperfcfg/AdminPerfCfgDO.java | 2 +- .../adminpostcfg/AdminPostCfgDO.java | 2 +- .../dal/mysql/adminatmk/AdminAtmkMapper.java | 2 +- .../adminatmkface/AdminAtmkFaceMapper.java | 2 +- .../AdminAtmkGroutCfgMapper.java | 2 +- .../adminperfcfg/AdminPerfCfgMapper.java | 2 +- .../adminpostcfg/AdminPostCfgMapper.java | 2 +- .../service/adminatmk/AdminAtmkService.java | 4 +- .../adminatmk/AdminAtmkServiceImpl.java | 4 +- .../adminatmkface/AdminAtmkFaceService.java | 4 +- .../AdminAtmkFaceServiceImpl.java | 4 +- .../AdminAtmkGroutCfgService.java | 4 +- .../AdminAtmkGroutCfgServiceImpl.java | 4 +- .../adminperfcfg/AdminPerfCfgService.java | 4 +- .../adminperfcfg/AdminPerfCfgServiceImpl.java | 4 +- .../adminpostcfg/AdminPostCfgService.java | 4 +- .../adminpostcfg/AdminPostCfgServiceImpl.java | 4 +- .../src/main/resources/application-dev.yaml | 13 ++-- .../src/main/resources/application-local.yaml | 44 +++++++++---- 45 files changed, 209 insertions(+), 110 deletions(-) diff --git a/yudao-module-hrmrg/pom.xml b/yudao-module-hrmrg/pom.xml index d6f924d48..cb39887b1 100644 --- a/yudao-module-hrmrg/pom.xml +++ b/yudao-module-hrmrg/pom.xml @@ -3,18 +3,21 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - yudao cn.iocoder.cloud - ${revision} + yudao + ${revision} + + yudao-module-hrmrg-api + yudao-module-hrmrg-biz + 4.0.0 - yudao-module-hrmrg - pom + pom - ${project.artifactId} - - hrmrg 模块，主要实现 HRM 人力资源管理相关功能。 + ${project.artifactId} + + hr 包下，人力资源管理（Human Resource Management）。 - + \ No newline at end of file diff --git a/yudao-module-hrmrg/yudao-module-hrmrg-api/pom.xml b/yudao-module-hrmrg/yudao-module-hrmrg-api/pom.xml index 9d1eec921..d8e776b96 100644 --- a/yudao-module-hrmrg/yudao-module-hrmrg-api/pom.xml +++ b/yudao-module-hrmrg/yudao-module-hrmrg-api/pom.xml @@ -3,24 +3,31 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - yudao-module-hrmrg cn.iocoder.cloud - ${revision} + yudao-module-hrmrg + ${revision} 4.0.0 yudao-module-hrmrg-api - jar + jar - ${project.artifactId} - - hrmrg-api 模块 API，暴露给其它模块调用 + ${project.artifactId} + + erp 模块 API，暴露给其它模块调用 - + cn.iocoder.cloud yudao-common + + + + org.springframework.boot + spring-boot-starter-validation + true + - + \ No newline at end of file diff --git a/yudao-module-hrmrg/yudao-module-hrmrg-biz/pom.xml b/yudao-module-hrmrg/yudao-module-hrmrg-biz/pom.xml index 0aff0cb19..9a171b0a4 100644 --- a/yudao-module-hrmrg/yudao-module-hrmrg-biz/pom.xml +++ b/yudao-module-hrmrg/yudao-module-hrmrg-biz/pom.xml @@ -13,7 +13,7 @@ ${project.artifactId} - hrmrg 模块，主要实现人力资源管理相关功能。 + HR 模块 BIZ，主要提供 HR 相关的业务功能。 @@ -24,13 +24,17 @@ + + cn.iocoder.cloud + yudao-module-system-api + ${revision} + cn.iocoder.cloud yudao-module-hrmrg-api ${revision} - cn.iocoder.cloud @@ -40,11 +44,12 @@ cn.iocoder.cloud - yudao-spring-boot-starter-web + yudao-spring-boot-starter-security + cn.iocoder.cloud - yudao-spring-boot-starter-security + yudao-spring-boot-starter-websocket @@ -52,6 +57,15 @@ cn.iocoder.cloud yudao-spring-boot-starter-mybatis + + com.baomidou + mybatis-plus-generator + + + + cn.iocoder.cloud + yudao-spring-boot-starter-redis + @@ -71,10 +85,23 @@ spring-cloud-starter-alibaba-nacos-config + + + cn.iocoder.cloud + yudao-spring-boot-starter-job + + + + + cn.iocoder.cloud + yudao-spring-boot-starter-mq + + cn.iocoder.cloud yudao-spring-boot-starter-test + test @@ -83,13 +110,42 @@ yudao-spring-boot-starter-excel + + org.apache.velocity + velocity-engine-core + + cn.iocoder.cloud yudao-spring-boot-starter-monitor - + + de.codecentric + spring-boot-admin-starter-server + + + + + commons-net + commons-net + + + com.jcraft + jsch + + + com.amazonaws + aws-java-sdk-s3 + + + + org.apache.tika + tika-core + + + ${project.artifactId} diff --git a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminatmk/AdminAtmkController.java b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminatmk/AdminAtmkController.java index 0ed4aaa7a..2e5881c7d 100644 --- a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminatmk/AdminAtmkController.java +++ b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminatmk/AdminAtmkController.java @@ -8,8 +8,9 @@ import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import java.util.*; + import java.io.IOException; +import java.util.List; import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.pojo.PageResult; @@ -26,9 +27,9 @@ import cn.iocoder.yudao.module.hrmrg.controller.admin.adminatmk.vo.*; import cn.iocoder.yudao.module.hrmrg.dal.dataobject.adminatmk.AdminAtmkDO; import cn.iocoder.yudao.module.hrmrg.service.adminatmk.AdminAtmkService; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; @Tag(name = "管理后台 - 考勤打卡") @RestController diff --git a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminatmk/vo/AdminAtmkPageReqVO.java b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminatmk/vo/AdminAtmkPageReqVO.java index 28cb94136..da7d0766b 100644 --- a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminatmk/vo/AdminAtmkPageReqVO.java +++ b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminatmk/vo/AdminAtmkPageReqVO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.hrmrg.controller.admin.adminatmk.vo; import lombok.*; -import java.util.*; + import io.swagger.v3.oas.annotations.media.Schema; import cn.iocoder.yudao.framework.common.pojo.PageParam; import org.springframework.format.annotation.DateTimeFormat; diff --git a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminatmk/vo/AdminAtmkRespVO.java b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminatmk/vo/AdminAtmkRespVO.java index 6f76a2984..986604666 100644 --- a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminatmk/vo/AdminAtmkRespVO.java +++ b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminatmk/vo/AdminAtmkRespVO.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.hrmrg.controller.admin.adminatmk.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; + import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; import com.alibaba.excel.annotation.*; diff --git a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminatmk/vo/AdminAtmkSaveReqVO.java b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminatmk/vo/AdminAtmkSaveReqVO.java index b2174efde..21fd9ce22 100644 --- a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminatmk/vo/AdminAtmkSaveReqVO.java +++ b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminatmk/vo/AdminAtmkSaveReqVO.java @@ -2,10 +2,10 @@ package cn.iocoder.yudao.module.hrmrg.controller.admin.adminatmk.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; + import org.springframework.format.annotation.DateTimeFormat; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.time.LocalDateTime; @Schema(description = "管理后台 - 考勤打卡新增/修改 Request VO") diff --git a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminatmkface/AdminAtmkFaceController.java b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminatmkface/AdminAtmkFaceController.java index 848940387..2ed7aa2c4 100644 --- a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminatmkface/AdminAtmkFaceController.java +++ b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminatmkface/AdminAtmkFaceController.java @@ -1,5 +1,8 @@ package cn.iocoder.yudao.module.hrmrg.controller.admin.adminatmkface; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; @@ -9,8 +12,9 @@ import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import java.util.*; + import java.io.IOException; +import java.util.List; import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.pojo.PageResult; @@ -27,9 +31,7 @@ import cn.iocoder.yudao.module.hrmrg.controller.admin.adminatmkface.vo.*; import cn.iocoder.yudao.module.hrmrg.dal.dataobject.adminatmkface.AdminAtmkFaceDO; import cn.iocoder.yudao.module.hrmrg.service.adminatmkface.AdminAtmkFaceService; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; + @Tag(name = "管理后台 - 人脸识别库") @RestController diff --git a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminatmkface/vo/AdminAtmkFacePageReqVO.java b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminatmkface/vo/AdminAtmkFacePageReqVO.java index 1f022df73..13bfba3cc 100644 --- a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminatmkface/vo/AdminAtmkFacePageReqVO.java +++ b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminatmkface/vo/AdminAtmkFacePageReqVO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.hrmrg.controller.admin.adminatmkface.vo; import lombok.*; -import java.util.*; + import io.swagger.v3.oas.annotations.media.Schema; import cn.iocoder.yudao.framework.common.pojo.PageParam; import org.springframework.format.annotation.DateTimeFormat; diff --git a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminatmkface/vo/AdminAtmkFaceRespVO.java b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminatmkface/vo/AdminAtmkFaceRespVO.java index dc0c2cb44..a53c775db 100644 --- a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminatmkface/vo/AdminAtmkFaceRespVO.java +++ b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminatmkface/vo/AdminAtmkFaceRespVO.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.hrmrg.controller.admin.adminatmkface.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; + import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; import com.alibaba.excel.annotation.*; diff --git a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminatmkface/vo/AdminAtmkFaceSaveReqVO.java b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminatmkface/vo/AdminAtmkFaceSaveReqVO.java index 28fae465e..6ba39e0c8 100644 --- a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminatmkface/vo/AdminAtmkFaceSaveReqVO.java +++ b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminatmkface/vo/AdminAtmkFaceSaveReqVO.java @@ -1,10 +1,11 @@ package cn.iocoder.yudao.module.hrmrg.controller.admin.adminatmkface.vo; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; import lombok.*; -import javax.validation.constraints.NotNull; -import java.util.*; + + @Schema(description = "管理后台 - 人脸识别库新增/修改 Request VO") @Data diff --git a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminatmkgroutcfg/AdminAtmkGroutCfgController.java b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminatmkgroutcfg/AdminAtmkGroutCfgController.java index 8b2e320fd..8a99bcb3f 100644 --- a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminatmkgroutcfg/AdminAtmkGroutCfgController.java +++ b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminatmkgroutcfg/AdminAtmkGroutCfgController.java @@ -1,13 +1,17 @@ package cn.iocoder.yudao.module.hrmrg.controller.admin.adminatmkgroutcfg; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import java.util.*; + import java.io.IOException; +import java.util.List; import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.pojo.PageResult; @@ -24,9 +28,6 @@ import cn.iocoder.yudao.module.hrmrg.controller.admin.adminatmkgroutcfg.vo.*; import cn.iocoder.yudao.module.hrmrg.dal.dataobject.adminatmkgroutcfg.AdminAtmkGroutCfgDO; import cn.iocoder.yudao.module.hrmrg.service.adminatmkgroutcfg.AdminAtmkGroutCfgService; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; @Tag(name = "管理后台 - 考勤组设置") @RestController diff --git a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminatmkgroutcfg/vo/AdminAtmkGroutCfgPageReqVO.java b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminatmkgroutcfg/vo/AdminAtmkGroutCfgPageReqVO.java index 83abb7b7d..90485383a 100644 --- a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminatmkgroutcfg/vo/AdminAtmkGroutCfgPageReqVO.java +++ b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminatmkgroutcfg/vo/AdminAtmkGroutCfgPageReqVO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.hrmrg.controller.admin.adminatmkgroutcfg.vo; import lombok.*; -import java.util.*; + import io.swagger.v3.oas.annotations.media.Schema; import cn.iocoder.yudao.framework.common.pojo.PageParam; import org.springframework.format.annotation.DateTimeFormat; diff --git a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminatmkgroutcfg/vo/AdminAtmkGroutCfgRespVO.java b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminatmkgroutcfg/vo/AdminAtmkGroutCfgRespVO.java index 2d45e1c8e..c847db373 100644 --- a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminatmkgroutcfg/vo/AdminAtmkGroutCfgRespVO.java +++ b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminatmkgroutcfg/vo/AdminAtmkGroutCfgRespVO.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.hrmrg.controller.admin.adminatmkgroutcfg.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; + import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; import com.alibaba.excel.annotation.*; diff --git a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminatmkgroutcfg/vo/AdminAtmkGroutCfgSaveReqVO.java b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminatmkgroutcfg/vo/AdminAtmkGroutCfgSaveReqVO.java index 3a51006eb..84fbb363c 100644 --- a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminatmkgroutcfg/vo/AdminAtmkGroutCfgSaveReqVO.java +++ b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminatmkgroutcfg/vo/AdminAtmkGroutCfgSaveReqVO.java @@ -2,11 +2,11 @@ package cn.iocoder.yudao.module.hrmrg.controller.admin.adminatmkgroutcfg.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; + import org.springframework.format.annotation.DateTimeFormat; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import java.time.LocalDateTime; @Schema(description = "管理后台 - 考勤组设置新增/修改 Request VO") diff --git a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminperfcfg/AdminPerfCfgController.java b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminperfcfg/AdminPerfCfgController.java index b395f3662..3323025ca 100644 --- a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminperfcfg/AdminPerfCfgController.java +++ b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminperfcfg/AdminPerfCfgController.java @@ -1,5 +1,8 @@ package cn.iocoder.yudao.module.hrmrg.controller.admin.adminperfcfg; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; @@ -7,8 +10,9 @@ import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import java.util.*; + import java.io.IOException; +import java.util.List; import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.pojo.PageResult; @@ -25,9 +29,7 @@ import cn.iocoder.yudao.module.hrmrg.controller.admin.adminperfcfg.vo.*; import cn.iocoder.yudao.module.hrmrg.dal.dataobject.adminperfcfg.AdminPerfCfgDO; import cn.iocoder.yudao.module.hrmrg.service.adminperfcfg.AdminPerfCfgService; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; + @Tag(name = "管理后台 - 绩效考核配置") @RestController diff --git a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminperfcfg/vo/AdminPerfCfgPageReqVO.java b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminperfcfg/vo/AdminPerfCfgPageReqVO.java index 60a2c317d..aa2475bc5 100644 --- a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminperfcfg/vo/AdminPerfCfgPageReqVO.java +++ b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminperfcfg/vo/AdminPerfCfgPageReqVO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.hrmrg.controller.admin.adminperfcfg.vo; import lombok.*; -import java.util.*; + import io.swagger.v3.oas.annotations.media.Schema; import cn.iocoder.yudao.framework.common.pojo.PageParam; import org.springframework.format.annotation.DateTimeFormat; diff --git a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminperfcfg/vo/AdminPerfCfgRespVO.java b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminperfcfg/vo/AdminPerfCfgRespVO.java index 4f9092528..d6d5613ab 100644 --- a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminperfcfg/vo/AdminPerfCfgRespVO.java +++ b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminperfcfg/vo/AdminPerfCfgRespVO.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.hrmrg.controller.admin.adminperfcfg.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; + import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; import com.alibaba.excel.annotation.*; diff --git a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminperfcfg/vo/AdminPerfCfgSaveReqVO.java b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminperfcfg/vo/AdminPerfCfgSaveReqVO.java index 95cfdb8cd..729aa41a2 100644 --- a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminperfcfg/vo/AdminPerfCfgSaveReqVO.java +++ b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminperfcfg/vo/AdminPerfCfgSaveReqVO.java @@ -1,12 +1,13 @@ package cn.iocoder.yudao.module.hrmrg.controller.admin.adminperfcfg.vo; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import lombok.*; -import java.util.*; + import org.springframework.format.annotation.DateTimeFormat; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; + import java.time.LocalDateTime; @Schema(description = "管理后台 - 绩效考核配置新增/修改 Request VO") diff --git a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminpostcfg/AdminPostCfgController.java b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminpostcfg/AdminPostCfgController.java index 7b6f3a4be..dab609723 100644 --- a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminpostcfg/AdminPostCfgController.java +++ b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminpostcfg/AdminPostCfgController.java @@ -1,5 +1,8 @@ package cn.iocoder.yudao.module.hrmrg.controller.admin.adminpostcfg; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; @@ -7,8 +10,9 @@ import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import java.util.*; + import java.io.IOException; +import java.util.List; import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.pojo.PageResult; @@ -25,9 +29,7 @@ import cn.iocoder.yudao.module.hrmrg.controller.admin.adminpostcfg.vo.*; import cn.iocoder.yudao.module.hrmrg.dal.dataobject.adminpostcfg.AdminPostCfgDO; import cn.iocoder.yudao.module.hrmrg.service.adminpostcfg.AdminPostCfgService; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; + @Tag(name = "管理后台 - 岗位人员薪资计算配置") @RestController diff --git a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminpostcfg/vo/AdminPostCfgPageReqVO.java b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminpostcfg/vo/AdminPostCfgPageReqVO.java index 8fd0c307f..b1206e02d 100644 --- a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminpostcfg/vo/AdminPostCfgPageReqVO.java +++ b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminpostcfg/vo/AdminPostCfgPageReqVO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.hrmrg.controller.admin.adminpostcfg.vo; import lombok.*; -import java.util.*; + import io.swagger.v3.oas.annotations.media.Schema; import cn.iocoder.yudao.framework.common.pojo.PageParam; import java.math.BigDecimal; diff --git a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminpostcfg/vo/AdminPostCfgRespVO.java b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminpostcfg/vo/AdminPostCfgRespVO.java index f1a499f3a..b1c379319 100644 --- a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminpostcfg/vo/AdminPostCfgRespVO.java +++ b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminpostcfg/vo/AdminPostCfgRespVO.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.hrmrg.controller.admin.adminpostcfg.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; + import java.math.BigDecimal; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; diff --git a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminpostcfg/vo/AdminPostCfgSaveReqVO.java b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminpostcfg/vo/AdminPostCfgSaveReqVO.java index 5435914e4..7dc47e060 100644 --- a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminpostcfg/vo/AdminPostCfgSaveReqVO.java +++ b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminpostcfg/vo/AdminPostCfgSaveReqVO.java @@ -2,11 +2,11 @@ package cn.iocoder.yudao.module.hrmrg.controller.admin.adminpostcfg.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; + import java.math.BigDecimal; import org.springframework.format.annotation.DateTimeFormat; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.time.LocalDateTime; @Schema(description = "管理后台 - 岗位人员薪资计算配置新增/修改 Request VO") diff --git a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/dal/dataobject/adminatmk/AdminAtmkDO.java b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/dal/dataobject/adminatmk/AdminAtmkDO.java index 098387282..3704442d7 100644 --- a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/dal/dataobject/adminatmk/AdminAtmkDO.java +++ b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/dal/dataobject/adminatmk/AdminAtmkDO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.hrmrg.dal.dataobject.adminatmk; import lombok.*; -import java.util.*; + import java.time.LocalDateTime; import java.time.LocalDateTime; import java.time.LocalDateTime; diff --git a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/dal/dataobject/adminatmkface/AdminAtmkFaceDO.java b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/dal/dataobject/adminatmkface/AdminAtmkFaceDO.java index a457fe0e6..38bece9ee 100644 --- a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/dal/dataobject/adminatmkface/AdminAtmkFaceDO.java +++ b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/dal/dataobject/adminatmkface/AdminAtmkFaceDO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.hrmrg.dal.dataobject.adminatmkface; import lombok.*; -import java.util.*; + import java.time.LocalDateTime; import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.*; diff --git a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/dal/dataobject/adminatmkgroutcfg/AdminAtmkGroutCfgDO.java b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/dal/dataobject/adminatmkgroutcfg/AdminAtmkGroutCfgDO.java index 5c10a0c4d..591d61f4b 100644 --- a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/dal/dataobject/adminatmkgroutcfg/AdminAtmkGroutCfgDO.java +++ b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/dal/dataobject/adminatmkgroutcfg/AdminAtmkGroutCfgDO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.hrmrg.dal.dataobject.adminatmkgroutcfg; import lombok.*; -import java.util.*; + import java.time.LocalDateTime; import java.time.LocalDateTime; import java.time.LocalDateTime; diff --git a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/dal/dataobject/adminperfcfg/AdminPerfCfgDO.java b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/dal/dataobject/adminperfcfg/AdminPerfCfgDO.java index 5660d78cd..daaf74b97 100644 --- a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/dal/dataobject/adminperfcfg/AdminPerfCfgDO.java +++ b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/dal/dataobject/adminperfcfg/AdminPerfCfgDO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.hrmrg.dal.dataobject.adminperfcfg; import lombok.*; -import java.util.*; + import java.time.LocalDateTime; import java.time.LocalDateTime; import java.time.LocalDateTime; diff --git a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/dal/dataobject/adminpostcfg/AdminPostCfgDO.java b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/dal/dataobject/adminpostcfg/AdminPostCfgDO.java index 8948a68d4..9d28f6456 100644 --- a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/dal/dataobject/adminpostcfg/AdminPostCfgDO.java +++ b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/dal/dataobject/adminpostcfg/AdminPostCfgDO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.hrmrg.dal.dataobject.adminpostcfg; import lombok.*; -import java.util.*; + import java.time.LocalDateTime; import java.math.BigDecimal; import java.time.LocalDateTime; diff --git a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/dal/mysql/adminatmk/AdminAtmkMapper.java b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/dal/mysql/adminatmk/AdminAtmkMapper.java index 22565a2be..7fccfc54b 100644 --- a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/dal/mysql/adminatmk/AdminAtmkMapper.java +++ b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/dal/mysql/adminatmk/AdminAtmkMapper.java @@ -1,6 +1,6 @@ package cn.iocoder.yudao.module.hrmrg.dal.mysql.adminatmk; -import java.util.*; + import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; diff --git a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/dal/mysql/adminatmkface/AdminAtmkFaceMapper.java b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/dal/mysql/adminatmkface/AdminAtmkFaceMapper.java index 0cb3ce9e3..59a88a314 100644 --- a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/dal/mysql/adminatmkface/AdminAtmkFaceMapper.java +++ b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/dal/mysql/adminatmkface/AdminAtmkFaceMapper.java @@ -1,6 +1,6 @@ package cn.iocoder.yudao.module.hrmrg.dal.mysql.adminatmkface; -import java.util.*; + import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; diff --git a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/dal/mysql/adminatmkgroutcfg/AdminAtmkGroutCfgMapper.java b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/dal/mysql/adminatmkgroutcfg/AdminAtmkGroutCfgMapper.java index b9a93d1e3..01138fb18 100644 --- a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/dal/mysql/adminatmkgroutcfg/AdminAtmkGroutCfgMapper.java +++ b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/dal/mysql/adminatmkgroutcfg/AdminAtmkGroutCfgMapper.java @@ -1,6 +1,6 @@ package cn.iocoder.yudao.module.hrmrg.dal.mysql.adminatmkgroutcfg; -import java.util.*; + import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; diff --git a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/dal/mysql/adminperfcfg/AdminPerfCfgMapper.java b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/dal/mysql/adminperfcfg/AdminPerfCfgMapper.java index 7719225e7..48dd6874d 100644 --- a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/dal/mysql/adminperfcfg/AdminPerfCfgMapper.java +++ b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/dal/mysql/adminperfcfg/AdminPerfCfgMapper.java @@ -1,6 +1,6 @@ package cn.iocoder.yudao.module.hrmrg.dal.mysql.adminperfcfg; -import java.util.*; + import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; diff --git a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/dal/mysql/adminpostcfg/AdminPostCfgMapper.java b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/dal/mysql/adminpostcfg/AdminPostCfgMapper.java index 3d409fddb..f811d9b4e 100644 --- a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/dal/mysql/adminpostcfg/AdminPostCfgMapper.java +++ b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/dal/mysql/adminpostcfg/AdminPostCfgMapper.java @@ -1,6 +1,6 @@ package cn.iocoder.yudao.module.hrmrg.dal.mysql.adminpostcfg; -import java.util.*; + import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; diff --git a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/service/adminatmk/AdminAtmkService.java b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/service/adminatmk/AdminAtmkService.java index 538f72884..7625ff782 100644 --- a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/service/adminatmk/AdminAtmkService.java +++ b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/service/adminatmk/AdminAtmkService.java @@ -1,12 +1,12 @@ package cn.iocoder.yudao.module.hrmrg.service.adminatmk; -import java.util.*; + import cn.iocoder.yudao.module.hrmrg.controller.admin.adminatmk.vo.*; import cn.iocoder.yudao.module.hrmrg.dal.dataobject.adminatmk.AdminAtmkDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; -import javax.validation.Valid; +import jakarta.validation.Valid; /** * 考勤打卡 Service 接口 diff --git a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/service/adminatmk/AdminAtmkServiceImpl.java b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/service/adminatmk/AdminAtmkServiceImpl.java index de262c492..dddaa0ee6 100644 --- a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/service/adminatmk/AdminAtmkServiceImpl.java +++ b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/service/adminatmk/AdminAtmkServiceImpl.java @@ -4,7 +4,7 @@ import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; -import java.util.*; + import cn.iocoder.yudao.module.hrmrg.controller.admin.adminatmk.vo.*; import cn.iocoder.yudao.module.hrmrg.dal.dataobject.adminatmk.AdminAtmkDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; @@ -13,7 +13,7 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.hrmrg.dal.mysql.adminatmk.AdminAtmkMapper; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.yudao.module.hrmrg.enums.ErrorCodeConstants.*; diff --git a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/service/adminatmkface/AdminAtmkFaceService.java b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/service/adminatmkface/AdminAtmkFaceService.java index d2966995c..41f7f7c5c 100644 --- a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/service/adminatmkface/AdminAtmkFaceService.java +++ b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/service/adminatmkface/AdminAtmkFaceService.java @@ -1,12 +1,12 @@ package cn.iocoder.yudao.module.hrmrg.service.adminatmkface; -import java.util.*; + import cn.iocoder.yudao.module.hrmrg.controller.admin.adminatmkface.vo.*; import cn.iocoder.yudao.module.hrmrg.dal.dataobject.adminatmkface.AdminAtmkFaceDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; -import javax.validation.Valid; +import jakarta.validation.Valid; /** * 人脸识别库 Service 接口 diff --git a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/service/adminatmkface/AdminAtmkFaceServiceImpl.java b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/service/adminatmkface/AdminAtmkFaceServiceImpl.java index 97c7147b4..167e2e8cb 100644 --- a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/service/adminatmkface/AdminAtmkFaceServiceImpl.java +++ b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/service/adminatmkface/AdminAtmkFaceServiceImpl.java @@ -4,7 +4,7 @@ import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; -import java.util.*; + import cn.iocoder.yudao.module.hrmrg.controller.admin.adminatmkface.vo.*; import cn.iocoder.yudao.module.hrmrg.dal.dataobject.adminatmkface.AdminAtmkFaceDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; @@ -13,7 +13,7 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.hrmrg.dal.mysql.adminatmkface.AdminAtmkFaceMapper; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.yudao.module.hrmrg.enums.ErrorCodeConstants.*; diff --git a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/service/adminatmkgroutcfg/AdminAtmkGroutCfgService.java b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/service/adminatmkgroutcfg/AdminAtmkGroutCfgService.java index 1645a3ee4..bfde4493e 100644 --- a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/service/adminatmkgroutcfg/AdminAtmkGroutCfgService.java +++ b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/service/adminatmkgroutcfg/AdminAtmkGroutCfgService.java @@ -1,12 +1,12 @@ package cn.iocoder.yudao.module.hrmrg.service.adminatmkgroutcfg; -import java.util.*; + import cn.iocoder.yudao.module.hrmrg.controller.admin.adminatmkgroutcfg.vo.*; import cn.iocoder.yudao.module.hrmrg.dal.dataobject.adminatmkgroutcfg.AdminAtmkGroutCfgDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; -import javax.validation.Valid; +import jakarta.validation.Valid; /** * 考勤组设置 Service 接口 diff --git a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/service/adminatmkgroutcfg/AdminAtmkGroutCfgServiceImpl.java b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/service/adminatmkgroutcfg/AdminAtmkGroutCfgServiceImpl.java index 27fcdf48f..4432b8336 100644 --- a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/service/adminatmkgroutcfg/AdminAtmkGroutCfgServiceImpl.java +++ b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/service/adminatmkgroutcfg/AdminAtmkGroutCfgServiceImpl.java @@ -4,7 +4,7 @@ import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; -import java.util.*; + import cn.iocoder.yudao.module.hrmrg.controller.admin.adminatmkgroutcfg.vo.*; import cn.iocoder.yudao.module.hrmrg.dal.dataobject.adminatmkgroutcfg.AdminAtmkGroutCfgDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; @@ -13,7 +13,7 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.hrmrg.dal.mysql.adminatmkgroutcfg.AdminAtmkGroutCfgMapper; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.yudao.module.hrmrg.enums.ErrorCodeConstants.*; diff --git a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/service/adminperfcfg/AdminPerfCfgService.java b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/service/adminperfcfg/AdminPerfCfgService.java index c3cba24b4..73c00fc55 100644 --- a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/service/adminperfcfg/AdminPerfCfgService.java +++ b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/service/adminperfcfg/AdminPerfCfgService.java @@ -1,12 +1,12 @@ package cn.iocoder.yudao.module.hrmrg.service.adminperfcfg; -import java.util.*; + import cn.iocoder.yudao.module.hrmrg.controller.admin.adminperfcfg.vo.*; import cn.iocoder.yudao.module.hrmrg.dal.dataobject.adminperfcfg.AdminPerfCfgDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; -import javax.validation.Valid; +import jakarta.validation.Valid; /** * 绩效考核配置 Service 接口 diff --git a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/service/adminperfcfg/AdminPerfCfgServiceImpl.java b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/service/adminperfcfg/AdminPerfCfgServiceImpl.java index 571507818..a07c65090 100644 --- a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/service/adminperfcfg/AdminPerfCfgServiceImpl.java +++ b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/service/adminperfcfg/AdminPerfCfgServiceImpl.java @@ -4,7 +4,7 @@ import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; -import java.util.*; + import cn.iocoder.yudao.module.hrmrg.controller.admin.adminperfcfg.vo.*; import cn.iocoder.yudao.module.hrmrg.dal.dataobject.adminperfcfg.AdminPerfCfgDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; @@ -13,7 +13,7 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.hrmrg.dal.mysql.adminperfcfg.AdminPerfCfgMapper; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.yudao.module.hrmrg.enums.ErrorCodeConstants.*; diff --git a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/service/adminpostcfg/AdminPostCfgService.java b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/service/adminpostcfg/AdminPostCfgService.java index 27079800f..887578c65 100644 --- a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/service/adminpostcfg/AdminPostCfgService.java +++ b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/service/adminpostcfg/AdminPostCfgService.java @@ -1,12 +1,12 @@ package cn.iocoder.yudao.module.hrmrg.service.adminpostcfg; -import java.util.*; + import cn.iocoder.yudao.module.hrmrg.controller.admin.adminpostcfg.vo.*; import cn.iocoder.yudao.module.hrmrg.dal.dataobject.adminpostcfg.AdminPostCfgDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; -import javax.validation.Valid; +import jakarta.validation.Valid; /** * 岗位人员薪资计算配置 Service 接口 diff --git a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/service/adminpostcfg/AdminPostCfgServiceImpl.java b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/service/adminpostcfg/AdminPostCfgServiceImpl.java index 9dbded15b..452d74e35 100644 --- a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/service/adminpostcfg/AdminPostCfgServiceImpl.java +++ b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/service/adminpostcfg/AdminPostCfgServiceImpl.java @@ -4,7 +4,7 @@ import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; -import java.util.*; + import cn.iocoder.yudao.module.hrmrg.controller.admin.adminpostcfg.vo.*; import cn.iocoder.yudao.module.hrmrg.dal.dataobject.adminpostcfg.AdminPostCfgDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; @@ -13,7 +13,7 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.hrmrg.dal.mysql.adminpostcfg.AdminPostCfgMapper; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.yudao.module.hrmrg.enums.ErrorCodeConstants.*; diff --git a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/resources/application-dev.yaml b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/resources/application-dev.yaml index a5e460fa8..b63fe3a07 100644 --- a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/resources/application-dev.yaml +++ b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/resources/application-dev.yaml @@ -20,7 +20,7 @@ spring: # 数据源配置项 autoconfigure: exclude: - - com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure # 排除 Druid 的自动配置，使用 dynamic-datasource-spring-boot-starter 配置多数据源 + #- com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure # 排除 Druid 的自动配置，使用 dynamic-datasource-spring-boot-starter 配置多数据源 - de.codecentric.boot.admin.client.config.SpringBootAdminClientAutoConfiguration # 禁用 Spring Boot Admin 的 Client 的自动配置 datasource: druid: # Druid 【监控】相关的全局配置 @@ -76,11 +76,12 @@ spring: password: hs-rootadmin # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优 - redis: - host: 192.168.1.128 # 地址 - port: 6379 # 端口 - database: 0 # 数据库索引 -# password: hs-rootadmin # 密码，建议生产环境开启 + data: + redis: + host: 192.168.1.128 # 地址 + port: 6379 # 端口 + database: 0 # 数据库索引 +# password: 123456 # 密码，建议生产环境开启 --- #################### MQ 消息队列相关配置 #################### diff --git a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/resources/application-local.yaml b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/resources/application-local.yaml index 9e287a32f..f4f51c7b0 100644 --- a/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/resources/application-local.yaml +++ b/yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/resources/application-local.yaml @@ -17,10 +17,13 @@ spring: --- #################### 数据库相关配置 #################### spring: + # 数据源配置项 autoconfigure: exclude: - - com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure # 排除 Druid 的自动配置，使用 dynamic-datasource-spring-boot-starter 配置多数据源 + #- de.codecentric.boot.admin.server.config.AdminServerAutoConfiguration # 禁用 Spring Boot Admin 的 Server 的自动配置 + #- de.codecentric.boot.admin.server.cloud.config.AdminServerDiscoveryAutoConfiguration # 禁用 Spring Boot Admin 的 Server 的自动配置 + # - de.codecentric.boot.admin.server.ui.config.AdminServerUiAutoConfiguration # 禁用 Spring Boot Admin 的 Server UI 的自动配置 - de.codecentric.boot.admin.client.config.SpringBootAdminClientAutoConfiguration # 禁用 Spring Boot Admin 的 Client 的自动配置 datasource: druid: # Druid 【监控】相关的全局配置 @@ -57,8 +60,8 @@ spring: primary: master datasource: master: - url: jdbc:mysql://192.168.1.128/hs-mall-cloud?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例 - # url: jdbc:mysql://192.168.1.128/hs-mall-cloud?useSSL=true&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true # MySQL Connector/J 5.X 连接的示例 + url: jdbc:mysql://192.168.1.128:3306/hs-hr-cloud?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例 + # url: jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro?useSSL=true&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true # MySQL Connector/J 5.X 连接的示例 # url: jdbc:postgresql://127.0.0.1:5432/ruoyi-vue-pro # PostgreSQL 连接的示例 # url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例 # url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=ruoyi-vue-pro # SQLServer 连接的示例 @@ -71,24 +74,39 @@ spring: # password: SYSDBA # DM 连接的示例 slave: # 模拟从库，可根据自己需要修改 lazy: true # 开启懒加载，保证启动速度 - url: jdbc:mysql://192.168.1.128/hs-mall-cloud?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true + url: jdbc:mysql://192.168.1.128:3306/hs-hr-cloud?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true username: root password: hs-rootadmin # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优 - redis: - host: 192.168.1.128 # 地址 - port: 6379 # 端口 - database: 0 # 数据库索引 -# password: hs-rootadmin # 密码，建议生产环境开启 + data: + redis: + host: 192.168.1.128 # 地址 + port: 6379 # 端口 + database: 0 # 数据库索引 +# password: 123456 # 密码，建议生产环境开启 --- #################### MQ 消息队列相关配置 #################### ---- #################### 定时任务相关配置 #################### +# rocketmq 配置项，对应 RocketMQProperties 配置类 +rocketmq: + name-server: 192.168.1.128:9876 # RocketMQ Namesrv +spring: + # RabbitMQ 配置项，对应 RabbitProperties 配置类 + rabbitmq: + host: 192.168.1.128 # RabbitMQ 服务的地址 + port: 5672 # RabbitMQ 服务的端口 + username: admin # RabbitMQ + password: hsrabbitmq # 服务的密码 + # Kafka 配置项，对应 KafkaProperties 配置类 + kafka: + bootstrap-servers: 127.0.0.1:9092 # 指定 Kafka Broker 地址，可以设置多个，以逗号分隔 + +--- #################### 定时任务相关配置 #################### xxl: job: - enabled: true # 是否开启调度中心，默认为 true 开启 + enabled: false # 是否开启调度中心，默认为 true 开启 admin: addresses: http://192.168.1.128:9090/xxl-job-admin # 调度中心部署跟地址 @@ -117,12 +135,16 @@ spring: client: instance: service-host-type: IP # 注册实例时，优先使用 IP [IP, HOST_NAME, CANONICAL_HOST_NAME] + # Spring Boot Admin Server 服务端的相关配置 + context-path: /admin # 配置 Spring # 日志文件配置 logging: level: # 配置自己写的 MyBatis Mapper 打印日志 cn.iocoder.yudao.module.hrmrg.dal.mysql: debug + cn.iocoder.yudao.module.hrmrg.dal.mysql.logger.ApiErrorLogMapper: INFO # 配置 ApiErrorLogMapper 的日志级别为 info，避免和 GlobalExceptionHandler 重复打印 + cn.iocoder.yudao.module.hrmrg.dal.mysql.file.FileConfigMapper: INFO # 配置 FileConfigMapper 的日志级别为 info org.springframework.context.support.PostProcessorRegistrationDelegate: ERROR # TODO 芋艿：先禁用，Spring Boot 3.X 存在部分错误的 WARN 提示 --- #################### 芋道相关配置 ####################