|
@@ -1,12 +1,16 @@
|
|
|
package cn.cslg.permission.service;
|
|
|
|
|
|
import cn.cslg.permission.common.model.vo.ApplicationVO;
|
|
|
+import cn.cslg.permission.common.model.vo.PersonnelVO;
|
|
|
import cn.cslg.permission.common.model.vo.TenantVO;
|
|
|
import cn.cslg.permission.common.model.vo.associate.AssoApplicationTenantVO;
|
|
|
+import cn.cslg.permission.common.utils.CacheUtils;
|
|
|
import cn.cslg.permission.common.utils.DataUtils;
|
|
|
+import cn.cslg.permission.common.utils.LoginUtils;
|
|
|
import cn.cslg.permission.common.utils.Response;
|
|
|
import cn.cslg.permission.domain.Application;
|
|
|
import cn.cslg.permission.domain.Function;
|
|
|
+import cn.cslg.permission.domain.Personnel;
|
|
|
import cn.cslg.permission.domain.Tenant;
|
|
|
import cn.cslg.permission.domain.associate.AssoApplicationTenant;
|
|
|
import cn.cslg.permission.mapper.ApplicationMapper;
|
|
@@ -16,6 +20,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
+import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.context.annotation.Lazy;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
@@ -33,6 +38,7 @@ import java.util.stream.Collectors;
|
|
|
* @description 应用类 Service 层
|
|
|
*/
|
|
|
|
|
|
+@Slf4j
|
|
|
@Service
|
|
|
@RequiredArgsConstructor(onConstructor_ = {@Lazy})
|
|
|
public class ApplicationService extends ServiceImpl<ApplicationMapper, Application> {
|
|
@@ -42,17 +48,25 @@ public class ApplicationService extends ServiceImpl<ApplicationMapper, Applicati
|
|
|
private final TenantService tenantService;
|
|
|
private final FunctionService functionService;
|
|
|
private final AssoTenantVipTypeFunctionMapper assoTenantVipTypeFunctionMapper;
|
|
|
+ private final CacheUtils cacheUtils;
|
|
|
+ private final LoginUtils loginUtils;
|
|
|
|
|
|
/**
|
|
|
* 新增应用
|
|
|
*/
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public void addApplication(ApplicationVO applicationVO) {
|
|
|
+ log.info("开始处理【新增应用】的业务,参数为:{}", applicationVO);
|
|
|
+
|
|
|
+ //获取登陆人信息,为了取出登陆人id入库
|
|
|
+ PersonnelVO personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
|
|
|
+
|
|
|
try {
|
|
|
Application application = new Application();
|
|
|
application
|
|
|
.setApplicationName(applicationVO.getName())
|
|
|
- .setApplicationDescription(applicationVO.getDescribe());
|
|
|
+ .setApplicationDescription(applicationVO.getDescribe())
|
|
|
+ .setCreateUser(personnelVO.getId());
|
|
|
|
|
|
application.insert();
|
|
|
//新增关联数据
|
|
@@ -210,9 +224,13 @@ public class ApplicationService extends ServiceImpl<ApplicationMapper, Applicati
|
|
|
.setId(application.getId())
|
|
|
.setDescribe(application.getApplicationDescription())
|
|
|
.setName(application.getApplicationName())
|
|
|
- .setCreateUserNameId(application.getCreateUser())
|
|
|
- //用创建人ID查询创建人名称
|
|
|
- .setCreateUserName(personnelService.getById(application.getCreateUser()).getPersonnelName());
|
|
|
+ .setCreateUserNameId(application.getCreateUser());
|
|
|
+ //.setCreateUserName(personnelService.getById(application.getCreateUser()).getPersonnelName());
|
|
|
+ //用创建人ID查询创建人名称
|
|
|
+ Personnel personnel = personnelService.getById(application.getCreateUser());
|
|
|
+ if (personnel != null) {
|
|
|
+ applicationVO1.setCreateUserName(personnel.getPersonnelName());
|
|
|
+ }
|
|
|
|
|
|
applicationVOS.add(applicationVO1);
|
|
|
}
|