gitee
/
eiam
mirror of https://gitee.com/topiam/eiam
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

⚡ 优化

pull/48/head
smallbun 2023-09-13 21:55:12 +08:00
parent efff5b4613
commit 0473ca0e7c
2 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
eiam-application/eiam-application-core/src/main/java/cn/topiam/employee/application/ApplicationService.java
View File

@ -17,6 +17,7 @@
*/ */
package cn.topiam.employee.application; package cn.topiam.employee.application;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -86,6 +87,19 @@ public interface ApplicationService {
*/ */
String getBase64Icon(); String getBase64Icon();
/**
* 创建应用
*
* @param name {@link String} 名称
* @param icon {@link String} 图标
* @param remark {@link String} 备注
* @return {@link Long} 应用ID
*/
@Transactional(rollbackFor = Exception.class)
default String create(String name, String icon, String remark) {
return create(name, icon, remark, new ArrayList<>());
}
/** /**
* 创建应用 * 创建应用
* *

15
eiam-console/src/main/java/cn/topiam/employee/console/service/app/impl/AppServiceImpl.java
View File

@ -17,10 +17,7 @@
*/ */
package cn.topiam.employee.console.service.app.impl; package cn.topiam.employee.console.service.app.impl;
import java.util.ArrayList; import java.util.*;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import cn.topiam.employee.common.entity.app.AppGroupAssociationEntity; import cn.topiam.employee.common.entity.app.AppGroupAssociationEntity;
import cn.topiam.employee.common.repository.app.AppGroupAssociationRepository; import cn.topiam.employee.common.repository.app.AppGroupAssociationRepository;
@ -52,6 +49,7 @@ import cn.topiam.employee.support.util.BeanUtils;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.util.CollectionUtils;
import static cn.topiam.employee.support.repository.domain.BaseEntity.LAST_MODIFIED_BY; import static cn.topiam.employee.support.repository.domain.BaseEntity.LAST_MODIFIED_BY;
import static cn.topiam.employee.support.repository.domain.BaseEntity.LAST_MODIFIED_TIME; import static cn.topiam.employee.support.repository.domain.BaseEntity.LAST_MODIFIED_TIME;
@ -93,8 +91,13 @@ public class AppServiceImpl implements AppService {
public AppCreateResult createApp(AppCreateParam param) { public AppCreateResult createApp(AppCreateParam param) {
ApplicationService applicationService = applicationServiceLoader ApplicationService applicationService = applicationServiceLoader
.getApplicationService(param.getTemplate()); .getApplicationService(param.getTemplate());
String appId = applicationService.create(param.getName(), param.getIcon(), String appId;
param.getRemark(), param.getGroupIds()); if (!CollectionUtils.isEmpty(param.getGroupIds())) {
appId = applicationService.create(param.getName(), param.getIcon(), param.getRemark(),
param.getGroupIds());
} else {
appId = applicationService.create(param.getName(), param.getIcon(), param.getRemark());
}
AuditContext.setTarget(Target.builder().id(appId).type(TargetType.APPLICATION).build()); AuditContext.setTarget(Target.builder().id(appId).type(TargetType.APPLICATION).build());
return new AppCreateResult(appId); return new AppCreateResult(appId);
} }