|
|
@@ -203,6 +203,7 @@ public class FormulaController {
|
|
|
@ApiOperation(value = "自动填充数据", notes = "根据设计值、偏差范围、频率自动填充数据")
|
|
|
public R<Map<String,Object>> rangeList(RangeInfo info) throws FileNotFoundException {
|
|
|
if(info.verify()){
|
|
|
+ String bak=info.getKey().replaceAll("key_\\d+__","");
|
|
|
info.setKey(info.getKey().replaceAll("__[\\d_]+",""));
|
|
|
if(Func.isNotEmpty(info.getPkId())&&Func.isBlank(info.getDev())){
|
|
|
try{
|
|
|
@@ -231,7 +232,8 @@ public class FormulaController {
|
|
|
}
|
|
|
Map<String,String> keymap = this.tabService.getTablbCols(info.getPkId().toString(),null);
|
|
|
if(!keymap.containsKey(info.getKey())){
|
|
|
- return R.fail("获取元素定位失败");
|
|
|
+ System.out.println("获取元素定位失败");
|
|
|
+ keymap.put(info.getKey(),bak);
|
|
|
}
|
|
|
List<Object> data = CustomFunction.b445random(info.getSize(),info.getDesign(),info.getDev(),info.getFail(),1);
|
|
|
String[] dw = keymap.get(info.getKey()).split(StringPool.SEMICOLON);
|
yangyj