|
|
@@ -41,6 +41,7 @@ import javax.validation.constraints.NotNull;
|
|
|
import java.io.File;
|
|
|
import java.io.FileInputStream;
|
|
|
import java.io.FileNotFoundException;
|
|
|
+import java.math.BigDecimal;
|
|
|
import java.util.*;
|
|
|
import java.util.concurrent.atomic.AtomicBoolean;
|
|
|
import java.util.concurrent.atomic.AtomicInteger;
|
|
|
@@ -74,7 +75,6 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
|
|
|
private final ITextdictInfoService textDictInfoService;
|
|
|
private final IFormulaDataBlockService formulaDataBlockService;
|
|
|
|
|
|
- /** private final Container env;*/
|
|
|
private TableElementConverter tec;
|
|
|
// private Map<String,Object> constantMap;
|
|
|
// private List<FormData> formDataList;
|
|
|
@@ -183,7 +183,6 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
|
|
|
/*公式参数*/
|
|
|
FormulaOption formulaOption = this.formulaOptionService.getOne(Wrappers.<FormulaOption>lambdaQuery().eq(FormulaOption::getParentId,one.getRelateId()).eq(FormulaOption::getContractId,contractId));
|
|
|
if(formulaOption!=null){
|
|
|
- /*数据格式 {tablename:{keyxxx:{option:[1|0]}}}*/
|
|
|
tec.constantMap.put(FMOT,JSON.parseObject(formulaOption.getVal(),LinkedHashMap.class));
|
|
|
}
|
|
|
/*评定表*/
|
|
|
@@ -206,6 +205,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
|
|
|
}
|
|
|
|
|
|
public Long findFirstParentId(){
|
|
|
+ /*分项实测项目锚定点*/
|
|
|
int max=10;
|
|
|
int loop=0;
|
|
|
Long parentId= tec.getCurrentNode().getParentId();
|
|
|
@@ -222,77 +222,73 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
|
|
|
}
|
|
|
return parentId;
|
|
|
}
|
|
|
-
|
|
|
+ /*评定表处理*/
|
|
|
public void assessmentForm(){
|
|
|
- if(tec.getTableAll().stream().anyMatch(e->StringUtils.isEquals(e.getTableType(),5))){
|
|
|
- /*评定节点*/
|
|
|
- FormulaDataBlock fdb = findFdb();
|
|
|
- if(!StringUtils.isEquals("[]",fdb.getVal())){
|
|
|
- List<ElementBlock> elementBlockList =JSON.parseArray(fdb.getVal(),ElementBlock.class);
|
|
|
- Map<String, Measurement> itemsMap = new HashMap<>();
|
|
|
- this.formDataMap.values().forEach(e->{
|
|
|
- String eName=e.getEName();
|
|
|
- if(eName.contains("实测")&&!eName.contains("平均")&&!eName.contains("率")&&!eName.contains("判")){
|
|
|
- String point =FormulaUtils.parseItemName(eName);
|
|
|
- /*评定匹配检验单的元素用相似匹配*/
|
|
|
- Measurement measurement = itemsMap.computeIfAbsent(point,k->new Measurement(point));
|
|
|
- measurement.setValue(e);
|
|
|
- }
|
|
|
- });
|
|
|
- if(itemsMap.size()>0){
|
|
|
- /*表内用同行匹配*/
|
|
|
- tec.getFormDataMap().values().stream()
|
|
|
- .filter(v -> v.getEName().contains("率") || v.getEName().contains("判"))
|
|
|
- .forEach(v -> {
|
|
|
- itemsMap.values().stream()
|
|
|
- .filter(i -> i.getPass() == null || i.getJudge() == null)
|
|
|
- .filter(i -> {
|
|
|
- FormData vf = i.getValue();
|
|
|
- return vf != null && vf.getTableName().equals(v.getTableName()) && !vf.getCode().equals(v.getCode())&&FormulaUtils.similarity(v.getEName(),vf.getEName())>0.75;
|
|
|
- }).max(Comparator.comparingDouble((Measurement i)->FormulaUtils.similarity(v.getEName(),i.getValue().getEName())))
|
|
|
- .ifPresent(i->{
|
|
|
- if (v.getEName().contains("率") && i.getPass() == null) {
|
|
|
- i.setPass(v);
|
|
|
- } else if (v.getEName().contains("判") && i.getJudge() == null) {
|
|
|
- i.setJudge(v);
|
|
|
- }
|
|
|
- });
|
|
|
- });
|
|
|
-
|
|
|
- AtomicBoolean update= new AtomicBoolean(false);
|
|
|
- itemsMap.values().stream().filter(Measurement::isMatching).forEach(t->{
|
|
|
- ElementBlock g=null;
|
|
|
- FormData vfd=t.getValue();
|
|
|
- if(vfd.executable()&&vfd.getFormula().getRelyList()!=null){
|
|
|
- List<String> relyList = vfd.getFormula().getRelyList();
|
|
|
- Optional<ElementBlock> op= elementBlockList.stream().filter(e->relyList.contains(e.getCode())).findAny();
|
|
|
- if(op.isPresent()){
|
|
|
- g=op.get();
|
|
|
- }
|
|
|
+ try {
|
|
|
+ if (tec.getTableAll().stream().anyMatch(e -> StringUtils.isEquals(e.getTableType(), 5))) {
|
|
|
+ /*评定节点*/
|
|
|
+ FormulaDataBlock fdb = findFdb();
|
|
|
+ if (!StringUtils.isEquals("[]", fdb.getVal())) {
|
|
|
+ List<ElementBlock> elementBlockList = JSON.parseArray(fdb.getVal(), ElementBlock.class);
|
|
|
+ Map<String, Measurement> itemsMap = new HashMap<>();
|
|
|
+ this.formDataMap.values().forEach(e -> {
|
|
|
+ String eName = e.getEName();
|
|
|
+ if (eName.contains("实测") && !eName.contains("平均") && !eName.contains("率") && !eName.contains("判")) {
|
|
|
+ String point = FormulaUtils.parseItemName(eName);
|
|
|
+ /*评定匹配检验单的元素用相似匹配*/
|
|
|
+ Measurement measurement = itemsMap.computeIfAbsent(point, k -> new Measurement(point));
|
|
|
+ measurement.setValue(e);
|
|
|
}
|
|
|
- if(g==null){
|
|
|
- Optional<ElementBlock> op= elementBlockList.stream().filter(w->FormulaUtils.similarity(w.getEName(),t.getPoint())>0.6).reduce((a, b) -> Comparator.<Double>reverseOrder().compare(FormulaUtils.similarity(a.getEName(),t.getPoint()), FormulaUtils.similarity(b.getEName(),t.getPoint())) <= 0 ? a : b);
|
|
|
- if(op.isPresent()){
|
|
|
- g=op.get();
|
|
|
+ });
|
|
|
+ if (itemsMap.size() > 0) {
|
|
|
+ /*表内用同行匹配*/
|
|
|
+ List<FormData> primary = tec.getFormDataMap().values().stream().filter(v -> v.getEName().contains("率") || v.getEName().contains("判")).collect(Collectors.toList());
|
|
|
+ itemsMap.values().forEach(i -> {
|
|
|
+ FormData vf = i.getValue();
|
|
|
+ primary.stream().filter(p -> vf.getMaxRow().equals(p.getMaxRow()) && vf.getTableName().equals(p.getTableName())).forEach(t -> {
|
|
|
+ if (t.getEName().contains("率")) {
|
|
|
+ i.setPass(t);
|
|
|
+ } else if (t.getEName().contains("判")) {
|
|
|
+ i.setJudge(t);
|
|
|
+ }
|
|
|
+ });
|
|
|
+ });
|
|
|
+ AtomicBoolean update = new AtomicBoolean(false);
|
|
|
+ itemsMap.values().stream().filter(Measurement::isMatching).forEach(t -> {
|
|
|
+ ElementBlock g = null;
|
|
|
+ FormData vfd = t.getValue();
|
|
|
+ if (vfd.executable() && vfd.getFormula().getRelyList() != null) {
|
|
|
+ List<String> relyList = vfd.getFormula().getRelyList();
|
|
|
+ /*先从公式去匹配*/
|
|
|
+ Optional<ElementBlock> op = elementBlockList.stream().filter(e -> relyList.contains(e.getCode())).findAny();
|
|
|
+ if (op.isPresent()) {
|
|
|
+ g = op.get();
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
- if(g!=null){
|
|
|
- List<ItemBlock> itemBlockList =g.getList();
|
|
|
- int originSize=itemBlockList.size();
|
|
|
- List<Long> ids = this.jdbcTemplate.queryForList("select b.p_key_id from m_wbs_tree_contract a join m_wbs_tree_contract b on (a.parent_id=b.parent_id and a.contract_id=b.contract_id) where a.p_key_id="+tec.getCurrentNode().getPkId()+" and b.is_deleted=0 and b.node_type=6",Long.class);
|
|
|
- itemBlockList.removeIf(ik->!ids.contains(ik.getPkeyId()));
|
|
|
- if(itemBlockList.size()>0){
|
|
|
- int total=itemBlockList.stream().mapToInt(ItemBlock::getSubTotal).sum();
|
|
|
- int passNum=itemBlockList.stream().mapToInt(ItemBlock::getSubPass).sum();
|
|
|
- double passRate=100*(double)passNum/(double) total;
|
|
|
- FormulaUtils.write(t.getPass(),StringUtils.number2String(passRate,1),null);
|
|
|
- if(passRate>=60){
|
|
|
- FormulaUtils.write(t.getJudge(),"合格",null);
|
|
|
+ if (g == null) {
|
|
|
+ Optional<ElementBlock> op = elementBlockList.stream().filter(w -> FormulaUtils.similarity(w.getEName(), t.getPoint()) > 0.6).max(Comparator.comparingDouble((ElementBlock b) -> FormulaUtils.similarity(b.getEName(), t.getPoint())));
|
|
|
+ /*相似匹配*/
|
|
|
+ if (op.isPresent()) {
|
|
|
+ g = op.get();
|
|
|
}
|
|
|
- itemBlockList.sort(Comparator.comparingInt(a->ids.indexOf(a.getPkeyId())));
|
|
|
- List<String> values=itemBlockList.stream().map(ItemBlock::getData).flatMap(v->v.stream().flatMap(Collection::stream)).map(Object::toString).collect(Collectors.toList());
|
|
|
- int scale = StringUtils.getScale(values);
|
|
|
- FormulaUtils.write(t.getValue(),values.stream().map(u->StringUtils.number2String(u,scale)).collect(Collectors.toList()), true);
|
|
|
+ }
|
|
|
+ if (g != null) {
|
|
|
+ List<ItemBlock> itemBlockList = g.getList();
|
|
|
+ int originSize = itemBlockList.size();
|
|
|
+ List<Long> ids = this.jdbcTemplate.queryForList("select b.p_key_id from m_wbs_tree_contract a join m_wbs_tree_contract b on (a.parent_id=b.parent_id and a.contract_id=b.contract_id) where a.p_key_id=" + tec.getCurrentNode().getPkId() + " and b.is_deleted=0 and b.node_type=6", Long.class);
|
|
|
+ itemBlockList.removeIf(ik -> !ids.contains(ik.getPkeyId()));
|
|
|
+ if (itemBlockList.size() > 0) {
|
|
|
+ int total = itemBlockList.stream().mapToInt(ItemBlock::getSubTotal).sum();
|
|
|
+ int passNum = itemBlockList.stream().mapToInt(ItemBlock::getSubPass).sum();
|
|
|
+ double passRate = 100 * (double) passNum / (double) total;
|
|
|
+ FormulaUtils.write(t.getPass(), StringUtils.number2String(passRate, 1), false);
|
|
|
+ if (passRate >= 60) {
|
|
|
+ FormulaUtils.write(t.getJudge(), "合格", false);
|
|
|
+ }
|
|
|
+ itemBlockList.sort(Comparator.comparingInt(a -> ids.indexOf(a.getPkeyId())));
|
|
|
+ List<String> values = itemBlockList.stream().map(ItemBlock::getData).flatMap(v -> v.stream().flatMap(Collection::stream)).map(Object::toString).collect(Collectors.toList());
|
|
|
+ int scale = StringUtils.getScale(values);
|
|
|
+ FormulaUtils.write(t.getValue(), values.stream().map(u -> StringUtils.number2String(u, scale)).collect(Collectors.toList()), true);
|
|
|
|
|
|
// if(t.getValue().getEName().contains("±")){
|
|
|
// /*存在偏差范围则获取的是偏差值：实测-设计*/
|
|
|
@@ -310,19 +306,22 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
|
|
|
// }else{
|
|
|
// FormulaUtils.write(t.getValue(),itemBlockList.stream().map(ItemBlock::getData).flatMap(v->v.stream().flatMap(Collection::stream)).collect(Collectors.toList()),true);
|
|
|
// }
|
|
|
+ }
|
|
|
+ t.flush();
|
|
|
+ if (originSize > 0 && originSize != itemBlockList.size()) {
|
|
|
+ g.setList(itemBlockList);
|
|
|
+ update.set(true);
|
|
|
+ }
|
|
|
}
|
|
|
- t.flush();
|
|
|
- if(originSize>0&&originSize!=itemBlockList.size()){
|
|
|
- g.setList(itemBlockList);
|
|
|
- update.set(true);
|
|
|
- }
|
|
|
+ });
|
|
|
+ if (update.get()) {
|
|
|
+ this.formulaDataBlockService.saveOrUpdate(fdb);
|
|
|
}
|
|
|
- });
|
|
|
- if(update.get()){
|
|
|
- this.formulaDataBlockService.saveOrUpdate(fdb);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ }catch (Exception e){
|
|
|
+ e.printStackTrace();
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -566,24 +565,28 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
|
|
|
|
|
|
@Override
|
|
|
public IFormulaService sort() {
|
|
|
- Map<Boolean,List<FormData>> map = tec.formDataList.stream().collect(Collectors.partitioningBy(e->Func.isNotEmpty(e.getFormula())&&e.getFormula().getFormula().contains("E[")));
|
|
|
- tec.formDataList.clear();
|
|
|
- /*没有依赖的*/
|
|
|
- List<FormData> simple=map.get(false);
|
|
|
- if(CollectionUtil.isNotEmpty(simple)){
|
|
|
- tec.formDataList.addAll(simple);
|
|
|
- }
|
|
|
- /*有依赖的*/
|
|
|
- List<FormData> rely= map.get(true);
|
|
|
- if(CollectionUtil.isNotEmpty(rely)){
|
|
|
- sort(rely,((rely.size()+1)/2)*rely.size());
|
|
|
- tec.formDataList.addAll(rely);
|
|
|
+ try {
|
|
|
+ Map<Boolean, List<FormData>> map = tec.formDataList.stream().collect(Collectors.partitioningBy(e -> Func.isNotEmpty(e.getFormula()) && e.getFormula().getFormula().contains("E[")));
|
|
|
+ tec.formDataList.clear();
|
|
|
+ /*没有依赖的*/
|
|
|
+ List<FormData> simple = map.get(false);
|
|
|
+ if (CollectionUtil.isNotEmpty(simple)) {
|
|
|
+ tec.formDataList.addAll(simple);
|
|
|
+ }
|
|
|
+ /*有依赖的*/
|
|
|
+ List<FormData> rely = map.get(true);
|
|
|
+ if (CollectionUtil.isNotEmpty(rely)) {
|
|
|
+ sort(rely, ((rely.size() + 1) / 2) * rely.size());
|
|
|
+ tec.formDataList.addAll(rely);
|
|
|
+ }
|
|
|
+ /*初始化排序值，每个点间隔1000，方便插入*/
|
|
|
+ AtomicInteger sort = new AtomicInteger();
|
|
|
+ tec.formDataList.forEach(e -> e.setSort(sort.getAndAdd(1000)));
|
|
|
+ /*汇总阶段执行的公式*/
|
|
|
+ summaryPre();
|
|
|
+ }catch (Exception e){
|
|
|
+ e.printStackTrace();
|
|
|
}
|
|
|
- /*初始化排序值，每个点间隔1000，方便插入*/
|
|
|
- AtomicInteger sort= new AtomicInteger();
|
|
|
- tec.formDataList.forEach(e->e.setSort(sort.getAndAdd(1000)));
|
|
|
- /*汇总阶段执行的公式*/
|
|
|
- summaryPre();
|
|
|
return this;
|
|
|
}
|
|
|
|
|
|
@@ -729,14 +732,22 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
|
|
|
}
|
|
|
if(fd.getCoordsList().size()>1&&f.split("[/+\\-*]").length>1){
|
|
|
LinkedHashMap<String,FormData> fdMap =new LinkedHashMap<>();
|
|
|
- Optional<FormData> tto= ele.stream().max(Comparator.comparingInt(fe->fe.getValues().size()));
|
|
|
- Optional<FormData> tts= ele.stream().min(Comparator.comparingInt(fe->fe.getValues().size()));
|
|
|
- if(tto.isPresent()&&tts.isPresent()){
|
|
|
- if(tto.get().getValues().size()!=tts.get().getValues().size()){
|
|
|
- int baseLength=tto.get().getValues().size();
|
|
|
- ele.forEach(e->{
|
|
|
- e.setStep(baseLength/e.getValues().size());
|
|
|
- });
|
|
|
+// Optional<FormData> tto= ele.stream().max(Comparator.comparingInt(fe->fe.getValues().size()));
|
|
|
+// Optional<FormData> tts= ele.stream().min(Comparator.comparingInt(fe->fe.getValues().size()));
|
|
|
+// if(tto.isPresent()&&tts.isPresent()){
|
|
|
+// if(tto.get().getValues().size()!=tts.get().getValues().size()){
|
|
|
+// int baseLength=tto.get().getValues().size();
|
|
|
+// ele.forEach(e->{
|
|
|
+// e.setStep(baseLength/e.getValues().size());
|
|
|
+// });
|
|
|
+// }
|
|
|
+// }
|
|
|
+ FormData maxFormData = Collections.max(ele, Comparator.comparingInt((FormData ef)->ef.getValues().size()));
|
|
|
+ FormData minFormData = Collections.min(ele, Comparator.comparingInt((FormData ef)->ef.getValues().size()));
|
|
|
+ if (maxFormData.getValues().size() != minFormData.getValues().size()) {
|
|
|
+ int baseLength = maxFormData.getValues().size();
|
|
|
+ for (FormData formData : ele) {
|
|
|
+ formData.setStep(baseLength / formData.getValues().size());
|
|
|
}
|
|
|
}
|
|
|
ele.forEach(e->{
|
|
|
@@ -747,12 +758,17 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
|
|
|
while (cda.hasNext()){
|
|
|
LinkedHashMap<String,ElementData> tip= cda.next();
|
|
|
Map<String, Object> variable = new HashMap<>(tec.constantMap);
|
|
|
+ @SuppressWarnings("unchecked")
|
|
|
Map<String,Object> em= (Map<String, Object>) variable.computeIfAbsent(E, k->new HashMap<>());
|
|
|
int index= new ArrayList<>(tip.values()).get(0).getIndex();
|
|
|
for(Map.Entry<String,ElementData> se:tip.entrySet()){
|
|
|
Object value=se.getValue().getValue();
|
|
|
if(CustomFunction.isNumber(value)){
|
|
|
- em.put(se.getKey(),StringUtils.obj2Double(value));
|
|
|
+ if(StringUtils.isDouble(value)){
|
|
|
+ em.put(se.getKey(), new BigDecimal(value.toString()));
|
|
|
+ }else{
|
|
|
+ em.put(se.getKey(),StringUtils.handleObj2Integer(value));
|
|
|
+ }
|
|
|
}else{
|
|
|
em.put(se.getKey(),value);
|
|
|
}
|
|
|
@@ -762,13 +778,10 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
|
|
|
}
|
|
|
if(local.size()>0){
|
|
|
List<Object> values = slice(local,tec.constantMap,f);
|
|
|
- if(fd.getTableName().equals(checkTable)){
|
|
|
- FormulaUtils.write(fd,values,false);
|
|
|
- }else{
|
|
|
- FormulaUtils.write(fd,values,true);
|
|
|
- }
|
|
|
+ FormulaUtils.write(fd,values, !fd.getTableName().equals(checkTable));
|
|
|
}
|
|
|
}else{
|
|
|
+ @SuppressWarnings("unchecked")
|
|
|
Map<String,Object> em = (Map<String, Object>) currentMap.computeIfAbsent(E,(k)-> new HashMap<>());
|
|
|
ele.forEach(e->{
|
|
|
em.put(e.getCode(),e.getValues().stream().map(ElementData::getValue).collect(Collectors.toList()));
|
|
|
@@ -776,6 +789,8 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
|
|
|
Object data =Expression.parse(formula.getFormula()).calculate(currentMap);
|
|
|
write(fd,data);
|
|
|
}
|
|
|
+ /*重置*/
|
|
|
+ ele.stream().filter(s->s.getOffset()>0).forEach(FormData::restore);
|
|
|
}else{
|
|
|
Object data =Expression.parse(formula.getFormula()).calculate(currentMap);
|
|
|
write(fd,data);
|
|
|
@@ -789,6 +804,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
|
|
|
fd.setUpdate(1);
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
}
|
|
|
/**附表处理*/
|
|
|
public void forSubTb(){
|
|
|
@@ -839,6 +855,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
|
|
|
for (WbsTreeContract data : subTabList) {
|
|
|
/*自动挂载附表情况下，装配TableInfo数据*/
|
|
|
R bussDataInfo = this.getBussDataInfo(data.getPKeyId(), 1);
|
|
|
+ @SuppressWarnings("unchecked")
|
|
|
Map<String, Object> data1 = (Map<String, Object>) bussDataInfo.getData();
|
|
|
data1.put("pkeyId",data.getPKeyId());
|
|
|
dataArray.add(data1);
|
|
|
@@ -1020,7 +1037,9 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
|
|
|
}
|
|
|
if(Func.isNotEmpty(list)){
|
|
|
targetItem.setSubTotal(list.size());
|
|
|
- targetItem.setDesigns(designList.getValues().stream().map(ElementData::getValue).flatMap(e->CustomFunction.obj2ListNe(e).stream()).filter(StringUtils::isNumber).map(StringUtils::obj2Double).collect(Collectors.toList()));
|
|
|
+ if(Func.isNotEmpty(designList)) {
|
|
|
+ targetItem.setDesigns(designList.getValues().stream().map(ElementData::getValue).flatMap(e -> CustomFunction.obj2ListNe(e).stream()).filter(StringUtils::isNumber).map(StringUtils::obj2Double).collect(Collectors.toList()));
|
|
|
+ }
|
|
|
AtomicInteger index= new AtomicInteger();
|
|
|
int len=targetItem.getDesigns().size();
|
|
|
if(len>0){
|
|
|
@@ -1404,7 +1423,7 @@ public List<ElementData> setScale(Integer scale,List<ElementData> data){
|
|
|
while (m.find()){
|
|
|
String el=m.group();
|
|
|
String pstr=el.replaceAll("^"+FC_REG+"ifelse\\(","").replaceAll("\\)$","");
|
|
|
- String pa[]=pstr.split(",");
|
|
|
+ String[] pa =pstr.split(",");
|
|
|
if(pa.length==3){
|
|
|
Object data = Expression.parse(pa[0]+"?"+pa[1]+":"+pa[2]).calculate(createCurrentMap(el));
|
|
|
f=f.replace(el,putDataWithKey(data));
|
|
|
@@ -1416,12 +1435,38 @@ public List<ElementData> setScale(Integer scale,List<ElementData> data){
|
|
|
max++;
|
|
|
}while (f.contains("ifelse")&&max<20);
|
|
|
}
|
|
|
+ if(f.contains("avg4segment")){
|
|
|
+ Matcher m = RegexUtils.matcher(FC_REG+"(avg4segment)\\(([^)]+)\\)",f);
|
|
|
+ while (m.find()){
|
|
|
+ String[] args=m.group(2).split(",");
|
|
|
+ List<FormData> target = getFormDataByCode(args[0]);
|
|
|
+ if(!target.isEmpty()){
|
|
|
+ FormData a=target.get(0);
|
|
|
+ int n=Math.max(1,a.coordsList.size()/fd.getCoordsList().size());
|
|
|
+ List<Object> data=CustomFunction.avg4segment(a.getValues().stream().map(ElementData::getValue).collect(Collectors.toList()),n);
|
|
|
+ f=f.replace(m.group(),putDataWithKey(data));
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if(f.contains("skip")){
|
|
|
+ Matcher m = RegexUtils.matcher(FC_REG+"(skip)\\(([^)]+)\\)",f);
|
|
|
+ while (m.find()){
|
|
|
+ String[] args=m.group(2).split(",");
|
|
|
+ List<FormData> target = getFormDataByCode(args[0]);
|
|
|
+ if(!target.isEmpty()){
|
|
|
+ FormData a=target.get(0);
|
|
|
+ a.setOffset(StringUtils.handleObj2Integer(args[1]));
|
|
|
+ f=f.replace(m.group(),args[0]);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
if(f.contains("quantity")){
|
|
|
/*聚合*/
|
|
|
Matcher m = RegexUtils.matcher(FC_REG+"(quantity)\\(([^)]+)\\)",f);
|
|
|
while (m.find()) {
|
|
|
Object data=null;
|
|
|
List<String> codeList = getCodeList(m.group(2));
|
|
|
+ @SuppressWarnings("unchecked")
|
|
|
Map<String,List<Map<String,Object>>> textInfoMap= (Map<String, List<Map<String, Object>>>) tec.constantMap.getOrDefault(TEXT_INFO_MAP,new HashMap<>());
|
|
|
List<Map<String,Object>> tableColKeyVal= textInfoMap.get(codeList.get(0));
|
|
|
if(Func.isNotEmpty(tableColKeyVal)){
|
liuyc