yudao
/
spring-cloud
mirror of https://gitee.com/zhijiantianya/yudao-cloud.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

版本跟新

pull/164/head
Tpj 2025-01-03 15:22:08 +08:00
parent a7f1f203d4
commit 7c343a217c
45 changed files with 209 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
yudao-module-hrmrg/pom.xml
View File

@ -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">
<parent>
<artifactId>yudao</artifactId>
<groupId>cn.iocoder.cloud</groupId>
<version>${revision}</version> <!-- 1. 修改 version 为 ${revision} -->
<artifactId>yudao</artifactId>
<version>${revision}</version>
</parent>
<modules>
<module>yudao-module-hrmrg-api</module>
<module>yudao-module-hrmrg-biz</module>
</modules>
<modelVersion>4.0.0</modelVersion>
<artifactId>yudao-module-hrmrg</artifactId>
<packaging>pom</packaging> <!-- 2. 新增 packaging 为 pom -->
<packaging>pom</packaging>
<name>${project.artifactId}</name> <!-- 3. 新增 name 为 ${project.artifactId} -->
<description> <!-- 4. 新增 description 为该模块的描述 -->
hrmrg 模块，主要实现 HRM 人力资源管理相关功能。
<name>${project.artifactId}</name>
<description>
hr 包下，人力资源管理（Human Resource Management）。
</description>
</project>

21
yudao-module-hrmrg/yudao-module-hrmrg-api/pom.xml
View File

@ -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">
<parent>
<artifactId>yudao-module-hrmrg</artifactId>
<groupId>cn.iocoder.cloud</groupId>
<version>${revision}</version> <!-- 1. 修改 version 为 ${revision} -->
<artifactId>yudao-module-hrmrg</artifactId>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>yudao-module-hrmrg-api</artifactId>
<packaging>jar</packaging> <!-- 2. 新增 packaging 为 jar -->
<packaging>jar</packaging>
<name>${project.artifactId}</name> <!-- 3. 新增 name 为 ${project.artifactId} -->
<description> <!-- 4. 新增 description 为该模块的描述 -->
hrmrg-api 模块 API，暴露给其它模块调用
<name>${project.artifactId}</name>
<description>
erp 模块 API，暴露给其它模块调用
</description>
<dependencies> <!-- 5. 新增 yudao-common 依赖 -->
<dependencies>
<dependency>
<groupId>cn.iocoder.cloud</groupId>
<artifactId>yudao-common</artifactId>
</dependency>
<!-- 参数校验 -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
<optional>true</optional>
</dependency>
</dependencies>
</project>

66
yudao-module-hrmrg/yudao-module-hrmrg-biz/pom.xml
View File

@ -13,7 +13,7 @@
<name>${project.artifactId}</name>
<description>
hrmrg 模块，主要实现人力资源管理相关功能。
HR 模块 BIZ，主要提供 HR 相关的业务功能。
</description>
<dependencies>
@ -24,13 +24,17 @@
</dependency>
<!-- 依赖服务 -->
<dependency>
<groupId>cn.iocoder.cloud</groupId>
<artifactId>yudao-module-system-api</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>cn.iocoder.cloud</groupId>
<artifactId>yudao-module-hrmrg-api</artifactId>
<version>${revision}</version>
</dependency>
<!-- 业务组件 -->
<dependency>
<groupId>cn.iocoder.cloud</groupId>
@ -40,11 +44,12 @@
<!-- Web 相关 -->
<dependency>
<groupId>cn.iocoder.cloud</groupId>
<artifactId>yudao-spring-boot-starter-web</artifactId>
<artifactId>yudao-spring-boot-starter-security</artifactId>
</dependency>
<dependency>
<groupId>cn.iocoder.cloud</groupId>
<artifactId>yudao-spring-boot-starter-security</artifactId>
<artifactId>yudao-spring-boot-starter-websocket</artifactId>
</dependency>
<!-- DB 相关 -->
@ -52,6 +57,15 @@
<groupId>cn.iocoder.cloud</groupId>
<artifactId>yudao-spring-boot-starter-mybatis</artifactId>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-generator</artifactId> <!-- 代码生成器，使用它解析表结构 -->
</dependency>
<dependency>
<groupId>cn.iocoder.cloud</groupId>
<artifactId>yudao-spring-boot-starter-redis</artifactId>
</dependency>
<!-- RPC 远程调用相关 -->
<dependency>
@ -71,10 +85,23 @@
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
</dependency>
<!-- Job 定时任务相关 -->
<dependency>
<groupId>cn.iocoder.cloud</groupId>
<artifactId>yudao-spring-boot-starter-job</artifactId>
</dependency>
<!-- 消息队列相关 -->
<dependency>
<groupId>cn.iocoder.cloud</groupId>
<artifactId>yudao-spring-boot-starter-mq</artifactId>
</dependency>
<!-- Test 测试相关 -->
<dependency>
<groupId>cn.iocoder.cloud</groupId>
<artifactId>yudao-spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<!-- 工具类相关 -->
@ -83,13 +110,42 @@
<artifactId>yudao-spring-boot-starter-excel</artifactId>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-engine-core</artifactId> <!-- 实现代码生成 -->
</dependency>
<!-- 监控相关 -->
<dependency>
<groupId>cn.iocoder.cloud</groupId>
<artifactId>yudao-spring-boot-starter-monitor</artifactId>
</dependency>
</dependencies>
<dependency>
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-starter-server</artifactId> <!-- 实现 Spring Boot Admin Server 服务端 -->
</dependency>
<!-- 三方云服务相关 -->
<dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId> <!-- 文件客户端：解决 ftp 连接 -->
</dependency>
<dependency>
<groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId> <!-- 文件客户端：解决 sftp 连接 -->
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-s3</artifactId><!-- 文件客户端：解决阿里云、腾讯云、minio 等 S3 连接 -->
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId> <!-- 文件客户端：文件类型的识别 -->
</dependency>
</dependencies>
<build>
<!-- 设置构建的 jar 包名 -->
<finalName>${project.artifactId}</finalName>

