From ed8053c1f6e2bc681c1cb9d8bd762b7c0db9eca2 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期三, 03 二月 2021 10:02:20 +0800
Subject: [PATCH] docs(人力和代码生成微服务): 接口文档调整和接口生成模板调整
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpResignController.java | 2 ++
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpAccidentCasesController.java | 2 ++
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpRemarkInfoController.java | 2 ++
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpLeaveInfoController.java | 2 ++
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpDimissionAttendController.java | 2 ++
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBadRecordController.java | 2 ++
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpWorkExperienceController.java | 2 ++
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpOccupationalController.java | 2 ++
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java | 11 ++++++++++-
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpPhysicalExamController.java | 2 ++
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpInsuranceController.java | 2 ++
febs-server/febs-server-generator/src/main/resources/generator/templates/controller.ftl | 10 +++++++++-
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpContractInfoController.java | 2 ++
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpLaborTroubleController.java | 2 ++
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java | 2 +-
15 files changed, 44 insertions(+), 3 deletions(-)
diff --git a/febs-server/febs-server-generator/src/main/resources/generator/templates/controller.ftl b/febs-server/febs-server-generator/src/main/resources/generator/templates/controller.ftl
index 9273b1f..2d9b379 100644
--- a/febs-server/febs-server-generator/src/main/resources/generator/templates/controller.ftl
+++ b/febs-server/febs-server-generator/src/main/resources/generator/templates/controller.ftl
@@ -25,6 +25,7 @@
* @date ${date}
* @since JDK1.8
*/
+@Api(tags = "${tableComment}管理接口")
@Slf4j
@Validated
@RestController
@@ -34,19 +35,23 @@
private final I${className}Service ${className?uncap_first}Service;
+@ApiOperation(value = "${tableComment}无翻页列表")
@GetMapping
@PreAuthorize("hasAuthority('${className?uncap_first}:list')")
public FebsResponse getAll${className}s(${className} ${className?uncap_first}) {
return new FebsResponse().data(${className?uncap_first}Service.find${className}s(${className?uncap_first}));
}
+@ApiOperation(value = "${tableComment}翻页列表")
@GetMapping("list")
@PreAuthorize("hasAuthority('${className?uncap_first}:list')")
public FebsResponse ${className?uncap_first}List(QueryRequest request, ${className} ${className?uncap_first}) {
-Map<String, Object> dataTable = FebsUtil.getDataTable(this.${className?uncap_first}Service.find${className}s(request, ${className?uncap_first}));
+Map
+<String, Object> dataTable = FebsUtil.getDataTable(this.${className?uncap_first}Service.find${className}s(request, ${className?uncap_first}));
return new FebsResponse().data(dataTable);
}
+@ApiOperation(value = "${tableComment}增加")
@PostMapping
@PreAuthorize("hasAuthority('${className?uncap_first}:add')")
public void add${className}(@Valid ${className} ${className?uncap_first}) throws FebsException {
@@ -59,6 +64,7 @@
}
}
+@ApiOperation(value = "${tableComment}物理删除")
@DeleteMapping
@PreAuthorize("hasAuthority('${className?uncap_first}:delete')")
public void delete${className}(${className} ${className?uncap_first}) throws FebsException {
@@ -71,6 +77,7 @@
}
}
+@ApiOperation(value = "${tableComment}逻辑删除")
@DeleteMapping("{ids}")
@PreAuthorize("hasAuthority('${className?uncap_first}:delete')")
public void logicDelete${className}(@PathVariable("ids") String ids) throws FebsException {
@@ -83,6 +90,7 @@
}
}
+@ApiOperation(value = "${tableComment}修改")
@PutMapping
@PreAuthorize("hasAuthority('${className?uncap_first}:update')")
public void update${className}(${className} ${className?uncap_first}) throws FebsException {
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpAccidentCasesController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpAccidentCasesController.java
index 9209c75..3ae6d93 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpAccidentCasesController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpAccidentCasesController.java
@@ -6,6 +6,7 @@
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.common.core.utils.FebsUtil;
+import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import lombok.RequiredArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -25,6 +26,7 @@
* @date 2021-01-31 11:26:27
* @since JDK1.8
*/
+@Api(tags = "人员意外险案件录入接口")
@Slf4j
@Validated
@RestController
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBadRecordController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBadRecordController.java
index 2fccd01..2ec6600 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBadRecordController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBadRecordController.java
@@ -6,6 +6,7 @@
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.common.core.utils.FebsUtil;
+import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import lombok.RequiredArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -25,6 +26,7 @@
* @date 2021-01-31 11:26:42
* @since JDK1.8
*/
+@Api(tags = "人员不良记录录入接口")
@Slf4j
@Validated
@RestController
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java
index 87d7f13..57681d5 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java
@@ -10,6 +10,8 @@
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.common.core.utils.FebsUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import lombok.RequiredArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -29,6 +31,7 @@
* @date 2021-01-30 08:04:50
* @since JDK1.8
*/
+@Api(tags = "人员基本信息录入接口")
@Slf4j
@Validated
@RestController
@@ -39,12 +42,14 @@
private final IEmpBaseInfoService empBaseInfoService;
private final IRemoteUserService remoteUserService;
private final IRemoteDeptService remoteDeptService;
+
+ @ApiOperation(value = "人员基本信息无翻页列表")
@GetMapping
@PreAuthorize("hasAuthority('empBaseinfo:list')")
public FebsResponse getAllEmpBaseInfos(EmpBaseInfo empBaseinfo) {
return new FebsResponse().data(empBaseInfoService.findEmpBaseInfos(empBaseinfo));
}
-
+ @ApiOperation(value = "人员基本信息翻页列表")
@GetMapping("list")
@PreAuthorize("hasAuthority('empBaseinfo:list')")
public FebsResponse empBaseInfoList(QueryRequest request, EmpBaseInfo empBaseinfo) {
@@ -52,6 +57,7 @@
return new FebsResponse().data(dataTable);
}
+ @ApiOperation(value = "人员基本信息增加")
@PostMapping
@PreAuthorize("hasAuthority('empBaseinfo:add')")
public void addEmpBaseInfo(@Valid EmpBaseInfo empBaseinfo) throws FebsException {
@@ -64,6 +70,7 @@
}
}
+ @ApiOperation(value = "人员基本信息物理删除")
@DeleteMapping
@PreAuthorize("hasAuthority('empBaseinfo:delete')")
public void deleteEmpBaseInfo(EmpBaseInfo empBaseinfo) throws FebsException {
@@ -76,6 +83,7 @@
}
}
+ @ApiOperation(value = "人员基本信息逻辑删除")
@DeleteMapping("{ids}")
@PreAuthorize("hasAuthority('empBaseinfo:delete')")
public void logicDeleteEmpBaseInfo(@PathVariable("ids") String ids) throws FebsException {
@@ -88,6 +96,7 @@
}
}
+ @ApiOperation(value = "人员基本信息修改")
@PutMapping
@PreAuthorize("hasAuthority('empBaseinfo:update')")
public void updateEmpBaseInfo(EmpBaseInfo empBaseinfo) throws FebsException {
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpContractInfoController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpContractInfoController.java
index 430c113..6c40472 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpContractInfoController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpContractInfoController.java
@@ -6,6 +6,7 @@
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.common.core.utils.FebsUtil;
+import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import lombok.RequiredArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -25,6 +26,7 @@
* @date 2021-01-31 11:28:23
* @since JDK1.8
*/
+@Api(tags = "人员合同信息录入接口")
@Slf4j
@Validated
@RestController
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpDimissionAttendController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpDimissionAttendController.java
index 84ba129..9b0a489 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpDimissionAttendController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpDimissionAttendController.java
@@ -6,6 +6,7 @@
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.common.core.utils.FebsUtil;
+import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import lombok.RequiredArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -25,6 +26,7 @@
* @date 2021-01-31 11:26:04
* @since JDK1.8
*/
+@Api(tags = "人员离职当月考勤信息录入接口")
@Slf4j
@Validated
@RestController
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpInsuranceController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpInsuranceController.java
index 89dbdab..18bd838 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpInsuranceController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpInsuranceController.java
@@ -6,6 +6,7 @@
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.common.core.utils.FebsUtil;
+import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import lombok.RequiredArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -25,6 +26,7 @@
* @date 2021-01-31 11:26:23
* @since JDK1.8
*/
+@Api(tags = "人员社保申请信息录入接口")
@Slf4j
@Validated
@RestController
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpLaborTroubleController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpLaborTroubleController.java
index f0e2068..988f79c 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpLaborTroubleController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpLaborTroubleController.java
@@ -6,6 +6,7 @@
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.common.core.utils.FebsUtil;
+import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import lombok.RequiredArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -25,6 +26,7 @@
* @date 2021-01-31 11:26:36
* @since JDK1.8
*/
+@Api(tags = "人员劳资案件信息录入接口")
@Slf4j
@Validated
@RestController
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpLeaveInfoController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpLeaveInfoController.java
index 73892c8..a7c3e9e 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpLeaveInfoController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpLeaveInfoController.java
@@ -6,6 +6,7 @@
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.common.core.utils.FebsUtil;
+import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import lombok.RequiredArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -25,6 +26,7 @@
* @date 2021-01-31 11:26:13
* @since JDK1.8
*/
+@Api(tags = "人员请假信息录入接口")
@Slf4j
@Validated
@RestController
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpOccupationalController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpOccupationalController.java
index 203bff1..50e6c91 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpOccupationalController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpOccupationalController.java
@@ -6,6 +6,7 @@
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.common.core.utils.FebsUtil;
+import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import lombok.RequiredArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -25,6 +26,7 @@
* @date 2021-01-31 11:26:32
* @since JDK1.8
*/
+@Api(tags = "人员工伤信息录入接口")
@Slf4j
@Validated
@RestController
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpPhysicalExamController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpPhysicalExamController.java
index 6532f69..6941aea 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpPhysicalExamController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpPhysicalExamController.java
@@ -6,6 +6,7 @@
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.common.core.utils.FebsUtil;
+import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import lombok.RequiredArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -24,6 +25,7 @@
* @date 2021-01-31 09:11:00
* @since JDK1.8
*/
+@Api(tags = "人员体检信息录入接口")
@Slf4j
@Validated
@RestController
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpRemarkInfoController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpRemarkInfoController.java
index 7bf117f..5fca2c2 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpRemarkInfoController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpRemarkInfoController.java
@@ -6,6 +6,7 @@
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.common.core.utils.FebsUtil;
+import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import lombok.RequiredArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -25,6 +26,7 @@
* @date 2021-01-31 11:26:48
* @since JDK1.8
*/
+@Api(tags = "人员备注信息录入接口")
@Slf4j
@Validated
@RestController
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpResignController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpResignController.java
index 6aaa417..8a5bdb1 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpResignController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpResignController.java
@@ -6,6 +6,7 @@
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.common.core.utils.FebsUtil;
+import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import lombok.RequiredArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -25,6 +26,7 @@
* @date 2021-01-31 11:26:18
* @since JDK1.8
*/
+@Api(tags = "人员辞职申请信息录入接口")
@Slf4j
@Validated
@RestController
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpWorkExperienceController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpWorkExperienceController.java
index e7fb7a2..89fe523 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpWorkExperienceController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpWorkExperienceController.java
@@ -6,6 +6,7 @@
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.common.core.utils.FebsUtil;
+import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import lombok.RequiredArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -24,6 +25,7 @@
* @date 2021-01-28 12:33:31
* @since JDK1.8
*/
+@Api(tags = "人员工伤经历信息录入接口")
@Slf4j
@Validated
@RestController
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
index 8df32c2..b9076db 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
@@ -160,7 +160,7 @@
private List<EmpBaseInfo> setDeptName(List<EmpBaseInfo> empBaseInfoList) {
List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
for (EmpBaseInfo empBaseInfo : empBaseInfoList) {
- // 设置民族
+ // 设置部门
empBaseInfo.setDeptName(depts.stream()
.filter(k -> k.getDeptId().equals(empBaseInfo.getDeptId()))
.findFirst()
--
Gitblit v1.8.0