treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

http://jira.mfd.msk:8088/browse/CLS-792

Browse source
This commit is contained in:
akulikov 2024-11-28 15:15:29 +03:00
parent 5ccd97f528
commit 07df32cfad
3 changed files with 25 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/data/tags/objects/ObjectTag.java
View file

@ -1,10 +1,15 @@
package ru.spcex.clearing.xml.exporter.logic.data.tags.objects; package ru.spcex.clearing.xml.exporter.logic.data.tags.objects;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonSubTypes;
import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import ru.spcex.platform.classes.base.SpcexObjectBase; import ru.spcex.platform.classes.base.SpcexObjectBase;
import ru.spcex.platform.enumeration.CurrencyCode; import ru.spcex.platform.enumeration.CurrencyCode;
import ru.spcex.platform.utils.log.ExceptionUtils;
@JsonTypeInfo(use = JsonTypeInfo.Id.DEDUCTION) @JsonTypeInfo(use = JsonTypeInfo.Id.DEDUCTION)
@JsonSubTypes({ @JsonSubTypes({
@ -19,6 +24,7 @@ import ru.spcex.platform.enumeration.CurrencyCode;
}) })
@JsonIgnoreProperties(value = { "clazz", "currency" }) @JsonIgnoreProperties(value = { "clazz", "currency" })
public abstract class ObjectTag<T1 extends SpcexObjectBase> { public abstract class ObjectTag<T1 extends SpcexObjectBase> {
private final Logger log = LoggerFactory.getLogger(getClass());
public final static String ruCurrency = CurrencyCode.RUB.getKey(); public final static String ruCurrency = CurrencyCode.RUB.getKey();
public Class<T1> clazz; public Class<T1> clazz;
@ -29,4 +35,16 @@ public abstract class ObjectTag<T1 extends SpcexObjectBase> {
public abstract void setData(T1 entity); public abstract void setData(T1 entity);
public abstract String getCurrency(); public abstract String getCurrency();
public ObjectTag<T1> cloneObject() {
ObjectTag<T1> cloneObj = null;
try {
Constructor<? extends ObjectTag> declaredConstructor = getClass().getDeclaredConstructor();
cloneObj = declaredConstructor.newInstance();
} catch (NoSuchMethodException | InvocationTargetException | InstantiationException | IllegalAccessException e) {
// unreachable
log.error("Can't create clone for {}, cause: {}", clazz.getName(), ExceptionUtils.getStackTrace(e));
}
return cloneObj;
}
} }

3
clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/stages/ExportFromHazelcast.java
View file

@ -173,7 +173,8 @@ public class ExportFromHazelcast {
List<ObjectTag<? extends SpcexObjectBase>> result = new ArrayList<>(); List<ObjectTag<? extends SpcexObjectBase>> result = new ArrayList<>();
for (T row : tableRows) { for (T row : tableRows) {
ObjectTag<T> value = (ObjectTag<T>) objectTagMap.get(table); ObjectTag<T> template = (ObjectTag<T>) objectTagMap.get(table);
ObjectTag<T> value = template.cloneObject();
value.setData(row); value.setData(row);
result.add(value); result.add(value);
} }

9
clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/stages/PrepareXMLFile.java
View file

@ -44,10 +44,11 @@ public class PrepareXMLFile implements InitializingBean {
} }
List<SftpFileInfo> files = new ArrayList<>(); List<SftpFileInfo> files = new ArrayList<>();
log.trace("Get files from SFTP paths: {}", settings.getStore().getOutPayValDir().values()); log.trace("Get files from SFTP paths: {}", settings.getStore().getOutPayValDir().values());
// for (String path : settings.getStore().getOutPayValDir().values()) { for (String path : settings.getStore().getOutPayValDir().values()) {
// files.addAll(gateway.listFiles(path)); if (!path.endsWith("/")) path += "/";
// } files.addAll(gateway.listFiles(path));
// log.info("There are {} files on the sFTP server in the search directories.", files.size()); }
log.info("There are {} files on the sFTP server in the search directories.", files.size());
Table table = resultContainer.getTableForExport(); Table table = resultContainer.getTableForExport();
LocalDateTime currentDateTime = LocalDateTime.now(); LocalDateTime currentDateTime = LocalDateTime.now();
resultContainer.setRegistrationDateTime(currentDateTime); resultContainer.setRegistrationDateTime(currentDateTime);