From 95eb01a2caf0d9f220b6e5c92119b9dacbaa3ca7 Mon Sep 17 00:00:00 2001 From: Nikitin Aleksandr Date: Tue, 17 Sep 2024 17:38:53 +0300 Subject: [PATCH] =?UTF-8?q?=D1=81=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20ReadAll(?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entities_tables_readall.go | 3 +- .../grpc_client_tables_readall.go | 2 -- .../create_files/protobuf/protobuf_readall.go | 28 ++++++++++--------- .../server_grpc_tables_readall.go | 2 -- 4 files changed, 17 insertions(+), 18 deletions(-) diff --git a/internal/create_files/entities_tables/entities_tables_readall.go b/internal/create_files/entities_tables/entities_tables_readall.go index 203f23e..815f984 100644 --- a/internal/create_files/entities_tables/entities_tables_readall.go +++ b/internal/create_files/entities_tables/entities_tables_readall.go @@ -135,7 +135,8 @@ func CreateFiles_ReadAll_Table1(Table1 *types.Table, TextTemplateFunction string func AddInterfaces_ReadAll(TextModel string, Table1 *types.Table) string { Otvet := TextModel - if len(types.MapReadAll) == 0 { + _, ok := types.MapReadAll[Table1] + if ok == false { return Otvet } diff --git a/internal/create_files/grpc_client_tables/grpc_client_tables_readall.go b/internal/create_files/grpc_client_tables/grpc_client_tables_readall.go index 0a4420e..9053311 100644 --- a/internal/create_files/grpc_client_tables/grpc_client_tables_readall.go +++ b/internal/create_files/grpc_client_tables/grpc_client_tables_readall.go @@ -129,7 +129,6 @@ func CreateFiles_ReadAll_Table(Table1 *types.Table, TextTemplateFunction string) _, ok := types.MapReadAll[Table1] if ok == false { - Otvet = TextTemplateFunction return Otvet } @@ -258,7 +257,6 @@ func CreateFiles_ReadAll_Test_Table(Table1 *types.Table, TextTemplateFunction st _, ok := types.MapReadAll[Table1] if ok == false { - Otvet = TextTemplateFunction return Otvet } diff --git a/internal/create_files/protobuf/protobuf_readall.go b/internal/create_files/protobuf/protobuf_readall.go index 00d9a5f..9234a2c 100644 --- a/internal/create_files/protobuf/protobuf_readall.go +++ b/internal/create_files/protobuf/protobuf_readall.go @@ -9,21 +9,23 @@ import ( func FindText_ReadAll(TextProto string, Table1 *types.Table) (TextProtoNew string, TextAdd string) { TextProtoNew = TextProto - TextAdd = "" - for Table1, _ := range types.MapReadAll { - - Text1 := FindText_ReadAll1(Table1) - - //проверим такой текст уже есть - pos1 := strings.Index(TextProto, Text1) - if pos1 >= 0 { - continue - } - - // - TextAdd = TextAdd + Text1 + _, ok := types.MapReadAll[Table1] + if ok == false { + return } + TextAdd = "" + Text1 := FindText_ReadAll1(Table1) + + //проверим такой текст уже есть + pos1 := strings.Index(TextProto, Text1) + if pos1 >= 0 { + return + } + + // + TextAdd = TextAdd + Text1 + return TextProtoNew, TextAdd } diff --git a/internal/create_files/server_grpc_tables/server_grpc_tables_readall.go b/internal/create_files/server_grpc_tables/server_grpc_tables_readall.go index 9697357..506dd62 100644 --- a/internal/create_files/server_grpc_tables/server_grpc_tables_readall.go +++ b/internal/create_files/server_grpc_tables/server_grpc_tables_readall.go @@ -117,7 +117,6 @@ func CreateFiles_ReadAll_Table(Table1 *types.Table, TextTemplateFunction string) _, ok := types.MapReadAll[Table1] if ok == false { - Otvet = TextTemplateFunction return Otvet } @@ -243,7 +242,6 @@ func CreateFiles_ReadAll_Test_Table(Table1 *types.Table, TextTemplateFunction st _, ok := types.MapReadAll[Table1] if ok == false { - Otvet = TextTemplateFunction return Otvet }