From 36540fe5030a9ccbf2f231f6e818cb1f72891f5f Mon Sep 17 00:00:00 2001 From: aalehin Date: Mon, 5 Sep 2022 14:25:40 +0300 Subject: [PATCH] =?UTF-8?q?http://jira.mfd.msk:8088/browse/CLS-21=20http:/?= =?UTF-8?q?/jira.mfd.msk:8088/browse/CLS-24=20---=20company=5Fservices:=20?= =?UTF-8?q?=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B8?= =?UTF-8?q?=20=D1=83=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BA?= =?UTF-8?q?=D0=B0=D1=82=D0=B5=D0=B3=D0=BE=D1=80=D0=B8=D0=B8=20=D0=BA=D0=BE?= =?UTF-8?q?=D0=BC=D0=BF=D0=B0=D0=BD=D0=B8=D0=B8=20clearingMemberCategory?= =?UTF-8?q?=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B8=D0=BC=D0=B5=D0=BD=D0=BE=D0=B2?= =?UTF-8?q?=D0=B0=D0=BB=20=D0=BF=D0=B5=D1=80=D1=84=D0=B8=D0=BA=D1=81=D1=8B?= =?UTF-8?q?=20=D0=B2=20application.properties=20=D0=BF=D0=B5=D1=80=D0=B5?= =?UTF-8?q?=D0=B8=D0=BC=D0=B5=D0=BD=D0=BE=D0=B2=D0=B0=D0=BB=20UtilityServi?= =?UTF-8?q?ceImdgConfig?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...fig.java => CompanyServiceImdgConfig.java} | 2 +- .../ClearingMemberCategoryService.java | 57 +++++++++++++++++++ .../company/service/ContactService.java | 2 +- .../src/main/resources/application.properties | 22 ++++--- 4 files changed, 69 insertions(+), 14 deletions(-) rename clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/{UtilityServiceImdgConfig.java => CompanyServiceImdgConfig.java} (97%) create mode 100644 clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/ClearingMemberCategoryService.java diff --git a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/UtilityServiceImdgConfig.java b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/CompanyServiceImdgConfig.java similarity index 97% rename from clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/UtilityServiceImdgConfig.java rename to clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/CompanyServiceImdgConfig.java index bbe41d92f..f2ecca156 100644 --- a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/UtilityServiceImdgConfig.java +++ b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/CompanyServiceImdgConfig.java @@ -10,7 +10,7 @@ import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.iml.hazelcast.service.HazelcastService; @Configuration -public class UtilityServiceImdgConfig { +public class CompanyServiceImdgConfig { private static ThreadPoolTaskExecutor createThreadPoolTaskExecutor(int maxPoolSz, boolean waitForCompletion) { ThreadPoolTaskExecutor pool = new ThreadPoolTaskExecutor(); if (maxPoolSz > 2) { diff --git a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/ClearingMemberCategoryService.java b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/ClearingMemberCategoryService.java new file mode 100644 index 000000000..235c1ddec --- /dev/null +++ b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/ClearingMemberCategoryService.java @@ -0,0 +1,57 @@ +package ru.spcex.clearing.company.service; + +import org.apache.kafka.clients.consumer.Consumer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.InitializingBean; +import org.springframework.beans.factory.annotation.Autowired; +import ru.clearing.classes.StaticData.generated.ClearingMemberCategory; +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.common.CommonDeleteRequest; +import ru.spcex.clearing.platform.messaging.domain.cud.company.ClearingMemberCategoryUpdateRequest; +import ru.spcex.clearing.platform.messaging.service.QueueConsumer; +import ru.spcex.platform.imdg.api.Imdg; +import ru.spcex.platform.imdg.api.ImdgProvider; + +public class ClearingMemberCategoryService extends QueueConsumer implements InitializingBean { + private final Logger log = LoggerFactory.getLogger(getClass()); + private final Imdg clearingMemberCategoryMap; + + @Autowired + public ClearingMemberCategoryService(Consumer kafkaQueue, ImdgProvider imdgProvider) { + super(kafkaQueue); + this.clearingMemberCategoryMap = imdgProvider.getImdg(IMDGDistributedNames.Map_ClearingMemberCategory, ClearingMemberCategory.class); + } + + @Override + public void afterPropertiesSet() { + callback(ClearingMemberCategoryUpdateRequest.class) + .setConsumer(this::clearingMemberCategoryUpdate) + .forDestination(Consts.DESTINATION_CLEARING_MEMBER_CATEGORY_UPDATE, callbacks::put); + callback(CommonDeleteRequest.class) + .setConsumer(this::clearingMemberCategoryDelete) + .forDestination(Consts.DESTINATION_CLEARING_MEMBER_CATEGORY_DELETE, callbacks::put); + init(); + } + + + public void clearingMemberCategoryUpdate(BaseRequest userRequest) { + ClearingMemberCategoryUpdateRequest req = userRequest.getRequestPayload(); + log.debug("ClearingMemberCategoryUpdateRequest received"); + ClearingMemberCategory clearingMemberCategory = clearingMemberCategoryMap.getSingleObjectByID(req.getId()); + + clearingMemberCategory.setClearingMemberCategory(req.getClearingMemberCategory()); + + clearingMemberCategoryMap.update(clearingMemberCategory); + log.debug("successfully processed, id {}", clearingMemberCategory.getId()); + } + + private void clearingMemberCategoryDelete(BaseRequest userRequest) { + CommonDeleteRequest req = userRequest.getRequestPayload(); + log.debug("CommonDeleteRequest received id = {}", req.getId()); + ClearingMemberCategory clearingMemberCategory = clearingMemberCategoryMap.getSingleObjectByID(req.getId()); + clearingMemberCategoryMap.delete(clearingMemberCategory); + } +} diff --git a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/ContactService.java b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/ContactService.java index f28ef832f..d96342ec1 100644 --- a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/ContactService.java +++ b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/ContactService.java @@ -34,7 +34,7 @@ public class ContactService extends QueueConsumer implements InitializingBean { public void contactUpdate(BaseRequest userRequest) { ContactUpdateRequest req = userRequest.getRequestPayload(); - log.debug("CompanySymbolUpdateRequest received"); + log.debug("ContactUpdateRequest received"); Contact contact = contactMap.getSingleObjectByID(req.getId()); contact.setContactType(req.getContactType()); contact.setContactValue(req.getContactValue()); diff --git a/clearing-parent/company-service/src/main/resources/application.properties b/clearing-parent/company-service/src/main/resources/application.properties index f3f6bd027..2d6a2cfe0 100644 --- a/clearing-parent/company-service/src/main/resources/application.properties +++ b/clearing-parent/company-service/src/main/resources/application.properties @@ -1,13 +1,11 @@ spring.main.web-application-type=none - -utility-service.hazelcast.cluster-members=127.0.0.1 -utility-service.hazelcast.login=dev -utility-service.hazelcast.password=dev-pass - -utility-service.kafka.bootstrap-servers=localhost:9092 -utility-service.kafka.group-id=dev-group -utility-service.kafka.enable-auto-commit=false -utility-service.kafka.session-timeout-ms=30000 -utility-service.kafka.auto-offset-reset=latest -utility-service.kafka.linger-ms=1 -utility-service.kafka.buffer-memory=33554432 \ No newline at end of file +company-service.hazelcast.cluster-members=127.0.0.1 +company-service.hazelcast.login=dev +company-service.hazelcast.password=dev-pass +company-service.kafka.bootstrap-servers=localhost:9092 +company-service.kafka.group-id=dev-group +company-service.kafka.enable-auto-commit=false +company-service.kafka.session-timeout-ms=30000 +company-service.kafka.auto-offset-reset=latest +company-service.kafka.linger-ms=1 +company-service.kafka.buffer-memory=33554432 \ No newline at end of file