diff --git a/.gitignore b/.gitignore index 46b4063fb..cccaef9ea 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ target *.iml logs tmp_notes.** +tmp diff --git a/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/Sdf02Service.java b/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/Sdf02Service.java deleted file mode 100644 index 451a98c1c..000000000 --- a/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/Sdf02Service.java +++ /dev/null @@ -1,61 +0,0 @@ -package ru.spcex.clearing.balance.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.stereotype.Service; -import ru.clearing.classes.statics.data.sdf.SDf02; -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.balance.SDf02NewRequest; -import ru.spcex.clearing.platform.messaging.service.QueueConsumer; -import ru.spcex.platform.imdg.api.Imdg; -import ru.spcex.platform.imdg.api.ImdgProvider; - -//fixme remove -@Deprecated -@Service -public class Sdf02Service extends QueueConsumer implements InitializingBean { - private final Logger log = LoggerFactory.getLogger(getClass()); - private final Imdg sdf8Map; - - - public Sdf02Service(Consumer kafkaQueue, ImdgProvider imdgProvider) { - super(kafkaQueue); - this.sdf8Map = imdgProvider.getImdg(IMDGDistributedNames.Map_SDf02, SDf02.class); - } - - @Override - public void afterPropertiesSet() { - callback(SDf02NewRequest.class) - .setConsumer(this::newSDf02) - .forDestination(Consts.DESTINATION_SDF02_NEW, callbacks::put); - init(); - } - - private void newSDf02(BaseRequest userRequest) { - SDf02NewRequest req = userRequest.getRequestPayload(); - log.debug("SDf02NewRequest received"); - SDf02 sDf02 = new SDf02(); - sDf02.setCurr_code(req.getCurr_code()); - sDf02.setAccount(req.getAccount()); - sDf02.setRemainder(req.getRemainder()); - sDf02.setDeal(req.getDeal()); - sDf02.setAcc_code(req.getAcc_code()); - sDf02.setDat(req.getDat()); - sDf02.setMarket(req.getMarket()); - sDf02.setAcc_name(req.getAcc_name()); - sDf02.setAcc_type(req.getAcc_type()); - sDf02.setSumengage(req.getSumengage()); - sDf02.setSumunblock(req.getSumunblock()); - sDf02.setFile_type(req.getFile_type()); - sDf02.setResult(req.getResult()); -// sDf02.setFileName(req.getFileName()); - sDf02.setGenerationTime(req.getGenerationTime()); - sDf02.setGenerationId(req.getGenerationId()); - sdf8Map.insert(sDf02); - log.debug("successfully processed, new id {}", sDf02.getId()); - } -} diff --git a/platform-parent/platform-imdg-api-hazelcast-impl/src/main/java/ru/spcex/platform/imdg/iml/hazelcast/util/HazelcastHelper.java b/platform-parent/platform-imdg-api-hazelcast-impl/src/main/java/ru/spcex/platform/imdg/iml/hazelcast/util/HazelcastHelper.java index 97977b217..cf00b8825 100644 --- a/platform-parent/platform-imdg-api-hazelcast-impl/src/main/java/ru/spcex/platform/imdg/iml/hazelcast/util/HazelcastHelper.java +++ b/platform-parent/platform-imdg-api-hazelcast-impl/src/main/java/ru/spcex/platform/imdg/iml/hazelcast/util/HazelcastHelper.java @@ -107,6 +107,7 @@ public final class HazelcastHelper { log.info("Wait till STORAGE be ready..."); Thread.sleep(100); } + log.info("STORAGE connected!"); } catch (HazelcastException hcEx) { // проброс InterruptException из Hazelcast if (hcEx instanceof HazelcastException && hcEx.getCause() instanceof InterruptedException)