From fd453c0d305b0d21f939639961ac2db66651f92b Mon Sep 17 00:00:00 2001 From: zhengjun@51feijin.com Date: Thu, 5 Nov 2020 19:09:57 +0800 Subject: [PATCH] Pc人才库 --- boot-nunu/src/main/java/com/softwarebr/nunu/BootNunuApplication.java | 2 +- boot-nunu/src/main/java/com/softwarebr/nunu/domain/VerifyPageTotal.java | 3 +++ boot-nunu/src/main/java/com/softwarebr/nunu/json/admin/res/TalentDetailsResult.java | 9 +++++++++ boot-nunu/src/main/java/com/softwarebr/nunu/json/admin/res/TalentResult.java | 3 +++ boot-nunu/src/main/java/com/softwarebr/nunu/web/admin/AdminResController.java | 5 ++++- boot-nunu/src/main/java/com/softwarebr/nunu/web/api/ApiResController.java | 4 ++-- boot-nunu/src/main/resources/application.properties | 3 +++ 7 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 boot-nunu/src/main/resources/application.properties diff --git a/boot-nunu/src/main/java/com/softwarebr/nunu/BootNunuApplication.java b/boot-nunu/src/main/java/com/softwarebr/nunu/BootNunuApplication.java index 220a33a..d66872c 100644 --- a/boot-nunu/src/main/java/com/softwarebr/nunu/BootNunuApplication.java +++ b/boot-nunu/src/main/java/com/softwarebr/nunu/BootNunuApplication.java @@ -21,7 +21,7 @@ public class BootNunuApplication { public static void main(String[] args) { //处理参数 - args = handlerArgs(args); + // args = handlerArgs(args); SpringApplication.run(BootNunuApplication.class, args); } diff --git a/boot-nunu/src/main/java/com/softwarebr/nunu/domain/VerifyPageTotal.java b/boot-nunu/src/main/java/com/softwarebr/nunu/domain/VerifyPageTotal.java index 63b2478..6a4cd13 100644 --- a/boot-nunu/src/main/java/com/softwarebr/nunu/domain/VerifyPageTotal.java +++ b/boot-nunu/src/main/java/com/softwarebr/nunu/domain/VerifyPageTotal.java @@ -51,4 +51,7 @@ public class VerifyPageTotal { @ApiModelProperty(value = "招聘会资源", required = true, example = "10") private Integer inviteCount; + @ApiModelProperty(value = "人才库", required = true, example = "10") + private Integer talentCount; + } diff --git a/boot-nunu/src/main/java/com/softwarebr/nunu/json/admin/res/TalentDetailsResult.java b/boot-nunu/src/main/java/com/softwarebr/nunu/json/admin/res/TalentDetailsResult.java index 51946a6..4c732e1 100644 --- a/boot-nunu/src/main/java/com/softwarebr/nunu/json/admin/res/TalentDetailsResult.java +++ b/boot-nunu/src/main/java/com/softwarebr/nunu/json/admin/res/TalentDetailsResult.java @@ -94,5 +94,14 @@ public class TalentDetailsResult { @ApiModelProperty(value = "是否上架(0下架 1上架) ", required = true, example = "") private Integer upperStatus; + @ApiModelProperty(value = "期望工作省份", required = true, example = "") + private Long provinceId; + + @ApiModelProperty(value = "期望工作城市", required = true, example = "") + private Long cityId; + + @ApiModelProperty(value = "期望工作区县", required = true, example = "") + private Long areaId; + } diff --git a/boot-nunu/src/main/java/com/softwarebr/nunu/json/admin/res/TalentResult.java b/boot-nunu/src/main/java/com/softwarebr/nunu/json/admin/res/TalentResult.java index 9d98ce4..1defb42 100644 --- a/boot-nunu/src/main/java/com/softwarebr/nunu/json/admin/res/TalentResult.java +++ b/boot-nunu/src/main/java/com/softwarebr/nunu/json/admin/res/TalentResult.java @@ -32,6 +32,9 @@ public class TalentResult { @ApiModelProperty(value = "姓名", required = true, example = "") private String name; + @ApiModelProperty(value = "性别", required = true, example = "") + private String sex; + @ApiModelProperty(value = "简历封面图", required = true, example = "") private String coverUri; diff --git a/boot-nunu/src/main/java/com/softwarebr/nunu/web/admin/AdminResController.java b/boot-nunu/src/main/java/com/softwarebr/nunu/web/admin/AdminResController.java index 4f291f3..722f552 100644 --- a/boot-nunu/src/main/java/com/softwarebr/nunu/web/admin/AdminResController.java +++ b/boot-nunu/src/main/java/com/softwarebr/nunu/web/admin/AdminResController.java @@ -28,6 +28,7 @@ import com.softwarebr.nunu.util.AmountConversionUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; +import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -75,7 +76,7 @@ public class AdminResController { @ApiOperation(value = "创新资源交易区状态数据统计", notes = "创新资源交易区状态数据统计", produces = "text/plain") @PreAuthorize("hasRole('res-project-query')") @GetMapping("/v1/res/count") - public JSONResult getResCount(ProjectQueryParam param1, PropertyQueryParam param2, InviteQueryParam param3) { + public JSONResult getResCount(ProjectQueryParam param1, PropertyQueryParam param2, InviteQueryParam param3, TalentQueryParam param4) { VerifyPageTotal verifyPageResult = new VerifyPageTotal(); projectQueryHandle(param1); verifyPageResult.setProjectCount(projectService.count(param1)); @@ -83,6 +84,8 @@ public class AdminResController { verifyPageResult.setPropertyCount(propertyService.count(param2)); inviteQueryHandle(param3); verifyPageResult.setInviteCount(inviteService.count(param3)); + talentQueryHandle(param4); + verifyPageResult.setTalentCount(talentService.count(param4)); return JSONResult.ok(verifyPageResult); } diff --git a/boot-nunu/src/main/java/com/softwarebr/nunu/web/api/ApiResController.java b/boot-nunu/src/main/java/com/softwarebr/nunu/web/api/ApiResController.java index 40c47ce..438f0bf 100644 --- a/boot-nunu/src/main/java/com/softwarebr/nunu/web/api/ApiResController.java +++ b/boot-nunu/src/main/java/com/softwarebr/nunu/web/api/ApiResController.java @@ -381,12 +381,12 @@ public class ApiResController { @ApiOperation(value = "需求发布-人才库简历") @PutMapping("access/v1/center/request/talent") - public JSONResult talentCreateV1(@Valid @RequestBody TalentParam param) { + public JSONResult talentCreateV1(@Valid @RequestBody TalentParam param) { Long memberId = Long.valueOf(SecurityContextHolder.getSubject().getId()); TalentParamDTO talentParamDTO = convertTo(param, TalentParamDTO.class); Talent talent = talentService.saveTalent(memberId, talentParamDTO); - TalentResult talentResult = ControllerPageHandle.convertTo(talent, TalentResult.class); + TalentDetailsResult talentResult = ControllerPageHandle.convertTo(talent, TalentDetailsResult.class); return JSONResult.ok(talentResult); } diff --git a/boot-nunu/src/main/resources/application.properties b/boot-nunu/src/main/resources/application.properties new file mode 100644 index 0000000..b3fdc51 --- /dev/null +++ b/boot-nunu/src/main/resources/application.properties @@ -0,0 +1,3 @@ +spring.profiles.active=dev +#spring.profiles.active=test +#spring.profiles.active=prod \ No newline at end of file -- libgit2 0.21.2