5.0

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<IsvInfo, IsvInfoMapper> {
 
     @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<IsvInfo, IsvInfoMapper> {
         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<IsvInfo, IsvInfoMapper> {
         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<String> roleCodeList) {
         long isvInfoId = isvInfo.getId();
-        permIsvRoleMapper.deleteByColumn(PermIsvRole::getIsvInfoId, isvInfoId);
+        permIsvRoleService.query()
+                .eq(PermIsvRole::getIsvInfoId, isvInfoId)
+                .delete();
 
 
         List<PermIsvRole> tobeSaveList = roleCodeList.stream()
@@ -80,10 +77,9 @@ public class IsvInfoService implements LambdaService<IsvInfo, IsvInfoMapper> {
                 })
                 .collect(Collectors.toList());
 
-        if (CollectionUtils.isNotEmpty(tobeSaveList)) {
+        permIsvRoleService.saveBatch(tobeSaveList);
-            permIsvRoleMapper.saveBatchIgnoreNull(tobeSaveList);
-        }
 
+        // TODO:同步到网关
 //        try {
 //            routePermissionService.sendIsvRolePermissionMsg(isvInfo.getAppKey(), roleCodeList);
 //        } catch (Exception e) {
@@ -105,7 +101,7 @@ public class IsvInfoService implements LambdaService<IsvInfo, IsvInfoMapper> {
     }
 
     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);
     }
 

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<IsvKeys, IsvKeysMapper> {
+
+}

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<PermIsvRole, PermIsvRoleMapper> {
+
+}

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<PermRolePermission, PermRolePermissionMapper> {
+
+}

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<PermRole, PermRoleMapper> {
+
+}