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> 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} 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); } } 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 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/config/StringToDateConverter.java
File was deleted febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/config/WebConfigBeans.java
File was deleted febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java
File was deleted febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseinfo.java
File was deleted febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/feign/IRemoteDeptService.java
New file @@ -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); } febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/feign/IRemoteUserService.java
New file @@ -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); } febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/feign/fallback/RemoteDeptServiceFallback.java
New file @@ -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; }; } } febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/feign/fallback/RemoteUserServiceFallback.java
New file @@ -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; }; } } febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.java
File was deleted febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.xml
File was deleted febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpBaseInfoService.java
File was deleted febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
File was deleted