9
yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminatmk/AdminAtmkController.java
View File

@ -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

2
yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminatmk/vo/AdminAtmkPageReqVO.java
View File

@ -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;

2
yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminatmk/vo/AdminAtmkRespVO.java
View File

@ -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.*;

4
yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminatmk/vo/AdminAtmkSaveReqVO.java
View File

@ -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")

10
yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminatmkface/AdminAtmkFaceController.java
View File

@ -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

2
yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminatmkface/vo/AdminAtmkFacePageReqVO.java
View File

@ -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;

2
yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminatmkface/vo/AdminAtmkFaceRespVO.java
View File

@ -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.*;

5
yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminatmkface/vo/AdminAtmkFaceSaveReqVO.java
View File

@ -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

9
yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminatmkgroutcfg/AdminAtmkGroutCfgController.java
View File

@ -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

2
yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminatmkgroutcfg/vo/AdminAtmkGroutCfgPageReqVO.java
View File

@ -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;

2
yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminatmkgroutcfg/vo/AdminAtmkGroutCfgRespVO.java
View File

@ -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.*;

6
yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminatmkgroutcfg/vo/AdminAtmkGroutCfgSaveReqVO.java
View File

@ -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")

10
yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminperfcfg/AdminPerfCfgController.java
View File

@ -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

2
yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminperfcfg/vo/AdminPerfCfgPageReqVO.java
View File

@ -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;

2
yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminperfcfg/vo/AdminPerfCfgRespVO.java
View File

@ -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.*;

7
yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminperfcfg/vo/AdminPerfCfgSaveReqVO.java
View File

@ -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")

10
yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminpostcfg/AdminPostCfgController.java
View File

@ -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

2
yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminpostcfg/vo/AdminPostCfgPageReqVO.java
View File

@ -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;

2
yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminpostcfg/vo/AdminPostCfgRespVO.java
View File

@ -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;

4
yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/controller/admin/adminpostcfg/vo/AdminPostCfgSaveReqVO.java
View File

@ -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")

2
yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/dal/dataobject/adminatmk/AdminAtmkDO.java
View File

@ -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;

2
yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/dal/dataobject/adminatmkface/AdminAtmkFaceDO.java
View File

@ -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.*;

2
yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/dal/dataobject/adminatmkgroutcfg/AdminAtmkGroutCfgDO.java
View File

@ -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;

2
yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/dal/dataobject/adminperfcfg/AdminPerfCfgDO.java
View File

@ -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;

2
yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/dal/dataobject/adminpostcfg/AdminPostCfgDO.java
View File

@ -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;

2
yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/dal/mysql/adminatmk/AdminAtmkMapper.java
View File

@ -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;

2
yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/dal/mysql/adminatmkface/AdminAtmkFaceMapper.java
View File

@ -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;

2
yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/dal/mysql/adminatmkgroutcfg/AdminAtmkGroutCfgMapper.java
View File

@ -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;

2
yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/dal/mysql/adminperfcfg/AdminPerfCfgMapper.java
View File

@ -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;

2
yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/dal/mysql/adminpostcfg/AdminPostCfgMapper.java
View File

@ -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;

4
yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/service/adminatmk/AdminAtmkService.java
View File

@ -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 接口

4
yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/service/adminatmk/AdminAtmkServiceImpl.java
View File

@ -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.*;

4
yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/service/adminatmkface/AdminAtmkFaceService.java
View File

@ -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 接口

4
yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/service/adminatmkface/AdminAtmkFaceServiceImpl.java
View File

@ -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.*;

4
yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/service/adminatmkgroutcfg/AdminAtmkGroutCfgService.java
View File

@ -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 接口

4
yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/service/adminatmkgroutcfg/AdminAtmkGroutCfgServiceImpl.java
View File

@ -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.*;

4
yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/service/adminperfcfg/AdminPerfCfgService.java
View File

@ -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 接口

4
yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/service/adminperfcfg/AdminPerfCfgServiceImpl.java
View File

@ -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.*;

4
yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/service/adminpostcfg/AdminPostCfgService.java
View File

@ -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 接口

4
yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/java/cn/iocoder/yudao/module/hrmrg/service/adminpostcfg/AdminPostCfgServiceImpl.java
View File

@ -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.*;

13
yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/resources/application-dev.yaml
View File

@ -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 消息队列相关配置 ####################

44
yudao-module-hrmrg/yudao-module-hrmrg-biz/src/main/resources/application-local.yaml
View File

@ -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 提示
--- #################### 芋道相关配置 ####################