diff --git a/clearing-parent/utility-service/src/main/java/ru/spcex/clearing/utility/service/ValidationSymbolsService.java b/clearing-parent/utility-service/src/main/java/ru/spcex/clearing/utility/service/ValidationSymbolsService.java index c1ddf9c74..e24cc16ac 100644 --- a/clearing-parent/utility-service/src/main/java/ru/spcex/clearing/utility/service/ValidationSymbolsService.java +++ b/clearing-parent/utility-service/src/main/java/ru/spcex/clearing/utility/service/ValidationSymbolsService.java @@ -1,5 +1,6 @@ package ru.spcex.clearing.utility.service; +import java.util.function.Function; import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.clients.producer.Producer; import org.slf4j.Logger; @@ -8,45 +9,22 @@ import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; -import ru.clearing.classes.statics.data.account.ClientCode; import ru.clearing.classes.statics.data.misc.ValidationSymbols; -import ru.clearing.classes.statics.data.registry.Registry; -import ru.clearing.classes.statics.data.registry.TradingClearingRegistry; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.platform.messaging.domain.BaseRequest; import ru.spcex.clearing.platform.messaging.domain.Consts; -import ru.spcex.clearing.platform.messaging.domain.cud.account.ClientCodeNewRequest; import ru.spcex.clearing.platform.messaging.domain.cud.common.CommonIdRequest; import ru.spcex.clearing.platform.messaging.domain.cud.misc.ValidationSymbolsNewRequest; import ru.spcex.clearing.platform.messaging.domain.cud.misc.ValidationSymbolsUpdateRequest; -import ru.spcex.clearing.platform.messaging.domain.cud.schedule.LauncherCommandRequest; -import ru.spcex.clearing.platform.messaging.domain.cud.utilities.NotificationNewRequest; -import ru.spcex.clearing.platform.messaging.serialization.LogFormatter; import ru.spcex.clearing.platform.messaging.service.QueueConsumer; import ru.spcex.clearing.platform.messaging.service.RequestInfoUpdate; import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender; import ru.spcex.clearing.util.security.UserRoleVerification; import ru.spcex.clearing.validation.common.ValidationHelper; -import ru.spcex.platform.enumeration.*; import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgProvider; -import ru.spcex.platform.imdg.api.predicate.ImdgPredicate; -import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder; -import ru.spcex.platform.imdg.api.predicate.specific.RegistryCodeSqlBuilder; -import ru.spcex.platform.imdg.iml.hazelcast.adapter.predicate.ImdgPredicateBuilderHazelcast; -import ru.spcex.platform.utils.collection.Pair; -import ru.spcex.platform.utils.number.BigDecimalUtil; import ru.spcex.platform.utils.validation.IValidator; -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.time.Instant; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; -import java.util.*; -import java.util.function.Function; -import java.util.stream.Collectors; - @Service public class ValidationSymbolsService extends QueueConsumer implements InitializingBean { private final Logger log = LoggerFactory.getLogger(getClass()); @@ -116,7 +94,7 @@ public class ValidationSymbolsService extends QueueConsumer implements Initializ ValidationSymbols vs = new ValidationSymbols(); vs.setId(validationSymbolsImdg.nextIDSequenceFor()); - vs.setCode(req.getCode()); + vs.setCode(req.getCode().toUpperCase()); vs.setSymbols(req.getSymbols()); vs.setComment(req.getComment()); validationSymbolsImdg.insert(vs); @@ -136,7 +114,7 @@ public class ValidationSymbolsService extends QueueConsumer implements Initializ ValidationSymbolsUpdateRequest req = userRequest.getRequestPayload(); ValidationSymbols vs = validationSymbolsImdg.getSingleObjectByID(req.getId()); - vs.setCode(req.getCode()); + vs.setCode(req.getCode().toUpperCase()); vs.setSymbols(req.getSymbols()); vs.setComment(req.getComment()); validationSymbolsImdg.update(vs);