zkr/shz-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge origin/main into main

Browse Source
This commit is contained in:
lapuda
2026-07-14 21:17:36 +08:00
parent 4306862ece b782793e25
commit f4459c6aac
125 changed files with 6237 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ruoyi-common/src/main/java/com/ruoyi/common/constant/CacheConstants.java
View File

@@ -49,4 +49,14 @@ public class CacheConstants
*pc岗位ids
*/
public static final String SYS_JOB_IDS = "job_ids:";
/**
* 浪潮互联网token
*/
public static final String LC_HLW_TOKEN ="lc_hlw_token:";
/**
* 浪潮监管端token
*/
public static final String LC_JGD_TOKEN ="lc_jgd_token:";
}

10
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUser.java
View File

@@ -100,6 +100,9 @@ public class AppUser extends BaseEntity
@ApiModelProperty("是否开启推荐（0不推荐 1推荐）")
private Integer isRecommend;
@ApiModelProperty("邮箱")
private String email;
@TableField(exist = false)
@ApiModelProperty("期望岗位列表")
private List<String> jobTitle;
@@ -166,13 +169,16 @@ public class AppUser extends BaseEntity
@ApiModelProperty("户籍地址")
private String domicileAddress;
@ApiModelProperty("地纬userid")
private String dwUserid;
@ApiModelProperty("浪潮userid")
private Long lcUserid;
/** 1-大龄人员;2-低保人员;3-残疾人员;4-失地农名或联队职工;5-防止返贫;6-未就业大中专毕业生;7-退役军人;8-长期失业人员;9-城镇零就业家庭成员；10.刑满释放人员 **/
@ApiModelProperty("用户类型，以逗号分隔")
private String userType;
@ApiModelProperty("简历公开保密状态 1公开 2保密")
private String resumeStatus;
//匹配描述
@TableField(exist = false)
private String matchLevelDesc;

72
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUserEducation.java Normal file
View File

@@ -0,0 +1,72 @@
package com.ruoyi.common.core.domain.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel("APP求职者教育经历表")
@TableName("app_user_education")
public class AppUserEducation extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 主键ID */
@TableId(type = IdType.AUTO)
private Long id;
/** 求职者用户ID */
@Excel(name = "用户ID")
@ApiModelProperty("用户ID")
private Long userId;
/** 学校名称 */
@Excel(name = "学校名称")
@ApiModelProperty("学校名称")
private String schoolName;
/** 学历 */
@Excel(name = "学历")
@ApiModelProperty("学历")
private Integer educationLevel;
/** 专业 */
@Excel(name = "专业")
@ApiModelProperty("专业")
private String major;
/** 学位 */
@Excel(name = "学位 1学士 2硕士 3博士")
@ApiModelProperty("学位")
private String degree;
/** 学习形式 1全日制 2自考 3函授 4成人 */
@Excel(name = "学习形式")
@ApiModelProperty("学习形式")
private String studyType;
/** 入学时间（字符串模糊填写） */
@Excel(name = "入学时间")
@ApiModelProperty("入学时间")
private String startTime;
/** 毕业时间 */
@Excel(name = "毕业时间")
@ApiModelProperty("毕业时间")
private String endTime;
/** 在校经历描述 在校经历、获奖、主修课程 */
@Excel(name = "在校经历")
@ApiModelProperty("在校经历")
private String content;
/** 排序 */
@Excel(name = "排序")
@ApiModelProperty("排序")
private Integer sort;
}

64
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUserTrain.java Normal file
View File

@@ -0,0 +1,64 @@
package com.ruoyi.common.core.domain.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel("APP求职者培训经历表")
@TableName("app_user_train")
public class AppUserTrain extends BaseEntity
{
@TableField(exist = false)
private static final long serialVersionUID = 1L;
/** 主键ID */
@TableId(type = IdType.AUTO)
private Long id;
/** 求职者用户ID */
@Excel(name = "求职者用户ID")
@ApiModelProperty("求职者用户ID")
private Long userId;
/** 培训机构 */
@Excel(name = "培训机构")
@ApiModelProperty("培训机构")
private String trainOrg;
/** 培训课程 */
@Excel(name = "培训课程")
@ApiModelProperty("培训课程")
private String trainCourse;
/** 培训开始时间（字符串自由填写） */
@Excel(name = "开始时间")
@ApiModelProperty("开始时间")
private String startTime;
/** 培训结束时间 */
@Excel(name = "结束时间")
@ApiModelProperty("结束时间")
private String endTime;
/** 培训证书 */
@Excel(name = "培训证书")
@ApiModelProperty("培训证书")
private String trainCert;
/** 培训内容 */
@Excel(name = "培训内容")
@ApiModelProperty("培训内容")
private String trainContent;
/** 排序 */
@Excel(name = "排序")
@ApiModelProperty("排序")
private Integer sort;
}

12
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/Company.java
View File

