SUPPORT-8846: fix LoadForm and pages; remove redundant scripts
This commit is contained in:
parent
5108caf305
commit
117891dc10
14 changed files with 365 additions and 984 deletions
|
|
@ -1,16 +0,0 @@
|
|||
package ru.micord.ervu.component.field;
|
||||
|
||||
import model.FieldData;
|
||||
|
||||
import ru.cg.webbpm.modules.webkit.beans.Behavior;
|
||||
|
||||
/**
|
||||
* @author gulnaz
|
||||
*/
|
||||
public abstract class BaseFieldLoadComponent<T> extends Behavior {
|
||||
|
||||
public BaseFieldLoadComponent() {
|
||||
}
|
||||
|
||||
public abstract FieldData loadFrom(T dto);
|
||||
}
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
package ru.micord.ervu.component.field;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.atomic.AtomicReference;
|
||||
|
||||
import ru.micord.ervu.component.formatter.FieldFormatter;
|
||||
import model.FieldData;
|
||||
|
||||
import ru.cg.webbpm.modules.standard_annotations.validation.NotNull;
|
||||
|
||||
/**
|
||||
* @author gulnaz
|
||||
*/
|
||||
public class SubpoenaFieldLoadComponent extends BaseFieldLoadComponent<Map<String, Object>> {
|
||||
|
||||
@NotNull
|
||||
public String fieldId;
|
||||
|
||||
public FieldFormatter<Object, Object>[] formatters;
|
||||
|
||||
@Override
|
||||
public FieldData loadFrom(Map<String, Object> dto) {
|
||||
AtomicReference<Object> valueRef = new AtomicReference<>(dto.get(fieldId));
|
||||
|
||||
if (formatters != null) {
|
||||
Arrays.stream(formatters).forEach(formatter -> {
|
||||
valueRef.set(formatter.format(valueRef.get()));
|
||||
});
|
||||
}
|
||||
return new FieldData(getObjectId(), valueRef.get());
|
||||
}
|
||||
}
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
package ru.micord.ervu.component.formatter;
|
||||
|
||||
/**
|
||||
* @author gulnaz
|
||||
*/
|
||||
public interface FieldFormatter<T, R> {
|
||||
|
||||
T format(R value);
|
||||
}
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
package ru.micord.ervu.component.formatter;
|
||||
|
||||
import java.time.format.DateTimeFormatter;
|
||||
|
||||
import ru.cg.webbpm.modules.standard_annotations.validation.NotNull;
|
||||
|
||||
import static ru.micord.ervu.util.DateUtil.convertToLocalDate;
|
||||
import static ru.micord.ervu.util.DateUtil.convertToString;
|
||||
|
||||
/**
|
||||
* @author gulnaz
|
||||
*/
|
||||
public class LocalDateFormatter implements FieldFormatter<String, String> {
|
||||
|
||||
@NotNull
|
||||
public String format;
|
||||
|
||||
@Override
|
||||
public String format(String value) {
|
||||
return convertToString(convertToLocalDate(value), DateTimeFormatter.ofPattern(format));
|
||||
}
|
||||
}
|
||||
|
|
@ -1,67 +0,0 @@
|
|||
package ru.micord.ervu.service.form;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import ru.micord.ervu.component.field.BaseFieldLoadComponent;
|
||||
import model.BpmnVariableForSave;
|
||||
import model.FieldData;
|
||||
import service.container.AbstractFormService;
|
||||
import utils.FormUtils;
|
||||
|
||||
import ru.cg.webbpm.modules.database.bean.entity_graph.EntityColumn;
|
||||
|
||||
/**
|
||||
* @author gulnaz
|
||||
*/
|
||||
public class LoadFormService extends AbstractFormService {
|
||||
|
||||
@Override
|
||||
protected Object saveDataById(Object o, List<FieldData> list) {
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Map<EntityColumn, Object> getValuesForSave(Object o, List<FieldData> list) {
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<FieldData> loadData(Object dto, List<String> loadableComponentIds) {
|
||||
List<FieldData> fieldData = new ArrayList<>();
|
||||
FormUtils.getFormComponents(this, BaseFieldLoadComponent.class)
|
||||
.forEach(component -> {
|
||||
FieldData data = component.loadFrom(dto);
|
||||
fieldData.add(data);
|
||||
});
|
||||
|
||||
return fieldData;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object saveData(String s, List<FieldData> list, Boolean aBoolean,
|
||||
List<BpmnVariableForSave> list1) throws Exception {
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<FieldData> loadData() {
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object deleteData(Object o) {
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object deleteData(String s, List<BpmnVariableForSave> list) {
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object parseId(String s) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
package ru.micord.ervu.service.rpc;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import model.FieldData;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import ru.micord.ervu.dto.SubpoenaResponseDto;
|
||||
import ru.micord.ervu.service.SubpoenaService;
|
||||
import service.container.FormService;
|
||||
|
||||
import ru.cg.webbpm.modules.standard_annotations.validation.NotNull;
|
||||
import ru.cg.webbpm.modules.webkit.annotations.RpcCall;
|
||||
import ru.cg.webbpm.modules.webkit.annotations.RpcService;
|
||||
import ru.cg.webbpm.modules.webkit.beans.Behavior;
|
||||
|
||||
/**
|
||||
* @author gulnaz
|
||||
*/
|
||||
@RpcService
|
||||
public class LoadFormRpcService extends Behavior {
|
||||
|
||||
@NotNull
|
||||
public FormService formService;
|
||||
|
||||
//todo: Remove this shit
|
||||
@Autowired
|
||||
public SubpoenaService subpoenaService;
|
||||
|
||||
@RpcCall
|
||||
public List<FieldData> loadData() {
|
||||
SubpoenaResponseDto subpoenaData = subpoenaService.getSubpoenaData();
|
||||
return formService.loadData(subpoenaData);
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue