diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/AppNotice.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/AppNotice.java index 1e21dfa..730eb5f 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/AppNotice.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/AppNotice.java @@ -1,103 +1,42 @@ package com.ruoyi.cms.domain; +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.core.domain.BaseEntity; import com.ruoyi.common.xss.Xss; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; -/** - * 通知公告表 sys_notice - * - * @author ruoyi - */ +@Data +@ApiModel("APP通知") +@TableName(value = "app_notice") public class AppNotice extends BaseEntity { + @TableField(exist = false) private static final long serialVersionUID = 1L; - /** 公告ID */ + @TableId(value = "notice_id",type = IdType.AUTO) + @ApiModelProperty("公司id") private Long noticeId; - /** 公告标题 */ + @Xss(message = "消息标题不能包含脚本字符") + @NotBlank(message = "消息标题不能为空") + @Size(min = 0, max = 50, message = "消息标题不能超过50个字符") private String noticeTitle; - /** 公告类型（1通知 2公告） */ + @ApiModelProperty("消息类型") private String noticeType; - /** 公告内容 */ + @ApiModelProperty("消息内容") private String noticeContent; - /** 公告状态（0正常 1关闭） */ + @ApiModelProperty("消息状态 0正常 1关闭") private String status; - public Long getNoticeId() - { - return noticeId; - } - - public void setNoticeId(Long noticeId) - { - this.noticeId = noticeId; - } - - public void setNoticeTitle(String noticeTitle) - { - this.noticeTitle = noticeTitle; - } - - @Xss(message = "公告标题不能包含脚本字符") - @NotBlank(message = "公告标题不能为空") - @Size(min = 0, max = 50, message = "公告标题不能超过50个字符") - public String getNoticeTitle() - { - return noticeTitle; - } - - public void setNoticeType(String noticeType) - { - this.noticeType = noticeType; - } - - public String getNoticeType() - { - return noticeType; - } - - public void setNoticeContent(String noticeContent) - { - this.noticeContent = noticeContent; - } - - public String getNoticeContent() - { - return noticeContent; - } - - public void setStatus(String status) - { - this.status = status; - } - - public String getStatus() - { - return status; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("noticeId", getNoticeId()) - .append("noticeTitle", getNoticeTitle()) - .append("noticeType", getNoticeType()) - .append("noticeContent", getNoticeContent()) - .append("status", getStatus()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); - } } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/AppReviewJob.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/AppReviewJob.java index 292781a..5c78277 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/AppReviewJob.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/AppReviewJob.java @@ -1,16 +1,15 @@ package com.ruoyi.cms.domain; -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import com.ruoyi.common.annotation.Excel; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; 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.fasterxml.jackson.annotation.JsonFormat; +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; /** * 用户岗位浏览记录对象 app_review_job * @author ${author} @@ -26,11 +25,12 @@ public class AppReviewJob extends BaseEntity @TableId(value = "id",type = IdType.AUTO) private Long id; + @ApiModelProperty("用户id") private Long userId; + @ApiModelProperty("岗位id") private Long jobId; - /** 浏览日期 */ @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "浏览日期", width = 30, dateFormat = "yyyy-MM-dd") @ApiModelProperty("浏览日期") diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/AppUser.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/AppUser.java index 795fd56..e22c815 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/AppUser.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/AppUser.java @@ -26,78 +26,63 @@ public class AppUser extends BaseEntity @TableField(exist = false) private static final long serialVersionUID = 1L; - /** 用户ID */ @TableId(value = "user_id",type = IdType.AUTO) @ApiModelProperty("用户ID") private Long userId; - /** 用户名称 */ @Excel(name = "用户名称") @ApiModelProperty("用户名称") private String name; - /** 年龄段 对应字典age */ @Excel(name = "年龄段 对应字典age") @ApiModelProperty("年龄段 对应字典age") private String age; - /** 用户性别（0男 1女）对应字典sex */ @Excel(name = "用户性别", readConverterExp = "0=男,1=女") @ApiModelProperty("用户性别（0男 1女）对应字典sex") private String sex; - /** 生日 */ @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "生日", width = 30, dateFormat = "yyyy-MM-dd") @ApiModelProperty("生日") private Date birthDate; - /** 学历 对应字典education */ @Excel(name = "学历 对应字典education") @ApiModelProperty("学历 对应字典education") private String education; - /** 政治面貌 */ @Excel(name = "政治面貌") @ApiModelProperty("政治面貌") private String politicalAffiliation; - /** 手机号码 */ @Excel(name = "手机号码") @ApiModelProperty("手机号码") private String phone; - /** 头像地址 */ @Excel(name = "头像地址") @ApiModelProperty("头像地址") private String avatar; - /** 最低工资 */ @Excel(name = "最低工资") @ApiModelProperty("最低工资") private String salaryMin; - /** 最高工资 */ @Excel(name = "最高工资") @ApiModelProperty("最高工资") private String salaryMax; - /** 期望工作地 对应字典area */ @Excel(name = "期望工作地 对应字典area") @ApiModelProperty("期望工作地 对应字典area") private String area; - /** 帐号状态（0正常 1停用） */ @Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用") @ApiModelProperty("帐号状态（0正常 1停用）") private String status; - /** 最后登录IP */ @Excel(name = "最后登录IP") @ApiModelProperty("最后登录IP") private String loginIp; - /** 最后登录时间 */ @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd") @ApiModelProperty("最后登录时间") @@ -105,10 +90,14 @@ public class AppUser extends BaseEntity @ApiModelProperty("期望岗位,逗号分隔") private String jobTitleId; + @ApiModelProperty("期望薪资") private String experience; + @ApiModelProperty("是否开启推荐（0不推荐 1推荐）") private Integer isRecommend; + @TableField(exist = false) + @ApiModelProperty("期望岗位列表") private List jobTitle; } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/BussinessDictData.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/BussinessDictData.java index 3f47830..21d2094 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/BussinessDictData.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/BussinessDictData.java @@ -1,177 +1,69 @@ package com.ruoyi.cms.domain; +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.annotation.Excel.ColumnType; -import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.core.domain.BaseEntity; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; -/** - * 字典数据表 sys_dict_data - * - * @author ruoyi - */ + +@Data +@ApiModel("业务数据表") +@TableName(value = "bussiness_dict_data") public class BussinessDictData extends BaseEntity { + @TableField(exist = false) private static final long serialVersionUID = 1L; - /** 字典编码 */ + @ApiModelProperty("字典编码") @Excel(name = "字典编码", cellType = ColumnType.NUMERIC) + @TableId(value = "dict_code",type = IdType.AUTO) private Long dictCode; - /** 字典排序 */ + @ApiModelProperty("字典排序") @Excel(name = "字典排序", cellType = ColumnType.NUMERIC) private Long dictSort; - /** 字典标签 */ @Excel(name = "字典标签") + @ApiModelProperty("字典标签") + @NotBlank(message = "字典标签不能为空") + @Size(min = 0, max = 100, message = "字典标签长度不能超过100个字符") private String dictLabel; - /** 字典键值 */ @Excel(name = "字典键值") + @ApiModelProperty("字典键值") + @NotBlank(message = "字典键值不能为空") + @Size(min = 0, max = 100, message = "字典键值长度不能超过100个字符") private String dictValue; - /** 字典类型 */ + @ApiModelProperty("字典类型") @Excel(name = "字典类型") + @NotBlank(message = "字典类型不能为空") + @Size(min = 0, max = 100, message = "字典类型长度不能超过100个字符") private String dictType; - /** 样式属性（其他样式扩展） */ + @ApiModelProperty("样式属性（其他样式扩展)") + @Size(min = 0, max = 100, message = "样式属性长度不能超过100个字符") private String cssClass; - /** 表格字典样式 */ + @ApiModelProperty("表格字典样式") + @Size(min = 0, max = 100, message = "样式属性长度不能超过100个字符") private String listClass; - /** 是否默认（Y是 N否） */ + @ApiModelProperty("是否默认（Y是 N否）") @Excel(name = "是否默认", readConverterExp = "Y=是,N=否") private String isDefault; - /** 状态（0正常 1停用） */ + @ApiModelProperty("状态 0=正常,1=停用 ") @Excel(name = "状态", readConverterExp = "0=正常,1=停用") private String status; - public Long getDictCode() - { - return dictCode; - } - - public void setDictCode(Long dictCode) - { - this.dictCode = dictCode; - } - - public Long getDictSort() - { - return dictSort; - } - - public void setDictSort(Long dictSort) - { - this.dictSort = dictSort; - } - - @NotBlank(message = "字典标签不能为空") - @Size(min = 0, max = 100, message = "字典标签长度不能超过100个字符") - public String getDictLabel() - { - return dictLabel; - } - - public void setDictLabel(String dictLabel) - { - this.dictLabel = dictLabel; - } - - @NotBlank(message = "字典键值不能为空") - @Size(min = 0, max = 100, message = "字典键值长度不能超过100个字符") - public String getDictValue() - { - return dictValue; - } - - public void setDictValue(String dictValue) - { - this.dictValue = dictValue; - } - - @NotBlank(message = "字典类型不能为空") - @Size(min = 0, max = 100, message = "字典类型长度不能超过100个字符") - public String getDictType() - { - return dictType; - } - - public void setDictType(String dictType) - { - this.dictType = dictType; - } - - @Size(min = 0, max = 100, message = "样式属性长度不能超过100个字符") - public String getCssClass() - { - return cssClass; - } - - public void setCssClass(String cssClass) - { - this.cssClass = cssClass; - } - - public String getListClass() - { - return listClass; - } - - public void setListClass(String listClass) - { - this.listClass = listClass; - } - - public boolean getDefault() - { - return UserConstants.YES.equals(this.isDefault); - } - - public String getIsDefault() - { - return isDefault; - } - - public void setIsDefault(String isDefault) - { - this.isDefault = isDefault; - } - - public String getStatus() - { - return status; - } - - public void setStatus(String status) - { - this.status = status; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("dictCode", getDictCode()) - .append("dictSort", getDictSort()) - .append("dictLabel", getDictLabel()) - .append("dictValue", getDictValue()) - .append("dictType", getDictType()) - .append("cssClass", getCssClass()) - .append("listClass", getListClass()) - .append("isDefault", getIsDefault()) - .append("status", getStatus()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); - } } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/BussinessDictType.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/BussinessDictType.java index 34fe65d..e18f14a 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/BussinessDictType.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/BussinessDictType.java @@ -1,20 +1,20 @@ package com.ruoyi.cms.domain; +import com.baomidou.mybatisplus.annotation.TableName; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel.ColumnType; import com.ruoyi.common.core.domain.BaseEntity; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; +import io.swagger.annotations.ApiModel; +import lombok.Data; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Pattern; import javax.validation.constraints.Size; -/** - * 字典类型表 sys_dict_type - * - * @author ruoyi - */ + +@Data +@ApiModel("字典类型表") +@TableName(value = "bussiness_dict_type") public class BussinessDictType extends BaseEntity { private static final long serialVersionUID = 1L; @@ -25,73 +25,19 @@ public class BussinessDictType extends BaseEntity /** 字典名称 */ @Excel(name = "字典名称") + @NotBlank(message = "字典名称不能为空") + @Size(min = 0, max = 100, message = "字典类型名称长度不能超过100个字符") private String dictName; /** 字典类型 */ @Excel(name = "字典类型") + @NotBlank(message = "字典类型不能为空") + @Size(min = 0, max = 100, message = "字典类型类型长度不能超过100个字符") + @Pattern(regexp = "^[a-z][a-z0-9_]*$", message = "字典类型必须以字母开头，且只能为（小写字母，数字，下滑线）") private String dictType; /** 状态（0正常 1停用） */ @Excel(name = "状态", readConverterExp = "0=正常,1=停用") private String status; - public Long getDictId() - { - return dictId; - } - - public void setDictId(Long dictId) - { - this.dictId = dictId; - } - - @NotBlank(message = "字典名称不能为空") - @Size(min = 0, max = 100, message = "字典类型名称长度不能超过100个字符") - public String getDictName() - { - return dictName; - } - - public void setDictName(String dictName) - { - this.dictName = dictName; - } - - @NotBlank(message = "字典类型不能为空") - @Size(min = 0, max = 100, message = "字典类型类型长度不能超过100个字符") - @Pattern(regexp = "^[a-z][a-z0-9_]*$", message = "字典类型必须以字母开头，且只能为（小写字母，数字，下滑线）") - public String getDictType() - { - return dictType; - } - - public void setDictType(String dictType) - { - this.dictType = dictType; - } - - public String getStatus() - { - return status; - } - - public void setStatus(String status) - { - this.status = status; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("dictId", getDictId()) - .append("dictName", getDictName()) - .append("dictType", getDictType()) - .append("status", getStatus()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); - } } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/BussinessOperLog.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/BussinessOperLog.java index 497e688..d813ec6 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/BussinessOperLog.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/BussinessOperLog.java @@ -24,92 +24,75 @@ public class BussinessOperLog extends BaseEntity @TableField(exist = false) private static final long serialVersionUID = 1L; - /** 日志主键 */ @TableId(value = "oper_id",type = IdType.AUTO) @ApiModelProperty("日志主键") private Long operId; - /** 模块标题 */ @Excel(name = "模块标题") @ApiModelProperty("模块标题") private String title; - /** 业务类型（0其它 1新增 2修改 3删除） */ @Excel(name = "业务类型", readConverterExp = "0=其它,1=新增,2=修改,3=删除") @ApiModelProperty("业务类型（0其它 1新增 2修改 3删除）") private Integer businessType; - /** 方法名称 */ @Excel(name = "方法名称") @ApiModelProperty("方法名称") private String method; - /** 请求方式 */ @Excel(name = "请求方式") @ApiModelProperty("请求方式") private String requestMethod; - /** 操作类别（0其它 1后台用户 2手机端用户） */ @Excel(name = "操作类别", readConverterExp = "0=其它,1=后台用户,2=手机端用户") @ApiModelProperty("操作类别（0其它 1后台用户 2手机端用户）") private Integer operatorType; - /** 操作人员 */ @Excel(name = "操作人员") @ApiModelProperty("操作人员") private String operName; - /** 部门名称 */ @Excel(name = "部门名称") @ApiModelProperty("部门名称") private String deptName; - /** 请求URL */ @Excel(name = "请求URL") @ApiModelProperty("请求URL") private String operUrl; - /** 主机地址 */ @Excel(name = "主机地址") @ApiModelProperty("主机地址") private String operIp; - /** 操作地点 */ @Excel(name = "操作地点") @ApiModelProperty("操作地点") private String operLocation; - /** 请求参数 */ @Excel(name = "请求参数") @ApiModelProperty("请求参数") private String operParam; - /** 返回参数 */ @Excel(name = "返回参数") @ApiModelProperty("返回参数") private String jsonResult; - /** 操作状态（0正常 1异常） */ @Excel(name = "操作状态", readConverterExp = "0=正常,1=异常") @ApiModelProperty("操作状态（0正常 1异常）") private Integer status; - /** 错误消息 */ @Excel(name = "错误消息") @ApiModelProperty("错误消息") private String errorMsg; - /** 操作时间 */ @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd") @ApiModelProperty("操作时间") private Date operTime; - /** 消耗时间 */ @Excel(name = "消耗时间") @ApiModelProperty("消耗时间") private Long costTime; - /** 业务类型数组 */ + @ApiModelProperty("业务类型数组") private Integer[] businessTypes; } \ No newline at end of file diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/CommercialArea.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/CommercialArea.java index 2d1b07d..02210f0 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/CommercialArea.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/CommercialArea.java @@ -23,26 +23,22 @@ public class CommercialArea extends BaseEntity @TableField(exist = false) private static final long serialVersionUID = 1L; - /** id */ @TableId(value = "commercial_area_id",type = IdType.AUTO) @ApiModelProperty("id") private Long commercialAreaId; - /** 商圈名称 */ @Excel(name = "商圈名称") @ApiModelProperty("商圈名称") private String commercialAreaName; - /** 纬度 */ @Excel(name = "纬度") @ApiModelProperty("纬度") private BigDecimal latitude; - /** 经度 */ @Excel(name = "经度") @ApiModelProperty("经度") private BigDecimal longitude; - /** 地址 */ + @Excel(name = "地址") @ApiModelProperty("地址") private String address; diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Company.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Company.java index e3b222a..19b98ba 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Company.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Company.java @@ -22,56 +22,69 @@ public class Company extends BaseEntity @TableField(exist = false) private static final long serialVersionUID = 1L; - /** 公司id */ @TableId(value = "company_id",type = IdType.AUTO) @ApiModelProperty("公司id") private Long companyId; - /** 单位名称 */ + @Excel(name = "单位名称") @ApiModelProperty("单位名称") private String name; - /** 单位地点 */ + @Excel(name = "单位地点") @ApiModelProperty("单位地点") private String location; - /** 主要行业 */ + @Excel(name = "主要行业") @ApiModelProperty("主要行业") private String industry; - /** 单位规模 对应字典scale */ + @Excel(name = "单位规模 对应字典scale") @ApiModelProperty("单位规模 对应字典scale") private String scale; + @Excel(name = "信用代码") @ApiModelProperty("信用代码") private String code; + @Excel(name = "单位介绍") @ApiModelProperty("单位介绍") private String description; + @Excel(name = "性质") @ApiModelProperty("性质") private String nature; + @ApiModelProperty("招聘数量") private Integer totalRecruitment; + @TableField(exist = false) @ApiModelProperty("是否收藏") private Integer isCollection; + @ApiModelProperty("所属用户id") private Long userId; + @ApiModelProperty("营业执照Url") private String businessLicenseUrl; + @ApiModelProperty("法人身份证复印件-正面") private String idCardPictureUrl; + @ApiModelProperty("法人身份证复印件-反面") private String idCardPictureBackUrl; + @ApiModelProperty("授权代理书") private String powerOfAttorneyUrl; + @ApiModelProperty("联系人") private String contactPerson; + @ApiModelProperty("联系人电话") private String contactPersonPhone; + @ApiModelProperty("审核状态 0审核中 1审核通过 2审核未通过") private Integer status; + @ApiModelProperty("审核未通过原因") private String notPassReason; } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/CompanyCard.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/CompanyCard.java index 0d7869b..08fc357 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/CompanyCard.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/CompanyCard.java @@ -22,29 +22,33 @@ public class CompanyCard extends BaseEntity @TableField(exist = false) private static final long serialVersionUID = 1L; - /** 公司id */ @TableId(value = "company_card_id",type = IdType.AUTO) - @ApiModelProperty("公司id") + @ApiModelProperty("公司卡片id") private Long companyCardId; - /** 卡片名称 */ @Excel(name = "卡片名称") @ApiModelProperty("卡片名称") private String name; - /** 标签，逗号分开 */ @Excel(name = "标签，逗号分开") @ApiModelProperty("标签，逗号分开") private String targ; + @Excel(name = "企业性质") @ApiModelProperty("企业性质，逗号分开") private String companyNature; - /** 背景色 */ + @Excel(name = "背景色") @ApiModelProperty("背景色") private String backgroudColor; + + @ApiModelProperty("状态 0未发布 1发布") private Integer status; + + @ApiModelProperty("排序") private Integer cardOrder; + + @ApiModelProperty("描述") private String description; } \ No newline at end of file diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/CompanyCardCollection.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/CompanyCardCollection.java index 3f80fa1..053cf53 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/CompanyCardCollection.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/CompanyCardCollection.java @@ -22,16 +22,16 @@ public class CompanyCardCollection extends BaseEntity @TableField(exist = false) private static final long serialVersionUID = 1L; - /** 公司id */ @TableId(value = "company_card_collection_id",type = IdType.AUTO) @ApiModelProperty("公司id") private Long companyCardCollectionId; - /** 用户id */ + @Excel(name = "用户id") @ApiModelProperty("用户id") private Long userId; - @Excel(name = "用户id") - @ApiModelProperty("用户id") + + @Excel(name = "公司卡片id") + @ApiModelProperty("公司卡片id") private Long companyCardId; } \ No newline at end of file diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/CompanyCollection.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/CompanyCollection.java index 739f605..97d030d 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/CompanyCollection.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/CompanyCollection.java @@ -22,17 +22,14 @@ public class CompanyCollection extends BaseEntity @TableField(exist = false) private static final long serialVersionUID = 1L; - /** id */ @TableId(value = "id",type = IdType.AUTO) @ApiModelProperty("id") private Long id; - /** 公司id */ @Excel(name = "公司id") @ApiModelProperty("公司id") private Long companyId; - /** App用户id */ @Excel(name = "App用户id") @ApiModelProperty("App用户id") private Long userId; diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/CompanyLabel.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/CompanyLabel.java index b428b99..825ea4d 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/CompanyLabel.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/CompanyLabel.java @@ -26,8 +26,10 @@ public class CompanyLabel extends BaseEntity @TableId(value = "id",type = IdType.AUTO) private Long id; + @ApiModelProperty("公司标签") private String dictValue; + @ApiModelProperty("公司id") private Long companyId; } \ No newline at end of file diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/ESJobDocument.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/ESJobDocument.java index d80132d..5130122 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/ESJobDocument.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/ESJobDocument.java @@ -2,6 +2,7 @@ package com.ruoyi.cms.domain; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.dromara.easyes.annotation.IndexField; import org.dromara.easyes.annotation.IndexId; @@ -20,100 +21,122 @@ import java.util.Date; @Data public class ESJobDocument { - /** - * es中的唯一id - */ + + @ApiModelProperty("es中的唯一id") @IndexId(type = IdType.NONE) @JsonIgnore private String id; - /** 公告ID */ + @ApiModelProperty("岗位id") private Long jobId; - /** 公告标题 */ + @ApiModelProperty("公告标题") @IndexField(fieldType = FieldType.TEXT, analyzer = Analyzer.IK_SMART, searchAnalyzer = Analyzer.IK_MAX_WORD) private String jobTitle; - /** 内容 */ + @ApiModelProperty("内容") @IndexField(fieldType = FieldType.TEXT, analyzer = Analyzer.IK_SMART, searchAnalyzer = Analyzer.IK_MAX_WORD) private String description; - /** 公告状态 */ - @JsonIgnore - private String status; - + @ApiModelProperty("最小薪资（元）") private Long minSalary; - /** 最大薪资（元） */ + @ApiModelProperty("最大薪资（元）") private Long maxSalary; - /** 学历要求 对应字典education */ + @ApiModelProperty("学历要求 对应字典education") private String education; - /** 工作经验要求 对应字典experience */ + @ApiModelProperty("工作经验要求 对应字典experience") private String experience; - /** 用人单位名称 */ + @ApiModelProperty("用人单位名称") private String companyName; - /** 工作地点 */ + @ApiModelProperty("工作地点") private String jobLocation; + @ApiModelProperty("工作地点区县字典代码") private Integer jobLocationAreaCode; - /** 发布时间 */ @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty("发布时间") private Date postingDate; - /** 招聘人数 */ + @ApiModelProperty("招聘人数") private Long vacancies; - /** 纬度 */ + @ApiModelProperty("纬度") private BigDecimal latitude; - /** 经度 */ + @ApiModelProperty("经度") private BigDecimal longitude; - /** 浏览量 */ + @ApiModelProperty("浏览量") private Long view; - /** 公司id */ + @ApiModelProperty("公司id") private Long companyId; + @ApiModelProperty("是否火") private Integer isHot; + @ApiModelProperty("申请次数") private Integer applyNum; + @JsonIgnore + @ApiModelProperty("公司") private Company company; + @ApiModelProperty("是否申请 0为否 1为是") private Integer isApply; + @ApiModelProperty("是否收藏 0为否 1为是") private Integer isCollection; + @ApiModelProperty("数据来源") private String dataSource; + @ApiModelProperty("岗位链接") private String jobUrl; + @JsonIgnore @IndexField(fieldType = FieldType.GEO_POINT) + @ApiModelProperty("经纬度") private String latAndLon; + @JsonIgnore + @ApiModelProperty("公司规模") private String scaleDictCode; + @ApiModelProperty("行业分类") private String industry; + @ApiModelProperty("岗位分类") private String jobCategory; + @JsonIgnore + @ApiModelProperty("学历要求 对应字典education int类型 es方便查询") private Integer education_int; @JsonIgnore + @ApiModelProperty("工作经验要求 对应字典experience int类型 es方便查询") private Integer experience_int; -// @JsonIgnore + + @ApiModelProperty("公司规模 int类型 es方便查询") private Integer scale; + @ApiModelProperty("岗位链接 APP内") private String appJobUrl; + @ApiModelProperty("公司性质") private String companyNature; + @ApiModelProperty("是否有视频介绍") private Integer isExplain; + + @ApiModelProperty("视频介绍URL") private String explainUrl; + + @ApiModelProperty("视频封面URL") private String cover; } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/FairCollection.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/FairCollection.java index 6881f5b..9ef1748 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/FairCollection.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/FairCollection.java @@ -23,17 +23,14 @@ public class FairCollection extends BaseEntity @TableField(exist = false) private static final long serialVersionUID = 1L; - /** id */ @TableId(value = "id",type = IdType.AUTO) @ApiModelProperty("id") private Long id; - /** 岗位id */ @Excel(name = "招聘会id") @ApiModelProperty("招聘会id") private Long fairId; - /** App用户id */ @Excel(name = "App用户id") @ApiModelProperty("App用户id") private Long userId; diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/FairCompany.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/FairCompany.java index e5af236..e67a97c 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/FairCompany.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/FairCompany.java @@ -22,17 +22,14 @@ public class FairCompany extends BaseEntity @TableField(exist = false) private static final long serialVersionUID = 1L; - /** id */ @TableId(value = "id",type = IdType.AUTO) @ApiModelProperty("id") private Long id; - /** 公司id */ @Excel(name = "公司id") @ApiModelProperty("公司id") private Long companyId; - /** 招聘会id */ @Excel(name = "招聘会id") @ApiModelProperty("招聘会id") private Long jobFairId; diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/File.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/File.java index 2de4338..ad6843a 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/File.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/File.java @@ -22,17 +22,14 @@ public class File extends BaseEntity @TableField(exist = false) private static final long serialVersionUID = 1L; - /** id */ @TableId(value = "id",type = IdType.AUTO) @ApiModelProperty("id") private Long id; - /** url */ @Excel(name = "url") @ApiModelProperty("url") private String fileUrl; - /** 业务id */ @Excel(name = "业务id") @ApiModelProperty("业务id") private Long bussinessId; diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Job.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Job.java index 5ea2fbb..28a38f2 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Job.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Job.java @@ -1,18 +1,18 @@ package com.ruoyi.cms.domain; -import java.math.BigDecimal; -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonIgnore; -import lombok.Data; -import com.ruoyi.common.annotation.Excel; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; 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.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonIgnore; +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; + +import java.math.BigDecimal; /** * 岗位对象 job * @author lishundong @@ -26,42 +26,34 @@ public class Job extends BaseEntity @TableField(exist = false) private static final long serialVersionUID = 1L; - /** 工作id */ @TableId(value = "job_id",type = IdType.AUTO) @ApiModelProperty("工作id") private Long jobId; - /** 职位名称 */ @Excel(name = "职位名称") @ApiModelProperty("职位名称") private String jobTitle; - /** 最小薪资（元） */ @Excel(name = "最小薪资", readConverterExp = "元=") @ApiModelProperty("最小薪资（元）") private Long minSalary; - /** 最大薪资（元） */ @Excel(name = "最大薪资", readConverterExp = "元=") @ApiModelProperty("最大薪资（元）") private Long maxSalary; - /** 学历要求 对应字典education */ @Excel(name = "学历要求 对应字典education") @ApiModelProperty("学历要求 对应字典education") private String education; - /** 工作经验要求 对应字典experience */ @Excel(name = "工作经验要求 对应字典experience") @ApiModelProperty("工作经验要求 对应字典experience") private String experience; - /** 用人单位名称 */ @Excel(name = "用人单位名称") @ApiModelProperty("用人单位名称") private String companyName; - /** 工作地点 */ @Excel(name = "工作地点") @ApiModelProperty("工作地点") private String jobLocation; @@ -69,34 +61,28 @@ public class Job extends BaseEntity @ApiModelProperty("工作地点区县字典代码") private Integer jobLocationAreaCode; - /** 发布时间 */ @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "发布时间", width = 30, dateFormat = "yyyy-MM-dd") @ApiModelProperty("发布时间") private String postingDate; - /** 招聘人数 */ @Excel(name = "招聘人数") @ApiModelProperty("招聘人数") private Long vacancies; - /** 纬度 */ @Excel(name = "纬度") @ApiModelProperty("纬度") private BigDecimal latitude; - /** 经度 */ @Excel(name = "经度") @ApiModelProperty("经度") private BigDecimal longitude; - /** 浏览量 */ @Excel(name = "浏览量") @ApiModelProperty("浏览量") @TableField("\"view\"") private Long view; - /** 公司id */ @Excel(name = "公司id") @ApiModelProperty("公司id") private Long companyId; @@ -125,24 +111,41 @@ public class Job extends BaseEntity @ApiModelProperty("是否发布 0未发布 1发布") private Integer isPublish; + @ApiModelProperty("数据来源") private String dataSource; - @ApiModelProperty("数据来源") + + @ApiModelProperty("岗位链接") private String jobUrl; + @ApiModelProperty("jobRow对应id") private Long rowId; + @TableField(exist = false) + @ApiModelProperty("公司规模") private String scale; + @TableField(exist = false) + @ApiModelProperty("行业分类") private String industry; + @ApiModelProperty("岗位分类") private String jobCategory; + @TableField(exist = false) + @ApiModelProperty("公司性质") private String companyNature; + @TableField(exist = false) + @ApiModelProperty("申请时间") private String applyTime; + @ApiModelProperty("是否有视频介绍") private Integer isExplain; + + @ApiModelProperty("视频介绍URL") private String explainUrl; + + @ApiModelProperty("视频封面URL") private String cover; } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/JobApply.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/JobApply.java index ac00d3a..c6818da 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/JobApply.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/JobApply.java @@ -22,22 +22,18 @@ public class JobApply extends BaseEntity @TableField(exist = false) private static final long serialVersionUID = 1L; - /** id */ @TableId(value = "id",type = IdType.AUTO) @ApiModelProperty("id") private Long id; - /** 岗位id */ @Excel(name = "岗位id") @ApiModelProperty("岗位id") private Long jobId; - /** App用户id */ @Excel(name = "App用户id") @ApiModelProperty("App用户id") private Long userId; - /** 匹配度 */ @Excel(name = "匹配度") @ApiModelProperty("匹配度") private Long matchingDegree; diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/JobCollection.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/JobCollection.java index 5f63dde..4a1f6d2 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/JobCollection.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/JobCollection.java @@ -1,15 +1,14 @@ package com.ruoyi.cms.domain; -import com.baomidou.mybatisplus.annotation.*; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonIgnore; -import lombok.Data; +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 com.ruoyi.common.core.domain.BaseEntity; - -import java.util.Date; +import lombok.Data; /** * 用户岗位收藏对象 job_collection @@ -24,17 +23,14 @@ public class JobCollection extends BaseEntity @TableField(exist = false) private static final long serialVersionUID = 1L; - /** id */ @TableId(value = "id",type = IdType.AUTO) @ApiModelProperty("id") private Long id; - /** 岗位id */ @Excel(name = "岗位id") @ApiModelProperty("岗位id") private Long jobId; - /** App用户id */ @Excel(name = "App用户id") @ApiModelProperty("App用户id") private Long userId; diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/JobFair.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/JobFair.java index 4f889ef..66bbc85 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/JobFair.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/JobFair.java @@ -27,56 +27,56 @@ public class JobFair extends BaseEntity @TableField(exist = false) private static final long serialVersionUID = 1L; - /** 招聘会id */ @TableId(value = "job_fair_id",type = IdType.AUTO) @ApiModelProperty("招聘会id") private Long jobFairId; - /** 招聘会名称 */ @Excel(name = "招聘会名称") @ApiModelProperty("招聘会名称") private String name; - /** 招聘会类型 对应字典 job_fair_type */ @Excel(name = "招聘会类型 对应字典 job_fair_type") @ApiModelProperty("招聘会类型 对应字典 job_fair_type") private String jobFairType; - /** 地点 */ @Excel(name = "地点") @ApiModelProperty("地点") private String location; - /** 纬度 */ @Excel(name = "纬度") @ApiModelProperty("纬度") private BigDecimal latitude; - /** 经度 */ @Excel(name = "经度") @ApiModelProperty("经度") private BigDecimal longitude; + @ApiModelProperty("描述") private String description; + @ApiModelProperty("地点") private String address; - /** 招聘会开始时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "招聘会开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("招聘会开始时间") private Date startTime; - /** 招聘会结束时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "招聘会结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("招聘会结束时间") private Date endTime; @TableField(exist = false) + @ApiModelProperty("公司列表") private List companyList; + @TableField(exist = false) @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty("程序时间") private Date queryDate; + @TableField(exist = false) + @ApiModelProperty("是否收藏") public Integer isCollection; } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/JobRecomment.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/JobRecomment.java index 678cd1f..dbd6a3a 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/JobRecomment.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/JobRecomment.java @@ -23,17 +23,14 @@ public class JobRecomment extends BaseEntity @TableField(exist = false) private static final long serialVersionUID = 1L; - /** id */ @TableId(value = "id",type = IdType.AUTO) @ApiModelProperty("id") private Long id; - /** 岗位id */ @Excel(name = "岗位id") @ApiModelProperty("岗位id") private Long jobId; - /** App用户id */ @Excel(name = "App用户id") @ApiModelProperty("App用户id") private Long userId; diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Notice.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Notice.java index e2a161e..1ac25f6 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Notice.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Notice.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; @@ -17,19 +18,34 @@ public class Notice extends BaseEntity @TableField(exist = false) private static final long serialVersionUID = 1L; - /** ID */ @TableId(value = "notice_id",type = IdType.AUTO) private Long noticeId; - /** 公告标题 */ + + @ApiModelProperty("标题") private String title; + + @ApiModelProperty("副标题") private String subTitle; + + @ApiModelProperty("未读数量") private Integer notReadCount; + + @ApiModelProperty("是否阅读") private Integer isRead; + @JsonFormat(pattern = "MM-dd") + @ApiModelProperty("日期") private Date date; + + @ApiModelProperty("通知类型") private String noticeType; - /** 公告内容 */ + + @ApiModelProperty("公告内容") private String noticeContent; + + @ApiModelProperty("用户id") private Long userId; + + @ApiModelProperty("业务id") private Long bussinessId; } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/RowWork.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/RowWork.java index 56d10ad..f1a9778 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/RowWork.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/RowWork.java @@ -1,9 +1,11 @@ package com.ruoyi.cms.domain; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import java.util.Date; @Data +@TableName(value = "row_work") public class RowWork { private String Id; diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Statics.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Statics.java index aa2472c..89d6927 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Statics.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Statics.java @@ -4,9 +4,7 @@ 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; @@ -24,8 +22,12 @@ public class Statics extends BaseEntity /** id */ @TableId(value = "id",type = IdType.AUTO) private Long id; + @ApiModelProperty("时间") private String time; + @ApiModelProperty("类型") private String type; + @ApiModelProperty("名称") private String name; + @ApiModelProperty("数据") private String data; } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/SubwayLine.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/SubwayLine.java index ae3f913..e6a7840 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/SubwayLine.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/SubwayLine.java @@ -25,12 +25,10 @@ public class SubwayLine extends BaseEntity @TableField(exist = false) private static final long serialVersionUID = 1L; - /** id */ @TableId(value = "line_id",type = IdType.AUTO) @ApiModelProperty("id") private Long lineId; - /** 线路名称 */ @Excel(name = "线路名称") @ApiModelProperty("线路名称") private String lineName; diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/SubwayStation.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/SubwayStation.java index 1fb16c3..c7988c8 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/SubwayStation.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/SubwayStation.java @@ -23,37 +23,34 @@ public class SubwayStation extends BaseEntity @TableField(exist = false) private static final long serialVersionUID = 1L; - /** id */ @TableId(value = "station_id",type = IdType.AUTO) @ApiModelProperty("id") private Long stationId; - /** 地铁名称 */ @Excel(name = "地铁名称") @ApiModelProperty("地铁名称") private String stationName; - /** 所属线路名称 */ @Excel(name = "所属线路名称") @ApiModelProperty("所属线路名称") private String lineName; - /** 线路id */ @Excel(name = "线路id") @ApiModelProperty("线路id") private Long lineId; - /** 纬度 */ @Excel(name = "纬度") @ApiModelProperty("纬度") private BigDecimal latitude; - /** 经度 */ @Excel(name = "经度") @ApiModelProperty("经度") private BigDecimal longitude; + @ApiModelProperty("排序") private Integer stationOrder; + + @ApiModelProperty("地址") private String address; } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/query/ESJobSearch.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/query/ESJobSearch.java index 034630c..b14443e 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/query/ESJobSearch.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/query/ESJobSearch.java @@ -51,6 +51,7 @@ public class ESJobSearch extends Job private String salaryDictCode; private String scaleDictCode; + private String area; } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/query/Staticsquery.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/query/Staticsquery.java index c82dd29..6dd20c3 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/query/Staticsquery.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/query/Staticsquery.java @@ -194,29 +194,5 @@ public class Staticsquery { return Integer.compare(this.quarter, other.quarter); } } -// public static void main(String[] args) { -// // Month example -// Staticsquery monthQuery = new Staticsquery(); -// monthQuery.setTimeDimension("月"); -// monthQuery.setStartTime("2024-01"); -// monthQuery.setEndTime("2024-04"); -// System.out.println(monthQuery.generateTimeRange()); -// // Output: [2024-01, 2024-02, 2024-03, 2024-04] -// -// // Quarter example -// Staticsquery quarterQuery = new Staticsquery(); -// quarterQuery.setTimeDimension("季度"); -// quarterQuery.setStartTime("2023-第四季度"); -// quarterQuery.setEndTime("2024-第二季度"); -// System.out.println(quarterQuery.generateTimeRange()); -// // Output: [2023-第4季度, 2024-第1季度, 2024-第2季度] -// -// // Year example -// Staticsquery yearQuery = new Staticsquery(); -// yearQuery.setTimeDimension("年"); -// yearQuery.setStartTime("2020"); -// yearQuery.setEndTime("2024"); -// System.out.println(yearQuery.generateTimeRange()); -// // Output: [2020, 2021, 2022, 2023, 2024] -// } + }