|
|
@@ -1962,13 +1962,13 @@ public class InformationWriteQueryController extends BladeController {
|
|
|
return value;
|
|
|
}
|
|
|
|
|
|
- public String imitate(String v, List<RangeJson> rjs) {
|
|
|
+ public String imitate(String v, List<RangeJson> rjs) {
|
|
|
try {
|
|
|
RangeJson best = rjs.stream().min(Comparator.comparingDouble(j -> Double.parseDouble(v) - Double.parseDouble(j.getDesign()))).orElse(rjs.get(0));
|
|
|
- // int scale = Math.max(new StringBuilder(v).reverse().indexOf("."), 0);
|
|
|
- int scale=BaseUtils.getScaleZero(v,best.getDev(),best.getDesign());
|
|
|
+ // int scale = Math.max(new StringBuilder(v).reverse().indexOf("."), 0);
|
|
|
+ int scale = BaseUtils.getScaleZero(v, best.getDev(), best.getDesign());
|
|
|
return BaseUtils.rangeList(1, best.getDesign(), best.getDev(), 1, scale, 1).get(0).toString();
|
|
|
- }catch (Exception e){
|
|
|
+ } catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
return StringPool.EMPTY;
|
|
|
}
|
|
|
@@ -2222,7 +2222,13 @@ public class InformationWriteQueryController extends BladeController {
|
|
|
//跨节点复制，更改父级id
|
|
|
obj.setParentId(toCopyNode.getId());
|
|
|
}
|
|
|
- obj.setOldId(needNode.getId() + "");
|
|
|
+
|
|
|
+ if (ObjectUtil.isNotEmpty(needNode.getOldId())) {
|
|
|
+ obj.setOldId(needNode.getOldId());
|
|
|
+ } else {
|
|
|
+ obj.setOldId(needNode.getId() + "");
|
|
|
+ }
|
|
|
+
|
|
|
obj.setPKeyId(SnowFlakeUtil.getId());
|
|
|
obj.setId(id);
|
|
|
obj.setNodeName(toCopyNode.getNodeName());
|
|
|
@@ -2327,7 +2333,13 @@ public class InformationWriteQueryController extends BladeController {
|
|
|
newParentId = needCopyNode.getId();
|
|
|
}
|
|
|
obj.setPKeyId(SnowFlakeUtil.getId());
|
|
|
- obj.setOldId(node.getId().toString());
|
|
|
+
|
|
|
+ if (ObjectUtil.isNotEmpty(node.getOldId())) {
|
|
|
+ obj.setOldId(node.getOldId());
|
|
|
+ } else {
|
|
|
+ obj.setOldId(node.getId() + "");
|
|
|
+ }
|
|
|
+
|
|
|
Long id = SnowFlakeUtil.getId();
|
|
|
//数据源节点的老id与新的id的Map，作为下一级的节点的父级id的替换
|
|
|
parentIdToId.put(node.getId(), id);
|
liuyc