From 518f1321c5db6547b285e542b8a87d30ea2e5f35 Mon Sep 17 00:00:00 2001 From: liuxiao <1732399289qq.com> Date: Tue, 16 Jul 2024 15:05:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=9B=E8=81=98=E4=BF=A1=E6=81=AF=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/system/SysOssController.java | 7 +- .../com/ruoyi/official/domain/GwJobInfo.java | 41 ++-- .../ruoyi/official/domain/bo/GwJobInfoBo.java | 64 ++++-- .../ruoyi/official/domain/vo/GwJobInfoVo.java | 64 ++++-- .../service/impl/GwJobInfoServiceImpl.java | 21 +- .../service/impl/GwSlideshowServiceImpl.java | 7 +- .../mapper/official/GwJobInfoMapper.xml | 24 ++- ruoyi-ui/.env.development | 2 +- ruoyi-ui/src/views/official/jobInfo/index.vue | 197 +++++++++++++----- ruoyi-ui/vue.config.js | 6 +- 10 files changed, 306 insertions(+), 127 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java index b58d374..41ff6fa 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java @@ -119,12 +119,15 @@ public class SysOssController extends BaseController { // 保存文件到目标目录 File uploadFile = new File(directory.getAbsolutePath() + File.separator + fileName); file.transferTo(uploadFile); + //上传服务器地址 String pathFan=filePath.replace("\\","/"); //filePath获取到的地址斜杠是“ \ ”的（单斜杠是特殊符号，得用双斜杠代替），得换成“ / ”才能访问到 + //返回全路径图片地址 + String returnPath = ("http://47.121.27.78:8008/upload/" + fileName).replace("\\","/"); //修改数据库 - Long image = iSysImageService.uploadImage(fileName,pathFan+fileName); + Long image = iSysImageService.uploadImage(fileName,returnPath); System.err.println("替换后："+pathFan); - map.put("url",pathFan+fileName); + map.put("url",returnPath); map.put("fileName",fileName); map.put("ossId",image.toString()); return R.ok(map); diff --git a/ruoyi-system/src/main/java/com/ruoyi/official/domain/GwJobInfo.java b/ruoyi-system/src/main/java/com/ruoyi/official/domain/GwJobInfo.java index 925250b..6bceed3 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/official/domain/GwJobInfo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/official/domain/GwJobInfo.java @@ -29,33 +29,50 @@ public class GwJobInfo extends BaseEntity { @TableId(value = "id") private Long id; /** - * 标签id + * 岗位名称 */ - private Long lableId; + private String jobName; /** - * 招聘岗位 + * 岗位职责 */ - private String jobPost; + private String postStatement; /** - * 岗位类型 + * 薪资范围 */ - private String postType; - /** - * 招聘类型 - */ - private String jobType; + private String + salaryRange; /** * 工作地点 */ private String baseSite; /** - * 工作职责 + * 学历 + */ + private String education; + /** + * 年龄范围 + */ + private String ageRange; + /** + * 发布时间 + */ + private Date releaseTime; + /** + * 是否置顶 0：否 1：是 + */ + private String isTop; + /** + * 岗位职责 */ private String jobDuties; /** - * 任职资格 + * 任职要求 */ private String qualification; + /** + * 发布状态 0：否 1：是 + */ + private String releaseState; /** * 创建者id */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/official/domain/bo/GwJobInfoBo.java b/ruoyi-system/src/main/java/com/ruoyi/official/domain/bo/GwJobInfoBo.java index 6849fae..4655a38 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/official/domain/bo/GwJobInfoBo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/official/domain/bo/GwJobInfoBo.java @@ -29,28 +29,23 @@ public class GwJobInfoBo extends BaseEntity { private Long id; /** - * 标签id + * 岗位名称 */ - @NotNull(message = "标签id不能为空", groups = { AddGroup.class, EditGroup.class }) - private Long lableId; + @NotBlank(message = "岗位名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String jobName; /** - * 招聘岗位 + * 岗位职责 */ - @NotBlank(message = "招聘岗位不能为空", groups = { AddGroup.class, EditGroup.class }) - private String jobPost; + @NotBlank(message = "岗位职责不能为空", groups = { AddGroup.class, EditGroup.class }) + private String postStatement; /** - * 岗位类型 + * 薪资范围 */ - @NotBlank(message = "岗位类型不能为空", groups = { AddGroup.class, EditGroup.class }) - private String postType; - - /** - * 招聘类型 - */ - @NotBlank(message = "招聘类型不能为空", groups = { AddGroup.class, EditGroup.class }) - private String jobType; + @NotBlank(message = "薪资范围不能为空", groups = { AddGroup.class, EditGroup.class }) + private String + salaryRange; /** * 工作地点 @@ -59,17 +54,47 @@ public class GwJobInfoBo extends BaseEntity { private String baseSite; /** - * 工作职责 + * 学历 */ - @NotBlank(message = "工作职责不能为空", groups = { AddGroup.class, EditGroup.class }) + @NotBlank(message = "学历不能为空", groups = { AddGroup.class, EditGroup.class }) + private String education; + + /** + * 年龄范围 + */ + @NotBlank(message = "年龄范围不能为空", groups = { AddGroup.class, EditGroup.class }) + private String ageRange; + + /** + * 发布时间 + */ + @NotNull(message = "发布时间不能为空", groups = { AddGroup.class, EditGroup.class }) + private Date releaseTime; + + /** + * 是否置顶 0：否 1：是 + */ + @NotBlank(message = "是否置顶 0：否 1：是不能为空", groups = { AddGroup.class, EditGroup.class }) + private String isTop; + + /** + * 岗位职责 + */ + @NotBlank(message = "岗位职责不能为空", groups = { AddGroup.class, EditGroup.class }) private String jobDuties; /** - * 任职资格 + * 任职要求 */ - @NotBlank(message = "任职资格不能为空", groups = { AddGroup.class, EditGroup.class }) + @NotBlank(message = "任职要求不能为空", groups = { AddGroup.class, EditGroup.class }) private String qualification; + /** + * 发布状态 0：否 1：是 + */ + @NotBlank(message = "发布状态 0：否 1：是不能为空", groups = { AddGroup.class, EditGroup.class }) + private String releaseState; + /** * 创建者id */ @@ -83,4 +108,5 @@ public class GwJobInfoBo extends BaseEntity { private Long updateUserId; + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/official/domain/vo/GwJobInfoVo.java b/ruoyi-system/src/main/java/com/ruoyi/official/domain/vo/GwJobInfoVo.java index 1cb001a..7daa2a2 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/official/domain/vo/GwJobInfoVo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/official/domain/vo/GwJobInfoVo.java @@ -29,28 +29,23 @@ public class GwJobInfoVo { private Long id; /** - * 标签id + * 岗位名称 */ - @ExcelProperty(value = "标签id") - private Long lableId; + @ExcelProperty(value = "岗位名称") + private String jobName; /** - * 招聘岗位 + * 岗位职责 */ - @ExcelProperty(value = "招聘岗位") - private String jobPost; + @ExcelProperty(value = "岗位职责") + private String postStatement; /** - * 岗位类型 + * 薪资范围 */ - @ExcelProperty(value = "岗位类型") - private String postType; - - /** - * 招聘类型 - */ - @ExcelProperty(value = "招聘类型") - private String jobType; + @ExcelProperty(value = "薪资范围") + private String + salaryRange; /** * 工作地点 @@ -59,17 +54,47 @@ public class GwJobInfoVo { private String baseSite; /** - * 工作职责 + * 学历 */ - @ExcelProperty(value = "工作职责") + @ExcelProperty(value = "学历") + private String education; + + /** + * 年龄范围 + */ + @ExcelProperty(value = "年龄范围") + private String ageRange; + + /** + * 发布时间 + */ + @ExcelProperty(value = "发布时间") + private Date releaseTime; + + /** + * 是否置顶 0：否 1：是 + */ + @ExcelProperty(value = "是否置顶 0：否 1：是") + private String isTop; + + /** + * 岗位职责 + */ + @ExcelProperty(value = "岗位职责") private String jobDuties; /** - * 任职资格 + * 任职要求 */ - @ExcelProperty(value = "任职资格") + @ExcelProperty(value = "任职要求") private String qualification; + /** + * 发布状态 0：否 1：是 + */ + @ExcelProperty(value = "发布状态 0：否 1：是") + private String releaseState; + /** * 创建者id */ @@ -83,4 +108,5 @@ public class GwJobInfoVo { private Long updateUserId; + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/official/service/impl/GwJobInfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/official/service/impl/GwJobInfoServiceImpl.java index 9471e35..78a8da3 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/official/service/impl/GwJobInfoServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/official/service/impl/GwJobInfoServiceImpl.java @@ -33,6 +33,7 @@ public class GwJobInfoServiceImpl implements IGwJobInfoService { /** * 查询招聘信息 + */ @Override public GwJobInfoVo queryById(Long id){ @@ -40,7 +41,8 @@ public class GwJobInfoServiceImpl implements IGwJobInfoService { } /** - * 查询招聘信息列表 + * 查询招聘信息 + 列表 */ @Override public TableDataInfo queryPageList(GwJobInfoBo bo, PageQuery pageQuery) { @@ -50,7 +52,8 @@ public class GwJobInfoServiceImpl implements IGwJobInfoService { } /** - * 查询招聘信息列表 + * 查询招聘信息 + 列表 */ @Override public List queryList(GwJobInfoBo bo) { @@ -61,13 +64,17 @@ public class GwJobInfoServiceImpl implements IGwJobInfoService { private LambdaQueryWrapper buildQueryWrapper(GwJobInfoBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(bo.getLableId() != null, GwJobInfo::getLableId, bo.getLableId()); - lqw.eq(StringUtils.isNotBlank(bo.getJobPost()), GwJobInfo::getJobPost, bo.getJobPost()); - lqw.eq(StringUtils.isNotBlank(bo.getPostType()), GwJobInfo::getPostType, bo.getPostType()); - lqw.eq(StringUtils.isNotBlank(bo.getJobType()), GwJobInfo::getJobType, bo.getJobType()); + lqw.like(StringUtils.isNotBlank(bo.getJobName()), GwJobInfo::getJobName, bo.getJobName()); + lqw.eq(StringUtils.isNotBlank(bo.getPostStatement()), GwJobInfo::getPostStatement, bo.getPostStatement()); + lqw.eq(StringUtils.isNotBlank(bo.getSalaryRange()), GwJobInfo::getSalaryRange, bo.getSalaryRange()); lqw.eq(StringUtils.isNotBlank(bo.getBaseSite()), GwJobInfo::getBaseSite, bo.getBaseSite()); + lqw.eq(StringUtils.isNotBlank(bo.getEducation()), GwJobInfo::getEducation, bo.getEducation()); + lqw.eq(StringUtils.isNotBlank(bo.getAgeRange()), GwJobInfo::getAgeRange, bo.getAgeRange()); + lqw.eq(bo.getReleaseTime() != null, GwJobInfo::getReleaseTime, bo.getReleaseTime()); + lqw.eq(StringUtils.isNotBlank(bo.getIsTop()), GwJobInfo::getIsTop, bo.getIsTop()); lqw.eq(StringUtils.isNotBlank(bo.getJobDuties()), GwJobInfo::getJobDuties, bo.getJobDuties()); lqw.eq(StringUtils.isNotBlank(bo.getQualification()), GwJobInfo::getQualification, bo.getQualification()); + lqw.eq(StringUtils.isNotBlank(bo.getReleaseState()), GwJobInfo::getReleaseState, bo.getReleaseState()); lqw.eq(bo.getCreateUserId() != null, GwJobInfo::getCreateUserId, bo.getCreateUserId()); lqw.eq(bo.getUpdateUserId() != null, GwJobInfo::getUpdateUserId, bo.getUpdateUserId()); return lqw; @@ -75,6 +82,7 @@ public class GwJobInfoServiceImpl implements IGwJobInfoService { /** * 新增招聘信息 + */ @Override public Boolean insertByBo(GwJobInfoBo bo) { @@ -89,6 +97,7 @@ public class GwJobInfoServiceImpl implements IGwJobInfoService { /** * 修改招聘信息 + */ @Override public Boolean updateByBo(GwJobInfoBo bo) { diff --git a/ruoyi-system/src/main/java/com/ruoyi/official/service/impl/GwSlideshowServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/official/service/impl/GwSlideshowServiceImpl.java index 8f439e3..4f33b73 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/official/service/impl/GwSlideshowServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/official/service/impl/GwSlideshowServiceImpl.java @@ -72,9 +72,8 @@ public class GwSlideshowServiceImpl implements IGwSlideshowService { Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); if (CollUtil.isNotEmpty(result.getRecords())){ List records = result.getRecords(); - List collect = records.stream().filter(ObjectUtil::isNotEmpty).sorted(Comparator.comparing(GwSlideshowVo::getReleaseTime).reversed()).collect(Collectors.toList()); - List fist = collect.stream().filter(itx -> itx.getIsTop().equals("1")).collect(Collectors.toList()); - fist.addAll(collect.stream().filter(itx->!itx.getIsTop().equals("1")).collect(Collectors.toList())); + List fist = records.stream().filter(itx -> itx.getIsTop().equals("1")).collect(Collectors.toList()); + fist.addAll(records.stream().filter(itx->!itx.getIsTop().equals("1")).collect(Collectors.toList())); result.setRecords(fist); } return TableDataInfo.build(result); @@ -99,7 +98,7 @@ public class GwSlideshowServiceImpl implements IGwSlideshowService { lqw.eq(StringUtils.isNotBlank(bo.getNewsContent()), GwSlideshow::getNewsContent, bo.getNewsContent()); lqw.eq(StringUtils.isNotBlank(bo.getAbstracts()), GwSlideshow::getAbstracts, bo.getAbstracts()); lqw.eq(StringUtils.isNotBlank(bo.getIsTop()), GwSlideshow::getIsTop, bo.getIsTop()); - lqw.orderByDesc(GwSlideshow::getCreateTime); + lqw.orderByDesc(GwSlideshow::getReleaseTime); return lqw; } diff --git a/ruoyi-system/src/main/resources/mapper/official/GwJobInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/official/GwJobInfoMapper.xml index 4e442a0..d82e46f 100644 --- a/ruoyi-system/src/main/resources/mapper/official/GwJobInfoMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/official/GwJobInfoMapper.xml @@ -1,19 +1,25 @@ - + - + - - - - - + + + + + + + + + diff --git a/ruoyi-ui/.env.development b/ruoyi-ui/.env.development index 85ac5e5..c70aab0 100644 --- a/ruoyi-ui/.env.development +++ b/ruoyi-ui/.env.development @@ -6,7 +6,7 @@ ENV = 'development' # 若依管理系统/开发环境 VUE_APP_BASE_API = '/prod-api' -VUE_APP_API_TARGET_URL = 'http://47.121.27.78:8080/' +VUE_APP_API_TARGET_URL = 'http://192.168.28.105:8081/' # 应用访问路径 例如使用前缀 /admin/ VUE_APP_CONTEXT_PATH = '/' diff --git a/ruoyi-ui/src/views/official/jobInfo/index.vue b/ruoyi-ui/src/views/official/jobInfo/index.vue index 4027be7..eee26db 100644 --- a/ruoyi-ui/src/views/official/jobInfo/index.vue +++ b/ruoyi-ui/src/views/official/jobInfo/index.vue @@ -1,18 +1,21 @@