diff --git a/gen.db b/gen.db new file mode 100644 index 00000000..b3f59133 Binary files /dev/null and b/gen.db differ diff --git a/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/IsvInfoMapper.java b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/IsvInfoMapper.java index a95f17ba..cbceff96 100755 --- a/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/IsvInfoMapper.java +++ b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/IsvInfoMapper.java @@ -11,7 +11,7 @@ import org.apache.ibatis.annotations.Mapper; public interface IsvInfoMapper extends BaseMapper { default IsvInfo getByAppId(String appId) { - return this.get(IsvInfo::getAppId, appId); + return this.getByField(IsvInfo::getAppId, appId); } } diff --git a/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/IsvKeysMapper.java b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/IsvKeysMapper.java index 532a64c8..cf061c83 100755 --- a/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/IsvKeysMapper.java +++ b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/IsvKeysMapper.java @@ -9,7 +9,7 @@ import com.gitee.sop.admin.dao.entity.IsvKeys; public interface IsvKeysMapper extends BaseMapper { default IsvKeys getByIsvInfoId(Long isvId) { - return this.get(IsvKeys::getIsvId, isvId); + return this.getByField(IsvKeys::getIsvId, isvId); } } diff --git a/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/DocAppService.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/DocAppService.java index b7c3a142..5f7b5280 100755 --- a/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/DocAppService.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/DocAppService.java @@ -29,7 +29,7 @@ public class DocAppService implements ServiceSupport { public Long addDocApp(String token, User user) { TornaModuleDTO tornaModuleDTO = tornaClient.execute("module.get", null, token, TornaModuleDTO.class); - DocApp docApp = this.get(DocApp::getToken, token); + DocApp docApp = this.getByField(DocApp::getToken, token); if (docApp == null) { docApp = new DocApp(); docApp.setAppName(tornaModuleDTO.getName()); diff --git a/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/DocContentService.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/DocContentService.java index 883d8930..2c3e4faf 100755 --- a/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/DocContentService.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/DocContentService.java @@ -13,7 +13,7 @@ import org.springframework.stereotype.Service; public class DocContentService implements ServiceSupport { public void saveContent(Long docInfoId, String content) { - DocContent docContent = this.get(DocContent::getDocInfoId, docInfoId); + DocContent docContent = this.getByField(DocContent::getDocInfoId, docInfoId); boolean save = false; if (docContent == null) { save = true; diff --git a/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/DocInfoService.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/DocInfoService.java index 45fdc88b..c62844b2 100755 --- a/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/DocInfoService.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/DocInfoService.java @@ -39,11 +39,11 @@ public class DocInfoService implements ServiceSupport { private SysUserService sysUserService; public List listChildDoc(Long parentId) { - return this.list(DocInfo::getParentId, parentId); + return this.listByField(DocInfo::getParentId, parentId); } public List listDocTree(Long docAppId) { - List list = this.list(DocInfo::getDocAppId, docAppId); + List list = this.listByField(DocInfo::getDocAppId, docAppId); if (CollectionUtils.isEmpty(list)) { return new ArrayList<>(0); } diff --git a/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/DocInfoSyncService.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/DocInfoSyncService.java index ce97afda..336928b5 100755 --- a/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/DocInfoSyncService.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/DocInfoSyncService.java @@ -63,7 +63,7 @@ public class DocInfoSyncService { */ public void syncDocInfo(DocApp docApp, Long docInfoId, User user) { Long docAppId = docApp.getId(); - Map nameVersionMap = docInfoService.list(DocInfo::getDocAppId, docAppId) + Map nameVersionMap = docInfoService.listByField(DocInfo::getDocAppId, docAppId) .stream() .collect(Collectors.toMap(docInfo -> docInfo.getDocName() + ":" + docInfo.getDocVersion(), Function.identity(), (v1, v2) -> v2)); diff --git a/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/IsvInfoService.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/IsvInfoService.java index 24858001..a53588c8 100755 --- a/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/IsvInfoService.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/IsvInfoService.java @@ -133,7 +133,7 @@ public class IsvInfoService implements ServiceSupport { } public IsvKeysDTO getKeys(Long isvId) { - IsvKeys isvKeys = isvKeysService.get(IsvKeys::getIsvId, isvId); + IsvKeys isvKeys = isvKeysService.getByField(IsvKeys::getIsvId, isvId); IsvKeysDTO isvKeysDTO; if (isvKeys == null) { isvKeysDTO = new IsvKeysDTO(); diff --git a/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/IsvKeysService.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/IsvKeysService.java index 3300966a..9d2bd202 100755 --- a/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/IsvKeysService.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/IsvKeysService.java @@ -21,7 +21,7 @@ public class IsvKeysService implements ServiceSupport { @Transactional(rollbackFor = Exception.class) public int saveKeys(IsvInfoUpdateKeysDTO isvInfoUpdateKeysDTO) { - IsvKeys isvKeys = this.get(IsvKeys::getIsvId, isvInfoUpdateKeysDTO.getIsvId()); + IsvKeys isvKeys = this.getByField(IsvKeys::getIsvId, isvInfoUpdateKeysDTO.getIsvId()); if (isvKeys == null) { isvKeys = new IsvKeys(); } diff --git a/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/IsvMerchantService.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/IsvMerchantService.java index f18d7160..ebc4b6e2 100644 --- a/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/IsvMerchantService.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/IsvMerchantService.java @@ -30,7 +30,7 @@ public class IsvMerchantService extends BaseLambdaService> getIsvGroupNameMap(Collection isvIds) { - List list = this.list(PermIsvGroup::getIsvId, isvIds); + List list = this.listByField(PermIsvGroup::getIsvId, isvIds); if (list.isEmpty()) { return new HashMap<>(); } @@ -74,7 +74,7 @@ public class PermIsvGroupService implements ServiceSupport listIsvGroupId(Long isvId) { - List list = this.list(PermIsvGroup::getIsvId, isvId); + List list = this.listByField(PermIsvGroup::getIsvId, isvId); if (list.isEmpty()) { return new ArrayList<>(0); } diff --git a/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/SysConfigService.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/SysConfigService.java index ceda3f9b..5d191ff0 100755 --- a/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/SysConfigService.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/SysConfigService.java @@ -62,7 +62,7 @@ public class SysConfigService extends BaseLambdaService environment.getProperty(key, defaultValue)); diff --git a/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/SysUserService.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/SysUserService.java index ebefd864..7790a4f7 100755 --- a/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/SysUserService.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/SysUserService.java @@ -155,7 +155,7 @@ public class SysUserService implements ServiceSupport { } public SysUser getByUsername(String username) { - return this.get(SysUser::getUsername, username); + return this.getByField(SysUser::getUsername, username); }