diff --git a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/service/isv/IsvInfoService.java b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/service/isv/IsvInfoService.java index 6063fa4b..f82319e2 100644 --- a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/service/isv/IsvInfoService.java +++ b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/service/isv/IsvInfoService.java @@ -1,17 +1,13 @@ package com.gitee.sop.adminbackend.service.isv; import com.gitee.fastmybatis.core.support.LambdaService; -import com.gitee.fastmybatis.core.util.DateUtil; import com.gitee.sop.adminbackend.common.RSATool; import com.gitee.sop.adminbackend.common.dto.StatusUpdateDTO; import com.gitee.sop.adminbackend.common.enums.StatusEnum; -import com.gitee.sop.adminbackend.common.exception.BizException; import com.gitee.sop.adminbackend.dao.entity.IsvInfo; import com.gitee.sop.adminbackend.dao.entity.IsvKeys; import com.gitee.sop.adminbackend.dao.entity.PermIsvRole; import com.gitee.sop.adminbackend.dao.mapper.IsvInfoMapper; -import com.gitee.sop.adminbackend.dao.mapper.IsvKeysMapper; -import com.gitee.sop.adminbackend.dao.mapper.PermIsvRoleMapper; import com.gitee.sop.adminbackend.service.isv.dto.IsvInfoAddDTO; import com.gitee.sop.adminbackend.service.isv.dto.IsvKeysDTO; import com.gitee.sop.adminbackend.service.isv.dto.IsvKeysGenDTO; @@ -35,9 +31,9 @@ import java.util.stream.Collectors; public class IsvInfoService implements LambdaService { @Resource - private IsvKeysMapper isvKeysMapper; + private IsvKeysService isvKeysService; @Resource - private PermIsvRoleMapper permIsvRoleMapper; + private PermIsvRoleService permIsvRoleService; public RSATool.KeyStore createKeys(RSATool.KeyFormat keyFormat) throws Exception { if (keyFormat == null) { @@ -47,7 +43,6 @@ public class IsvInfoService implements LambdaService { return rsaTool.createKeys(); } - @Transactional(rollbackFor = Exception.class) public long add(IsvInfoAddDTO isvInfoAddDTO) throws Exception { IsvInfo rec = CopyUtil.copyBean(isvInfoAddDTO, IsvInfo::new); @@ -62,13 +57,15 @@ public class IsvInfoService implements LambdaService { IsvKeys isvKeys = new IsvKeys(); isvKeys.setIsvInfoId(rec.getId()); CopyUtil.copyPropertiesIgnoreNull(isvKeysGenVO, isvKeys); - isvKeysMapper.saveIgnoreNull(isvKeys); + isvKeysService.save(isvKeys); return rec.getId(); } private void saveIsvRole(IsvInfo isvInfo, List roleCodeList) { long isvInfoId = isvInfo.getId(); - permIsvRoleMapper.deleteByColumn(PermIsvRole::getIsvInfoId, isvInfoId); + permIsvRoleService.query() + .eq(PermIsvRole::getIsvInfoId, isvInfoId) + .delete(); List tobeSaveList = roleCodeList.stream() @@ -80,10 +77,9 @@ public class IsvInfoService implements LambdaService { }) .collect(Collectors.toList()); - if (CollectionUtils.isNotEmpty(tobeSaveList)) { - permIsvRoleMapper.saveBatchIgnoreNull(tobeSaveList); - } + permIsvRoleService.saveBatch(tobeSaveList); + // TODO:同步到网关 // try { // routePermissionService.sendIsvRolePermissionMsg(isvInfo.getAppKey(), roleCodeList); // } catch (Exception e) { @@ -105,7 +101,7 @@ public class IsvInfoService implements LambdaService { } public IsvKeysDTO getKeys(Long isvInfoId) { - IsvKeys isvKeys = isvKeysMapper.get(IsvKeys::getIsvInfoId, isvInfoId); + IsvKeys isvKeys = isvKeysService.get(IsvKeys::getIsvInfoId, isvInfoId); return CopyUtil.copyBean(isvKeys, IsvKeysDTO::new); } diff --git a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/service/isv/IsvKeysService.java b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/service/isv/IsvKeysService.java new file mode 100644 index 00000000..3e6c5f79 --- /dev/null +++ b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/service/isv/IsvKeysService.java @@ -0,0 +1,15 @@ +package com.gitee.sop.adminbackend.service.isv; + +import com.gitee.fastmybatis.core.support.LambdaService; +import com.gitee.sop.adminbackend.dao.entity.IsvKeys; +import com.gitee.sop.adminbackend.dao.mapper.IsvKeysMapper; +import org.springframework.stereotype.Service; + + +/** + * @author 六如 + */ +@Service +public class IsvKeysService implements LambdaService { + +} diff --git a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/service/isv/PermIsvRoleService.java b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/service/isv/PermIsvRoleService.java new file mode 100644 index 00000000..53e12e4a --- /dev/null +++ b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/service/isv/PermIsvRoleService.java @@ -0,0 +1,15 @@ +package com.gitee.sop.adminbackend.service.isv; + +import com.gitee.fastmybatis.core.support.LambdaService; +import com.gitee.sop.adminbackend.dao.entity.PermIsvRole; +import com.gitee.sop.adminbackend.dao.mapper.PermIsvRoleMapper; +import org.springframework.stereotype.Service; + + +/** + * @author 六如 + */ +@Service +public class PermIsvRoleService implements LambdaService { + +} diff --git a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/service/isv/PermRolePermissionService.java b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/service/isv/PermRolePermissionService.java new file mode 100644 index 00000000..bc5ccc19 --- /dev/null +++ b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/service/isv/PermRolePermissionService.java @@ -0,0 +1,15 @@ +package com.gitee.sop.adminbackend.service.isv; + +import com.gitee.fastmybatis.core.support.LambdaService; +import com.gitee.sop.adminbackend.dao.entity.PermRolePermission; +import com.gitee.sop.adminbackend.dao.mapper.PermRolePermissionMapper; +import org.springframework.stereotype.Service; + + +/** + * @author 六如 + */ +@Service +public class PermRolePermissionService implements LambdaService { + +} diff --git a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/service/isv/PermRoleService.java b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/service/isv/PermRoleService.java new file mode 100644 index 00000000..dd1fd555 --- /dev/null +++ b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/service/isv/PermRoleService.java @@ -0,0 +1,15 @@ +package com.gitee.sop.adminbackend.service.isv; + +import com.gitee.fastmybatis.core.support.LambdaService; +import com.gitee.sop.adminbackend.dao.entity.PermRole; +import com.gitee.sop.adminbackend.dao.mapper.PermRoleMapper; +import org.springframework.stereotype.Service; + + +/** + * @author 六如 + */ +@Service +public class PermRoleService implements LambdaService { + +}