Skip to content

Чтение характеристик #668

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
theshadowco merged 2 commits into from
Jul 28, 2026
Merged

Чтение характеристик #668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6c4b14
реализовано чтение характеристик
theshadowco Jul 28, 2026
69bfbbf
лишний тустринг
theshadowco Jul 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/main/java/com/github/_1c_syntax/bsl/mdo/BusinessProcess.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import com.github._1c_syntax.bsl.mdo.children.ObjectForm;
import com.github._1c_syntax.bsl.mdo.children.ObjectTemplate;
import com.github._1c_syntax.bsl.mdo.storage.AdditionalIndex;
import com.github._1c_syntax.bsl.mdo.storage.Characteristic;
import com.github._1c_syntax.bsl.mdo.support.ChoiceDataGetMode;
import com.github._1c_syntax.bsl.mdo.support.ChoiceHistoryOnInputMode;
import com.github._1c_syntax.bsl.mdo.support.DataLockControlMode;
Expand Down Expand Up @@ -53,7 +54,7 @@
@Builder(toBuilder = true)
@ToString(of = {"name", "uuid"})
@EqualsAndHashCode(of = {"name", "uuid"})
public class BusinessProcess implements ReferenceObject, AccessRightsOwner {
public class BusinessProcess implements ReferenceObject, AccessRightsOwner, CharacteristicOwner {

private static final List<RoleRight> POSSIBLE_RIGHTS = computePossibleRights();

Expand Down Expand Up @@ -228,6 +229,12 @@ public class BusinessProcess implements ReferenceObject, AccessRightsOwner {
@Default
DataLockControlMode dataLockControlMode = DataLockControlMode.AUTOMATIC;

/**
* Характеристики объекта
*/
@Singular("addCharacteristics")
List<Characteristic> characteristics;

/**
* Возвращает перечень возможных прав доступа
*/
Expand Down
9 changes: 8 additions & 1 deletion src/main/java/com/github/_1c_syntax/bsl/mdo/Catalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import com.github._1c_syntax.bsl.mdo.children.ObjectTemplate;
import com.github._1c_syntax.bsl.mdo.children.PredefinedValue;
import com.github._1c_syntax.bsl.mdo.storage.AdditionalIndex;
import com.github._1c_syntax.bsl.mdo.storage.Characteristic;
import com.github._1c_syntax.bsl.mdo.support.ChoiceDataGetMode;
import com.github._1c_syntax.bsl.mdo.support.ChoiceHistoryOnInputMode;
import com.github._1c_syntax.bsl.mdo.support.CodeSeries;
Expand Down Expand Up @@ -56,7 +57,7 @@
@Builder(toBuilder = true)
@ToString(of = {"name", "uuid"})
@EqualsAndHashCode(of = {"name", "uuid"})
public class Catalog implements ReferenceObject, AccessRightsOwner, PredefinedDataOwner {
public class Catalog implements ReferenceObject, AccessRightsOwner, PredefinedDataOwner, CharacteristicOwner {

Check warning on line 60 in src/main/java/com/github/_1c_syntax/bsl/mdo/Catalog.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Split this “Monster Class” into smaller and more specialized ones to reduce its dependencies on other classes from 24 to the maximum authorized 20 or less. 


See more on https://sonarcloud.io/project/issues?id=1c-syntax_mdclasses&issues=AZ-op82x5E3oH7ycn8vc&open=AZ-op82x5E3oH7ycn8vc&pullRequest=668

private static final List<RoleRight> POSSIBLE_RIGHTS = computePossibleRights();

Expand Down Expand Up @@ -312,6 +313,12 @@
@Default
DataLockControlMode dataLockControlMode = DataLockControlMode.AUTOMATIC;

/**
* Характеристики объекта
*/
@Singular("addCharacteristics")
List<Characteristic> characteristics;

/**
* Возвращает перечень возможных прав доступа
*/
Expand Down
36 changes: 36 additions & 0 deletions src/main/java/com/github/_1c_syntax/bsl/mdo/CharacteristicOwner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/*
* This file is a part of MDClasses.
*
* Copyright (c) 2019 - 2026
* Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> and contributors
*
* SPDX-License-Identifier: LGPL-3.0-or-later
*
* MDClasses is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 3.0 of the License, or (at your option) any later version.
*
* MDClasses is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with MDClasses.
*/
package com.github._1c_syntax.bsl.mdo;

import com.github._1c_syntax.bsl.mdo.storage.Characteristic;

import java.util.List;

/**
* Объект метаданных, содержащий характеристики
*/
public interface CharacteristicOwner {
/**
* Список характеристик объекта
*/
List<Characteristic> getCharacteristics();
Comment thread
coderabbitai[bot] marked this conversation as resolved.
}
9 changes: 8 additions & 1 deletion src/main/java/com/github/_1c_syntax/bsl/mdo/ChartOfAccounts.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import com.github._1c_syntax.bsl.mdo.children.ObjectTemplate;
import com.github._1c_syntax.bsl.mdo.children.PredefinedValue;
import com.github._1c_syntax.bsl.mdo.storage.AdditionalIndex;
import com.github._1c_syntax.bsl.mdo.storage.Characteristic;
import com.github._1c_syntax.bsl.mdo.support.ChoiceDataGetMode;
import com.github._1c_syntax.bsl.mdo.support.ChoiceHistoryOnInputMode;
import com.github._1c_syntax.bsl.mdo.support.CodeSeries;
Expand Down Expand Up @@ -57,7 +58,7 @@
@Builder(toBuilder = true)
@ToString(of = {"name", "uuid"})
@EqualsAndHashCode(of = {"name", "uuid"})
public class ChartOfAccounts implements ReferenceObject, AccessRightsOwner, PredefinedDataOwner {
public class ChartOfAccounts implements ReferenceObject, AccessRightsOwner, PredefinedDataOwner, CharacteristicOwner {

Check warning on line 61 in src/main/java/com/github/_1c_syntax/bsl/mdo/ChartOfAccounts.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Split this “Monster Class” into smaller and more specialized ones to reduce its dependencies on other classes from 25 to the maximum authorized 20 or less. 


See more on https://sonarcloud.io/project/issues?id=1c-syntax_mdclasses&issues=AZ-op84E5E3oH7ycn8vf&open=AZ-op84E5E3oH7ycn8vf&pullRequest=668

/*
* ReferenceObject
Expand Down Expand Up @@ -262,6 +263,12 @@
@Default
DataLockControlMode dataLockControlMode = DataLockControlMode.AUTOMATIC;

/**
* Характеристики объекта
*/
@Singular("addCharacteristics")
List<Characteristic> characteristics;

/**
* Возвращает перечень возможных прав доступа
*/
Expand Down
9 changes: 8 additions & 1 deletion src/main/java/com/github/_1c_syntax/bsl/mdo/ChartOfCalculationTypes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import com.github._1c_syntax.bsl.mdo.children.ObjectTemplate;
import com.github._1c_syntax.bsl.mdo.children.PredefinedValue;
import com.github._1c_syntax.bsl.mdo.storage.AdditionalIndex;
import com.github._1c_syntax.bsl.mdo.storage.Characteristic;
import com.github._1c_syntax.bsl.mdo.support.ChoiceDataGetMode;
import com.github._1c_syntax.bsl.mdo.support.ChoiceHistoryOnInputMode;
import com.github._1c_syntax.bsl.mdo.support.DataLockControlMode;
Expand Down Expand Up @@ -54,7 +55,7 @@
@Builder(toBuilder = true)
@ToString(of = {"name", "uuid"})
@EqualsAndHashCode(of = {"name", "uuid"})
public class ChartOfCalculationTypes implements ReferenceObject, AccessRightsOwner, PredefinedDataOwner {
public class ChartOfCalculationTypes implements ReferenceObject, AccessRightsOwner, PredefinedDataOwner, CharacteristicOwner {

Check warning on line 58 in src/main/java/com/github/_1c_syntax/bsl/mdo/ChartOfCalculationTypes.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Split this “Monster Class” into smaller and more specialized ones to reduce its dependencies on other classes from 22 to the maximum authorized 20 or less. 


See more on https://sonarcloud.io/project/issues?id=1c-syntax_mdclasses&issues=AZ-op8zT5E3oH7ycn8vb&open=AZ-op8zT5E3oH7ycn8vb&pullRequest=668

/*
* ReferenceObject
Expand Down Expand Up @@ -227,6 +228,12 @@
@Default
DataLockControlMode dataLockControlMode = DataLockControlMode.AUTOMATIC;

/**
* Характеристики объекта
*/
@Singular("addCharacteristics")
List<Characteristic> characteristics;

/**
* Возвращает перечень возможных прав доступа
*/
Expand Down
16 changes: 14 additions & 2 deletions src/main/java/com/github/_1c_syntax/bsl/mdo/ChartOfCharacteristicTypes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@
import com.github._1c_syntax.bsl.mdo.children.ObjectTemplate;
import com.github._1c_syntax.bsl.mdo.children.PredefinedValue;
import com.github._1c_syntax.bsl.mdo.storage.AdditionalIndex;
import com.github._1c_syntax.bsl.mdo.storage.Characteristic;
import com.github._1c_syntax.bsl.mdo.support.ChoiceDataGetMode;
import com.github._1c_syntax.bsl.mdo.support.ChoiceHistoryOnInputMode;
import com.github._1c_syntax.bsl.mdo.support.CodeSeries;
import com.github._1c_syntax.bsl.mdo.support.DataLockControlMode;
import com.github._1c_syntax.bsl.mdo.support.SearchStringMode;
import com.github._1c_syntax.bsl.mdo.support.UseMode;
import com.github._1c_syntax.bsl.mdo.support.DefaultFormKind;
import com.github._1c_syntax.bsl.mdo.support.HierarchyType;
import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging;
import com.github._1c_syntax.bsl.mdo.support.RoleRight;
import com.github._1c_syntax.bsl.mdo.utils.LazyLoader;
Expand All @@ -59,7 +59,7 @@
@ToString(of = {"name", "uuid"})
@EqualsAndHashCode(of = {"name", "uuid"})
public class ChartOfCharacteristicTypes
implements ReferenceObject, AccessRightsOwner, ValueTypeOwner, PredefinedDataOwner {
implements ReferenceObject, AccessRightsOwner, ValueTypeOwner, PredefinedDataOwner, CharacteristicOwner {

/*
* ReferenceObject
Expand Down Expand Up @@ -295,6 +295,18 @@ public class ChartOfCharacteristicTypes
@Default
DataLockControlMode dataLockControlMode = DataLockControlMode.AUTOMATIC;

/**
* Характеристики объекта
*/
@Singular("addCharacteristics")
List<Characteristic> characteristics;

/**
* Расширенные значения характеристик
*/
@Default
MdoReference characteristicExtValues = MdoReference.EMPTY;

/**
* Возвращает перечень возможных прав доступа
*/
Expand Down
9 changes: 8 additions & 1 deletion src/main/java/com/github/_1c_syntax/bsl/mdo/Document.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import com.github._1c_syntax.bsl.mdo.children.ObjectForm;
import com.github._1c_syntax.bsl.mdo.children.ObjectTemplate;
import com.github._1c_syntax.bsl.mdo.storage.AdditionalIndex;
import com.github._1c_syntax.bsl.mdo.storage.Characteristic;
import com.github._1c_syntax.bsl.mdo.support.ChoiceDataGetMode;
import com.github._1c_syntax.bsl.mdo.support.ChoiceHistoryOnInputMode;
import com.github._1c_syntax.bsl.mdo.support.DataLockControlMode;
Expand Down Expand Up @@ -53,7 +54,7 @@
@Builder(toBuilder = true)
@ToString(of = {"name", "uuid"})
@EqualsAndHashCode(of = {"name", "uuid"})
public class Document implements ReferenceObject, AccessRightsOwner {
public class Document implements ReferenceObject, AccessRightsOwner, CharacteristicOwner {

private static final List<RoleRight> POSSIBLE_RIGHTS = computePossibleRights();

Expand Down Expand Up @@ -228,6 +229,12 @@ public class Document implements ReferenceObject, AccessRightsOwner {
@Default
DataLockControlMode dataLockControlMode = DataLockControlMode.AUTOMATIC;

/**
* Характеристики объекта
*/
@Singular("addCharacteristics")
List<Characteristic> characteristics;

/**
* Возвращает перечень возможных прав доступа
*/
Expand Down
9 changes: 8 additions & 1 deletion src/main/java/com/github/_1c_syntax/bsl/mdo/Enum.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import com.github._1c_syntax.bsl.mdo.children.ObjectCommand;
import com.github._1c_syntax.bsl.mdo.children.ObjectForm;
import com.github._1c_syntax.bsl.mdo.children.ObjectTemplate;
import com.github._1c_syntax.bsl.mdo.storage.Characteristic;
import com.github._1c_syntax.bsl.mdo.support.DefaultFormKind;
import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging;
import com.github._1c_syntax.bsl.mdo.utils.LazyLoader;
Expand All @@ -47,7 +48,7 @@
@Builder(toBuilder = true)
@ToString(of = {"name", "uuid"})
@EqualsAndHashCode(of = {"name", "uuid"})
public class Enum implements MDObject, ModuleOwner, CommandOwner, FormOwner, TemplateOwner, AttributeOwner {
public class Enum implements MDObject, ModuleOwner, CommandOwner, FormOwner, TemplateOwner, AttributeOwner, CharacteristicOwner {

/*
* MDObject
Expand Down Expand Up @@ -118,6 +119,12 @@ public class Enum implements MDObject, ModuleOwner, CommandOwner, FormOwner, Tem
@Singular
List<EnumValue> enumValues;

/**
* Характеристики объекта
*/
@Singular("addCharacteristics")
List<Characteristic> characteristics;

/**
* Пояснение
*/
Expand Down
9 changes: 8 additions & 1 deletion src/main/java/com/github/_1c_syntax/bsl/mdo/ExchangePlan.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import com.github._1c_syntax.bsl.mdo.children.ObjectTemplate;
import com.github._1c_syntax.bsl.mdo.children.PredefinedValue;
import com.github._1c_syntax.bsl.mdo.storage.AdditionalIndex;
import com.github._1c_syntax.bsl.mdo.storage.Characteristic;
import com.github._1c_syntax.bsl.mdo.support.AutoRecordType;
import com.github._1c_syntax.bsl.mdo.support.ChoiceDataGetMode;
import com.github._1c_syntax.bsl.mdo.support.ChoiceHistoryOnInputMode;
Expand Down Expand Up @@ -55,7 +56,7 @@
@Builder(toBuilder = true)
@ToString(of = {"name", "uuid"})
@EqualsAndHashCode(of = {"name", "uuid"})
public class ExchangePlan implements ReferenceObject, AccessRightsOwner, PredefinedDataOwner {
public class ExchangePlan implements ReferenceObject, AccessRightsOwner, PredefinedDataOwner, CharacteristicOwner {

Check warning on line 59 in src/main/java/com/github/_1c_syntax/bsl/mdo/ExchangePlan.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Split this “Monster Class” into smaller and more specialized ones to reduce its dependencies on other classes from 24 to the maximum authorized 20 or less. 


See more on https://sonarcloud.io/project/issues?id=1c-syntax_mdclasses&issues=AZ-op83b5E3oH7ycn8vd&open=AZ-op83b5E3oH7ycn8vd&pullRequest=668

private static final List<RoleRight> POSSIBLE_RIGHTS = computePossibleRights();

Expand Down Expand Up @@ -246,6 +247,12 @@
@Default
DataLockControlMode dataLockControlMode = DataLockControlMode.AUTOMATIC;

/**
* Характеристики объекта
*/
@Singular("addCharacteristics")
List<Characteristic> characteristics;

/**
* Проверяет наличие объекта в составе плана обмена (вне зависимости от режима авторегистрации)
*
Expand Down
9 changes: 8 additions & 1 deletion src/main/java/com/github/_1c_syntax/bsl/mdo/Task.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import com.github._1c_syntax.bsl.mdo.children.ObjectTemplate;
import com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute;
import com.github._1c_syntax.bsl.mdo.storage.AdditionalIndex;
import com.github._1c_syntax.bsl.mdo.storage.Characteristic;
import com.github._1c_syntax.bsl.mdo.support.ChoiceDataGetMode;
import com.github._1c_syntax.bsl.mdo.support.ChoiceHistoryOnInputMode;
import com.github._1c_syntax.bsl.mdo.support.DataLockControlMode;
Expand Down Expand Up @@ -54,7 +55,7 @@
@Builder(toBuilder = true)
@ToString(of = {"name", "uuid"})
@EqualsAndHashCode(of = {"name", "uuid"})
public class Task implements ReferenceObject, AccessRightsOwner {
public class Task implements ReferenceObject, AccessRightsOwner, CharacteristicOwner {

Check warning on line 58 in src/main/java/com/github/_1c_syntax/bsl/mdo/Task.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Split this “Monster Class” into smaller and more specialized ones to reduce its dependencies on other classes from 21 to the maximum authorized 20 or less. 


See more on https://sonarcloud.io/project/issues?id=1c-syntax_mdclasses&issues=AZ-op8305E3oH7ycn8ve&open=AZ-op8305E3oH7ycn8ve&pullRequest=668

private static final List<RoleRight> POSSIBLE_RIGHTS = computePossibleRights();

Expand Down Expand Up @@ -229,6 +230,12 @@
@Default
DataLockControlMode dataLockControlMode = DataLockControlMode.AUTOMATIC;

/**
* Характеристики объекта
*/
@Singular("addCharacteristics")
List<Characteristic> characteristics;

/**
* Возвращает перечень возможных прав доступа
*/
Expand Down
Loading
Loading