From dbc084d67485124faa65194f0bcf5d01f0f56d03 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期六, 30 一月 2021 23:21:39 +0800
Subject: [PATCH] feat(人力资源微服务): 工作简历基本增、删、改功能实现
---
/dev/null | 70 -----------------
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/FebsServerHrApplication.java | 3
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/feign/IRemoteDeptService.java | 28 +++++++
febs-server/febs-server-generator/src/main/resources/generator/templates/mapper.ftl | 3
febs-server/febs-server-generator/src/main/resources/generator/templates/entity.ftl | 24 +++---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/feign/IRemoteUserService.java | 27 ++++++
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/feign/fallback/RemoteUserServiceFallback.java | 22 +++++
febs-server/febs-server-generator/src/main/resources/generator/templates/serviceImpl.ftl | 6
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/feign/fallback/RemoteDeptServiceFallback.java | 29 +++++++
9 files changed, 126 insertions(+), 86 deletions(-)
diff --git a/febs-server/febs-server-generator/src/main/resources/generator/templates/entity.ftl b/febs-server/febs-server-generator/src/main/resources/generator/templates/entity.ftl
index cb97ea6..4554ab8 100644
--- a/febs-server/febs-server-generator/src/main/resources/generator/templates/entity.ftl
+++ b/febs-server/febs-server-generator/src/main/resources/generator/templates/entity.ftl
@@ -3,13 +3,13 @@
import java.io.Serializable;
<#if hasDate = true>
import java.util.Date;
- import cc.mrbird.febs.common.core.annotation.FieldInfo;
- import cc.mrbird.febs.common.core.utils.DateDeSerializer;
- import cc.mrbird.febs.common.core.utils.DateSerializer;
- import cc.mrbird.febs.common.core.utils.DateTimeDeserializer;
- import cc.mrbird.febs.common.core.utils.DateTimeSerializer;
- import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
- import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import cc.mrbird.febs.common.core.annotation.FieldInfo;
+import cc.mrbird.febs.common.core.utils.DateDeSerializer;
+import cc.mrbird.febs.common.core.utils.DateSerializer;
+import cc.mrbird.febs.common.core.utils.DateTimeDeserializer;
+import cc.mrbird.febs.common.core.utils.DateTimeSerializer;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
</#if>
<#if hasBigDecimal = true>
import java.math.BigDecimal;
@@ -45,7 +45,7 @@
<#if (column.type = 'varchar' || column.type = 'text' || column.type = 'uniqueidentifier'
|| column.type = 'varchar2' || column.type = 'nvarchar' || column.type = 'VARCHAR2'
|| column.type = 'VARCHAR'|| column.type = 'CLOB' || column.type = 'char')>
- private String ${column.field?uncap_first};
+ private String ${column.field?uncap_first}="";
</#if>
<#if column.type = 'timestamp' || column.type = 'datetime'||column.type = 'TIMESTAMP' || column.type = 'DATETIME'>
@@ -66,19 +66,19 @@
<#if column.name = 'version'>
@Version
</#if>
- private Integer ${column.field?uncap_first};
+ private Integer ${column.field?uncap_first}=0;
</#if>
<#if column.type = 'double'>
- private Double ${column.field?uncap_first};
+ private Double ${column.field?uncap_first}=0;
</#if>
<#if column.type = 'bigint'>
- private Long ${column.field?uncap_first};
+ private Long ${column.field?uncap_first}=0L;
</#if>
<#if column.type = 'decimal' || column.type = 'numeric'>
- private BigDecimal ${column.field?uncap_first};
+ private BigDecimal ${column.field?uncap_first}=0;
</#if>
</#list>
diff --git a/febs-server/febs-server-generator/src/main/resources/generator/templates/mapper.ftl b/febs-server/febs-server-generator/src/main/resources/generator/templates/mapper.ftl
index 2403392..ba8b76e 100644
--- a/febs-server/febs-server-generator/src/main/resources/generator/templates/mapper.ftl
+++ b/febs-server/febs-server-generator/src/main/resources/generator/templates/mapper.ftl
@@ -4,6 +4,9 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Update;
+
+import java.util.List;
+
/**
*
* name:${className}
diff --git a/febs-server/febs-server-generator/src/main/resources/generator/templates/serviceImpl.ftl b/febs-server/febs-server-generator/src/main/resources/generator/templates/serviceImpl.ftl
index f72f6c5..f41d18d 100644
--- a/febs-server/febs-server-generator/src/main/resources/generator/templates/serviceImpl.ftl
+++ b/febs-server/febs-server-generator/src/main/resources/generator/templates/serviceImpl.ftl
@@ -76,9 +76,9 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void delete${className}(${className} ${className?uncap_first}) {
-LambdaQueryWrapper<${className}> wapper = new LambdaQueryWrapper<>();
+LambdaQueryWrapper<${className}> wrapper = new LambdaQueryWrapper<>();
// TODO 设置删除条件
-this.remove(wapper);
+this.remove(wrapper);
}
/**
*
@@ -94,7 +94,7 @@
public void logicDel${className}(String ids) {
List<String> list = new ArrayList<>();
String[] str = ids.split(",");
- list.addAll(Arrays.asList(str));
+ List<String> list = new ArrayList<>(Arrays.asList(str));
${className?uncap_first}Mapper.logicDeleteByIds(list, operatorId);
}
}
\ No newline at end of file
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/FebsServerHrApplication.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/FebsServerHrApplication.java
index 7245c7d..4b8248b 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/FebsServerHrApplication.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/FebsServerHrApplication.java
@@ -6,13 +6,14 @@
import org.springframework.boot.WebApplicationType;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.transaction.annotation.EnableTransactionManagement;
/**
* @author MrBird
*/
-@EnableAsync
+@EnableFeignClients
@SpringBootApplication
@EnableFebsCloudResourceServer
@EnableTransactionManagement
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/config/StringToDateConverter.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/config/StringToDateConverter.java
deleted file mode 100644
index 78879ca..0000000
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/config/StringToDateConverter.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package cc.mrbird.febs.server.hr.config;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.core.convert.converter.Converter;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-public class StringToDateConverter implements Converter<String,Date> {
- private static final String dateFormat = "yyyy-MM-dd HH:mm:ss";
- private static final String shortDateFormat = "yyyy-MM-dd";
- private static final String dateFormat2 = "yyyy/MM/dd HH:mm:ss";
- private static final String shortDateFormat2 = "yyyy/MM/dd";
- @Override
- public Date convert(String source) {
- if (StringUtils.isBlank(source)) {
- return null;
- }
- source = source.trim();
- try {
- SimpleDateFormat formatter;
- if (source.contains("-")) {
- if (source.contains(":")) {
- formatter = new SimpleDateFormat(dateFormat);
- } else {
- formatter = new SimpleDateFormat(shortDateFormat);
- }
- Date dtDate = formatter.parse(source);
- return dtDate;
- } else if (source.contains("/")) {
- if (source.contains(":")) {
- formatter = new SimpleDateFormat(dateFormat2);
- } else {
- formatter = new SimpleDateFormat(shortDateFormat2);
- }
- Date dtDate = formatter.parse(source);
- return dtDate;
- }
- } catch (Exception e) {
- throw new RuntimeException(String.format("parser %s to Date fail", source));
- }
-
- throw new RuntimeException(String.format("parser %s to Date fail", source));
-
- }
-}
\ No newline at end of file
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/config/WebConfigBeans.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/config/WebConfigBeans.java
deleted file mode 100644
index 0a34427..0000000
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/config/WebConfigBeans.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package cc.mrbird.febs.server.hr.config;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.convert.support.GenericConversionService;
-import org.springframework.web.bind.support.ConfigurableWebBindingInitializer;
-import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter;
-
-import javax.annotation.PostConstruct;
-
-/**
- * @author yz_08
- */
-@Configuration
-public class WebConfigBeans {
- @Autowired
- private RequestMappingHandlerAdapter handlerAdapter;
-
- @PostConstruct
- public void initEditableValidation() {
- ConfigurableWebBindingInitializer initializer = (ConfigurableWebBindingInitializer) handlerAdapter.getWebBindingInitializer();
- if (initializer.getConversionService() != null) {
- GenericConversionService genericConversionService = (GenericConversionService) initializer.getConversionService();
- genericConversionService.addConverter(new StringToDateConverter());
- }
- }
-}
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
deleted file mode 100644
index 6cf7521..0000000
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package cc.mrbird.febs.server.hr.controller;
-
-import cc.mrbird.febs.server.hr.entity.EmpBaseinfo;
-import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
-import cc.mrbird.febs.common.core.entity.FebsResponse;
-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 lombok.extern.slf4j.Slf4j;
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-import java.util.Map;
-
-/**
-*
-* name:EmpBaseinfo
-* package:cc.mrbird.febs.server.hr.controller
-* description:人员基本信息控制器
-*
-* @author luoyibo
-* @date 2021-01-24 20:35:50
-* @since JDK1.8
-*/
-@Slf4j
-@Validated
-@RestController
-@RequestMapping("empBaseinfo")
-@RequiredArgsConstructor
-public class EmpBaseInfoController {
-
-private final IEmpBaseInfoService empBaseinfoService;
-
-@GetMapping
-@PreAuthorize("hasAuthority('empBaseinfo:list')")
-public FebsResponse getAllEmpBaseinfos(EmpBaseinfo empBaseinfo) {
-return new FebsResponse().data(empBaseinfoService.findEmpBaseinfos(empBaseinfo));
-}
-
-@GetMapping("list")
-@PreAuthorize("hasAuthority('empBaseinfo:list')")
-public FebsResponse empBaseinfoList(QueryRequest request, EmpBaseinfo empBaseinfo) {
-Map<String, Object> dataTable = FebsUtil.getDataTable(this.empBaseinfoService.findEmpBaseinfos(request, empBaseinfo));
-return new FebsResponse().data(dataTable);
-}
-
-@PostMapping
-@PreAuthorize("hasAuthority('empBaseinfo:add')")
-public void addEmpBaseinfo(@Valid EmpBaseinfo empBaseinfo) throws FebsException {
-try {
-this.empBaseinfoService.createEmpBaseinfo(empBaseinfo);
-} catch (Exception e) {
-String message = "新增EmpBaseinfo失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
-
-@DeleteMapping
-@PreAuthorize("hasAuthority('empBaseinfo:delete')")
-public void deleteEmpBaseinfo(EmpBaseinfo empBaseinfo) throws FebsException {
-try {
-this.empBaseinfoService.deleteEmpBaseinfo(empBaseinfo);
-} catch (Exception e) {
-String message = "删除EmpBaseinfo失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
-
-@PutMapping
-@PreAuthorize("hasAuthority('empBaseinfo:update')")
-public void updateEmpBaseinfo(EmpBaseinfo empBaseinfo) throws FebsException {
-try {
-this.empBaseinfoService.updateEmpBaseinfo(empBaseinfo);
-} catch (Exception e) {
-String message = "修改EmpBaseinfo失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
-}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseinfo.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseinfo.java
deleted file mode 100644
index 82a3d1d..0000000
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseinfo.java
+++ /dev/null
@@ -1,264 +0,0 @@
-package cc.mrbird.febs.server.hr.entity;
-
- import java.util.Date;
-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;
-
-/**
-*
-* name:EmpBaseinfo
-* package:cc.mrbird.febs.server.hr.controller
-* description:人员基本信息数据表映射实体
-*
-* @author luoyibo
-* @date 2021-01-24 20:35:50
-* @since JDK1.8
-*/
-@Data
-@TableName("t_emp_baseinfo")
-public class EmpBaseinfo {
-
- /**
- * 员工Id
- */
- @TableId(value = "empId", type = IdType.AUTO)
- private Long empId;
-
- /**
- * 租户Id
- */
- @TableField("customerId")
- private Long customerId;
-
- /**
- * 档案号
- */
- @TableField("archivesNumb")
- private String archivesNumb;
-
- /**
- * 员工姓名
- */
- @TableField("empName")
- private String empName;
-
- /**
- * 性别码，使用国标性别性别码
- */
- @TableField("sex")
- private String sex;
-
- /**
- * 员工类别,员工类另字典表
- */
- @TableField("empType")
- private String empType;
-
- /**
- * 证件类型,人员证件类型，国标代码
- */
- @TableField("certificateType")
- private String certificateType;
-
- /**
- * 证件号码
- */
- @TableField("certificateNumb")
- private String certificateNumb;
-
- /**
- * 证件有效期
- */
- @TableField("certificateValidity")
- private Date certificateValidity;
-
- /**
- * 民族
- */
- @TableField("nation")
- private String nation;
-
- /**
- * 婚姻状况
- */
- @TableField("marriage")
- private String marriage;
-
- /**
- * 年龄
- */
- @TableField("age")
- private Byte age;
-
- /**
- * 身高
- */
- @TableField("stature")
- private Integer stature;
-
- /**
- * 出生日期
- */
- @TableField("birthdate")
- private Date birthdate;
-
- /**
- * 政治面貌
- */
- @TableField("politics")
- private String politics;
-
- /**
- * 入职日期
- */
- @TableField("entryDate")
- private Date entryDate;
-
- /**
- * 最高学历
- */
- @TableField("education")
- private String education;
-
- /**
- * 入司工龄
- */
- @TableField("seniority")
- private Byte seniority;
-
- /**
- * 籍贯
- */
- @TableField("nativePlace")
- private String nativePlace;
-
- /**
- * 户籍地址
- */
- @TableField("censusAddress")
- private String censusAddress;
-
- /**
- * 现住址
- */
- @TableField("currentAddress")
- private String currentAddress;
-
- /**
- * 电话号码
- */
- @TableField("telePhone")
- private String telePhone;
-
- /**
- * 银行名称
- */
- @TableField("bankName")
- private String bankName;
-
- /**
- * 银行账号
- */
- @TableField("bankNumb")
- private String bankNumb;
-
- /**
- * 保险类型
- */
- @TableField("InsuranceType")
- private String insuranceType;
-
- /**
- * 社保电脑号
- */
- @TableField("socialNumb")
- private String socialNumb;
-
- /**
- * 紧急联系电话
- */
- @TableField("urgencyPhone")
- private String urgencyPhone;
-
- /**
- * 保安员证号
- */
- @TableField("guardNumb")
- private String guardNumb;
-
- /**
- * 保安员回执
- */
- @TableField("returnRreceipt")
- private String returnRreceipt;
-
- /**
- * 招聘介绍人
- */
- @TableField("introducer")
- private String introducer;
-
- /**
- * 档案情况
- */
- @TableField("archivesStatus")
- private String archivesStatus;
-
- /**
- * 家庭成员及关系
- */
- @TableField("family")
- private String family;
-
- /**
- * 员工手册
- */
- @TableField("handbookStatus")
- private String handbookStatus;
-
- /**
- * 工作证
- */
- @TableField("empCardStatus")
- private String empCardStatus;
-
- /**
- * 记录创建时间
- */
- @TableField("createTime")
- private Date createTime;
-
- /**
- * 记录创建人
- */
- @TableField("creator")
- private String creator;
-
- /**
- * 记录最后更新时间
- */
- @TableField("modifyTime")
- private Date modifyTime;
-
- /**
- * 记录最后更新人
- */
- @TableField("modifier")
- private String modifier;
-
- /**
- * 记录删除标志。0-未删除 1-已删除，默认0
- */
- @TableField("delFlag")
- private Integer delFlag;
-
- /**
- * 记录版本号，用来进行乐观锁控制
- */
- @TableField("version")
- private Integer version;
-
-}
\ No newline at end of file
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/feign/IRemoteDeptService.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/feign/IRemoteDeptService.java
new file mode 100644
index 0000000..6e8520f
--- /dev/null
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/feign/IRemoteDeptService.java
@@ -0,0 +1,28 @@
+package cc.mrbird.febs.server.hr.feign;
+
+import cc.mrbird.febs.common.core.entity.FebsResponse;
+import cc.mrbird.febs.common.core.entity.QueryRequest;
+import cc.mrbird.febs.common.core.entity.constant.FebsServerConstant;
+import cc.mrbird.febs.common.core.entity.system.Dept;
+import cc.mrbird.febs.common.core.entity.system.SystemUser;
+import cc.mrbird.febs.server.hr.feign.fallback.RemoteDeptServiceFallback;
+import cc.mrbird.febs.server.hr.feign.fallback.RemoteUserServiceFallback;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * name: IRemoteDeptService
+ * package: cc.mrbird.febs.server.hr.feign
+ * description: 从系统管理微服务中获取部门信息
+ * date: 2021-01-30 12:46
+ *
+ * @author luoyibo
+ * @version 0.1
+ * @since JDK 1.8
+ */
+@FeignClient(value = FebsServerConstant.FEBS_SERVER_SYSTEM, contextId = "deptServiceClient", fallbackFactory = RemoteDeptServiceFallback.class)
+public interface IRemoteDeptService {
+ @GetMapping("dept")
+ FebsResponse deptList(@RequestParam("queryRequest") QueryRequest queryRequest, @RequestParam("dept") Dept depts);
+}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/feign/IRemoteUserService.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/feign/IRemoteUserService.java
new file mode 100644
index 0000000..f656cda
--- /dev/null
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/feign/IRemoteUserService.java
@@ -0,0 +1,27 @@
+package cc.mrbird.febs.server.hr.feign;
+
+import cc.mrbird.febs.common.core.entity.FebsResponse;
+import cc.mrbird.febs.common.core.entity.QueryRequest;
+import cc.mrbird.febs.common.core.entity.constant.FebsServerConstant;
+import cc.mrbird.febs.common.core.entity.system.SystemUser;
+import cc.mrbird.febs.server.hr.feign.fallback.RemoteUserServiceFallback;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * @author MrBird
+ */
+@FeignClient(value = FebsServerConstant.FEBS_SERVER_SYSTEM, contextId = "userServiceClient", fallbackFactory = RemoteUserServiceFallback.class)
+public interface IRemoteUserService {
+
+ /**
+ * remote /user endpoint
+ *
+ * @param queryRequest queryRequest
+ * @param user user
+ * @return FebsResponse
+ */
+ @GetMapping("user")
+ FebsResponse userList(@RequestParam("queryRequest") QueryRequest queryRequest, @RequestParam("user") SystemUser user);
+}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/feign/fallback/RemoteDeptServiceFallback.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/feign/fallback/RemoteDeptServiceFallback.java
new file mode 100644
index 0000000..5c63046
--- /dev/null
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/feign/fallback/RemoteDeptServiceFallback.java
@@ -0,0 +1,29 @@
+package cc.mrbird.febs.server.hr.feign.fallback;
+
+import cc.mrbird.febs.common.core.annotation.Fallback;
+import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
+import cc.mrbird.febs.server.hr.feign.IRemoteUserService;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * name: RemoteDeptServiceFallback
+ * package: cc.mrbird.febs.server.hr.feign.fallback
+ * description: 远程部门信息获取服务接口实现
+ * date: 2021-01-30 12:49
+ *
+ * @author luoyibo
+ * @version 0.1
+ * @since JDK 1.8
+ */
+@Slf4j
+@Fallback
+public class RemoteDeptServiceFallback implements FallbackFactory<IRemoteDeptService> {
+ @Override
+ public IRemoteDeptService create(Throwable throwable) {
+ return (queryRequest, dept) -> {
+ log.error("获取部门信息失败", throwable);
+ return null;
+ };
+ }
+}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/feign/fallback/RemoteUserServiceFallback.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/feign/fallback/RemoteUserServiceFallback.java
new file mode 100644
index 0000000..fbadcf2
--- /dev/null
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/feign/fallback/RemoteUserServiceFallback.java
@@ -0,0 +1,22 @@
+package cc.mrbird.febs.server.hr.feign.fallback;
+
+import cc.mrbird.febs.common.core.annotation.Fallback;
+import cc.mrbird.febs.server.hr.feign.IRemoteUserService;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @author MrBird
+ */
+@Slf4j
+@Fallback
+public class RemoteUserServiceFallback implements FallbackFactory<IRemoteUserService> {
+
+ @Override
+ public IRemoteUserService create(Throwable throwable) {
+ return (queryRequest, user) -> {
+ log.error("获取用户信息失败", throwable);
+ return null;
+ };
+ }
+}
\ No newline at end of file
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.java
deleted file mode 100644
index 4557bd0..0000000
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package cc.mrbird.febs.server.hr.mapper;
-
-import cc.mrbird.febs.server.hr.entity.EmpBaseinfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
-*
-* name:EmpBaseinfo
-* package:cc.mrbird.febs.server.hr.controller
-* description:人员基本信息实体Mapper
-*
-* @author luoyibo
-* @date 2021-01-24 20:35:50
-* @since JDK1.8
-*/
-public interface EmpBaseInfoMapper extends BaseMapper<EmpBaseinfo> {
-
-}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.xml b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.xml
deleted file mode 100644
index e48d91b..0000000
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cc.mrbird.febs.server.hr.mapper.EmpBaseInfoMapper">
-
-</mapper>
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpBaseInfoService.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpBaseInfoService.java
deleted file mode 100644
index af5ec07..0000000
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpBaseInfoService.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package cc.mrbird.febs.server.hr.service;
-
-import cc.mrbird.febs.server.hr.entity.EmpBaseinfo;
-
-import cc.mrbird.febs.common.core.entity.QueryRequest;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
-*
-* name:EmpBaseinfo
-* package:cc.mrbird.febs.server.hr.controller
-* description:人员基本信息服务接口
-*
-* @author luoyibo
-* @date 2021-01-24 20:35:50
-* @since JDK1.8
-*/
-public interface IEmpBaseInfoService extends IService<EmpBaseinfo> {
-/**
-* 查询（分页）
-*
-* @param request QueryRequest
-* @param empBaseinfo empBaseinfo
-* @return IPage<EmpBaseinfo>
-*/
-IPage<EmpBaseinfo> findEmpBaseinfos(QueryRequest request, EmpBaseinfo empBaseinfo);
-
-/**
-* 查询（所有）
-*
-* @param empBaseinfo empBaseinfo
-* @return List<EmpBaseinfo>
-*/
-List<EmpBaseinfo> findEmpBaseinfos(EmpBaseinfo empBaseinfo);
-
-/**
-* 新增
-*
-* @param empBaseinfo empBaseinfo
-*/
-void createEmpBaseinfo(EmpBaseinfo empBaseinfo);
-
-/**
-* 修改
-*
-* @param empBaseinfo empBaseinfo
-*/
-void updateEmpBaseinfo(EmpBaseinfo empBaseinfo);
-
-/**
-* 删除
-*
-* @param empBaseinfo empBaseinfo
-*/
-void deleteEmpBaseinfo(EmpBaseinfo empBaseinfo);
-}
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
deleted file mode 100644
index a889666..0000000
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package cc.mrbird.febs.server.hr.service.impl;
-
-import cc.mrbird.febs.server.hr.entity.EmpBaseinfo;
-import cc.mrbird.febs.server.hr.mapper.EmpBaseInfoMapper;
-import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.annotation.Propagation;
-import lombok.RequiredArgsConstructor;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import cc.mrbird.febs.common.core.entity.QueryRequest;
-
-import java.util.List;
-
-/**
-*
-* name:EmpBaseinfo
-* package:cc.mrbird.febs.server.hr.controller
-* description:人员基本信息服务接口实现
-*
-* @author luoyibo
-* @date 2021-01-24 20:35:50
-* @since JDK1.8
-*/
-@Service
-@RequiredArgsConstructor
-@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
-public class EmpBaseInfoServiceImpl extends ServiceImpl
-<EmpBaseInfoMapper, EmpBaseinfo> implements IEmpBaseInfoService {
-
-private final EmpBaseInfoMapper empBaseinfoMapper;
-
-@Override
-public IPage<EmpBaseinfo> findEmpBaseinfos(QueryRequest request, EmpBaseinfo empBaseinfo) {
-LambdaQueryWrapper<EmpBaseinfo> queryWrapper = new LambdaQueryWrapper<>();
-// TODO 设置查询条件
-Page<EmpBaseinfo> page = new Page<>(request.getPageNum(), request.getPageSize());
-return this.page(page, queryWrapper);
-}
-
-@Override
-public List<EmpBaseinfo> findEmpBaseinfos(EmpBaseinfo empBaseinfo) {
-LambdaQueryWrapper<EmpBaseinfo> queryWrapper = new LambdaQueryWrapper<>();
-// TODO 设置查询条件
-return this.baseMapper.selectList(queryWrapper);
-}
-
-@Override
-@Transactional(rollbackFor = Exception.class)
-public void createEmpBaseinfo(EmpBaseinfo empBaseinfo) {
-this.save(empBaseinfo);
-}
-
-@Override
-@Transactional(rollbackFor = Exception.class)
-public void updateEmpBaseinfo(EmpBaseinfo empBaseinfo) {
-this.saveOrUpdate(empBaseinfo);
-}
-
-@Override
-@Transactional(rollbackFor = Exception.class)
-public void deleteEmpBaseinfo(EmpBaseinfo empBaseinfo) {
-LambdaQueryWrapper<EmpBaseinfo> wapper = new LambdaQueryWrapper<>();
-// TODO 设置删除条件
-this.remove(wapper);
-}
-}
--
Gitblit v1.8.0