|
|
@@ -5,15 +5,7 @@ import (
|
|
|
"git.sxidc.com/go-tools/utils/strutils"
|
|
|
)
|
|
|
|
|
|
-type InfoStruct interface {
|
|
|
- BankInfo
|
|
|
-}
|
|
|
-
|
|
|
-type InfosStruct interface {
|
|
|
- ProjectInfo | DeptInfo | IDName | SubjectIDName
|
|
|
-}
|
|
|
-
|
|
|
-func ExtractInfo[T InfoStruct](infoStr string) (*T, error) {
|
|
|
+func ExtractInfo[T any](infoStr string) (*T, error) {
|
|
|
info := new(T)
|
|
|
if strutils.IsStringEmpty(infoStr) {
|
|
|
return info, nil
|
|
|
@@ -26,7 +18,7 @@ func ExtractInfo[T InfoStruct](infoStr string) (*T, error) {
|
|
|
return info, nil
|
|
|
}
|
|
|
|
|
|
-func ExtractInfoFormInfos[T InfosStruct](infosStr string) (*T, error) {
|
|
|
+func ExtractInfoFormInfos[T any](infosStr string) (*T, error) {
|
|
|
infos, err := ExtractInfos[T](infosStr)
|
|
|
if err != nil {
|
|
|
return nil, err
|
|
|
@@ -40,7 +32,7 @@ func ExtractInfoFormInfos[T InfosStruct](infosStr string) (*T, error) {
|
|
|
return &infos[0], nil
|
|
|
}
|
|
|
|
|
|
-func ExtractInfos[T InfosStruct](infosStr string) ([]T, error) {
|
|
|
+func ExtractInfos[T any](infosStr string) ([]T, error) {
|
|
|
infos := make([]T, 0)
|
|
|
if strutils.IsStringEmpty(infosStr) {
|
|
|
return infos, nil
|