@@ -124,11 +124,21 @@ public class Company extends BaseEntity
@ApiModelProperty("法人联系方式")
private String legalPhone;
@ApiModelProperty("是否下架(0上架，1下架)")
private String companyStatus;
@ApiModelProperty("是否人力资源机构(0是,否)")
private String isHrs;
/**
* 岗位列表
*/
@TableField(exist = false)
private List<JobDTO> jobList;
/**
* 浪潮userid
*/
@TableField(exist = false)
private Long lcUserid;
}

26
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/File.java
View File

@@ -34,4 +34,30 @@ public class File extends BaseEntity
@ApiModelProperty("业务id")
private Long bussinessid;
@ApiModelProperty("审核状态 0待审核 1审核通过 2审核未通过")
private String reviewStatus;
@ApiModelProperty("审核备注")
private String reviewRemark;
@ApiModelProperty("审核人")
private String reviewBy;
@ApiModelProperty("审核时间")
private String reviewTime;
// ---- JOIN 查询字段（非 file 表列） ----
@TableField(exist = false)
@ApiModelProperty("用户名称")
private String userName;
@TableField(exist = false)
@ApiModelProperty("用户类型（0企业 1求职者 2网格员 3政府人员）")
private String userType;
@TableField(exist = false)
@ApiModelProperty("用户手机号码")
private String userPhone;
}

2
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/MyChart.java
View File

@@ -8,4 +8,6 @@ public class MyChart {
private String ysc;
private String yzj;
private String yyy;
private String yts;//已投诉
private String ypbqys;//已屏蔽
}

14
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
View File

@@ -76,6 +76,11 @@ public class SysUser extends BaseEntity
//appUserId
private Long appUserId;
/**
* 浪潮用户lc_Userid
*/
private Long lcUserid;
//岗位名称组
private List<String> jobTitles;
@@ -341,6 +346,14 @@ public class SysUser extends BaseEntity
this.experience = experience;
}
public Long getLcUserid() {
return lcUserid;
}
public void setLcUserid(Long lcUserid) {
this.lcUserid = lcUserid;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -367,6 +380,7 @@ public class SysUser extends BaseEntity
.append("appUserId", getAppUserId())
.append("jobTitles", getJobTitles())
.append("experience", getExperience())
.append("lcUserid", getLcUserid())
.toString();
}
}

6
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java
View File

@@ -21,6 +21,12 @@ public class RegisterBody extends LoginBody
@ApiModelProperty("技能列表")
private List<AppSkill> appSkillsList;
@ApiModelProperty("教育经历列表")
private List<AppUserEducation> appUserEducations;
@ApiModelProperty("培训经历列表")
private List<AppUserTrain> appUserTrains;
@ApiModelProperty("公司信息")
private Company company;

5
ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
View File

@@ -8,6 +8,7 @@ import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Date;
import org.apache.commons.lang3.time.DateFormatUtils;
@@ -36,6 +37,10 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
"yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM",
"yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"};
public static final DateTimeFormatter ES_DATE_FORMATTER = DateTimeFormatter
.ofPattern("yyyy-MM-dd HH:mm:ss")
.withZone(ZoneId.of("UTC"));
/**
* 获取当前Date型日期
*

46
ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
View File

@@ -2,8 +2,8 @@ package com.ruoyi.common.utils;
import java.util.Collection;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
@@ -189,4 +189,48 @@ public class SecurityUtils
.anyMatch(x -> Constants.SUPER_ADMIN.equals(x) || PatternMatchUtils.simpleMatch(x, role));
}
/**
* 获取浪潮用户ID
**/
public static Long getlcUserid()
{
try
{
return getLoginUser().getUser().getLcUserid();
}
catch (Exception e)
{
throw new ServiceException("获取用户ID异常", HttpStatus.UNAUTHORIZED);
}
}
/**
* @return
*/
public static Long getAppuserId()
{
try
{
return getLoginUser().getUser().getAppUserId();
}
catch (Exception e)
{
throw new ServiceException("获取用户ID异常", HttpStatus.UNAUTHORIZED);
}
}
/**
* 获取企业社会信用代码
* @return
*/
public static String getIdcard(){
try
{
return getLoginUser().getUser().getIdCard();
}
catch (Exception e)
{
throw new ServiceException("获取用户ID异常", HttpStatus.UNAUTHORIZED);
}
}
}

16
ruoyi-common/src/main/java/com/ruoyi/common/utils/SiteSecurityUtils.java
View File

@@ -119,4 +119,20 @@ public class SiteSecurityUtils
throw new ServiceException("获取用户信息异常", HttpStatus.UNAUTHORIZED);
}
}
/**
* 获取lc_userid
* @return
*/
public static Long getlcUserid()
{
try
{
return getLoginSiteUser().getUser().getLcUserid();
}
catch (Exception e)
{
throw new ServiceException("获取用户ID异常", HttpStatus.UNAUTHORIZED);
}
}
}