浏览代码

桩号转换

yangyj 2 年之前
父节点
当前提交
b3e7eef5cc

+ 4 - 4
blade-service/blade-business/src/main/java/org/springblade/business/feignClient/MileageClientImpl.java

@@ -12,9 +12,7 @@ import org.springblade.core.tool.utils.CollectionUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -28,10 +26,12 @@ public class MileageClientImpl implements MileageClient {
     private final MileagexyService service;
 
 
+
     @Override
     public Map<String,String[]> mileage2Coordinate(List<String> mileages,Long contractId) {
          List<String>  parts=  mileages.stream().map(e->e.replaceAll("K.+","")).distinct().collect(Collectors.toList());
-         List<Mileagexy> target=this.service.list(Wrappers.<Mileagexy>lambdaQuery().eq(Mileagexy::getContractId,contractId.toString()).in(Mileagexy::getPartNo,parts).orderByAsc(Mileagexy::getValue));
+         List<Mileagexy> target;
+         target=this.service.list(Wrappers.<Mileagexy>lambdaQuery().eq(Mileagexy::getContractId,contractId.toString()).in(Mileagexy::getPartNo,parts).orderByAsc(Mileagexy::getValue));
          Map<String,String[]> result = new HashMap<>(mileages.size());
          if(CollectionUtil.isNotEmpty(target)){
             mileages.forEach(e->{

+ 2 - 2
blade-service/blade-manager/src/main/java/org/springblade/manager/formula/impl/FormulaMileage.java

@@ -28,7 +28,7 @@ import java.util.stream.Collectors;
 public class FormulaMileage implements FormulaStrategy {
     private FormData cur;
     private final MileageClient mileageClient;
-    public static final Pattern MILE_ARGS= Pattern.compile("(?<=MILE\\()[^>]+(?=\\))");
+    public static final Pattern MILE_ARGS= Pattern.compile("(?<=FC.MILE\\()[^>]+(?=\\))");
     public static final String ZH="桩号";
     public static final String PW="偏位";
     public static final String SJX="设计值X";
@@ -110,7 +110,7 @@ public class FormulaMileage implements FormulaStrategy {
                 }
             }
         }
-        this.cur.getFormula().setFormula("");
+        this.cur.setFinished(Boolean.TRUE);
     }
     public static final Pattern MILE_P = Pattern.compile("(?<=FC.MILE\\()([^,]+),([^,]+)(?=,)");