Merge branch 'master' of https://e.coding.net/yilidev/yilipalkaifa/apps
This commit is contained in:
commit
930e1f83b0
Binary file not shown.
@ -108,6 +108,19 @@ public class ArisXmlImportRun {
|
||||
obj.put("plId", itModel.getId());
|
||||
obj.put("shapeName", shape.getString("text"));
|
||||
itShapeMap.put(shape.getString("text"), obj);
|
||||
// 获取属性中其他IT系统
|
||||
JSONObject attributes = shape.getJSONObject("dataAttributes");
|
||||
JSONArray attributesJsonArray = attributes.getJSONArray("attributesJsonArray");
|
||||
for (int i = 0; i < attributesJsonArray.size(); i++) {
|
||||
JSONObject attrObj = attributesJsonArray.getJSONObject(i);
|
||||
if (Constant.METHOD_OTHER_NAME.equals(attrObj.getString("id"))) {
|
||||
String itVal = attrObj.getString("value");
|
||||
String[] itValList = StringUtils.split(itVal, ",");
|
||||
for (String val : itValList) {
|
||||
itShapeMap.put(val, JSONObject.parseObject(obj.toString()));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
String rolefolderId = checkAndCreatePalRoleFolderModel(coeProcessLevel, wsId);// 创建/获取角色文件夹ID,作为角色的顶级文件夹
|
||||
@ -1179,7 +1192,7 @@ public class ArisXmlImportRun {
|
||||
count++;
|
||||
if (count % (shapeRowCount+1) == 0) {
|
||||
count = 1;
|
||||
initY += 130;
|
||||
initY += 90;
|
||||
// 换行
|
||||
initX = 0;
|
||||
initX = pageEdge + initX;
|
||||
@ -1192,7 +1205,7 @@ public class ArisXmlImportRun {
|
||||
}
|
||||
shape.put("dataAttributes", dataAttributes);
|
||||
}
|
||||
int totalWidth = 240;// 每个节点总宽度,空白+节点+空白
|
||||
int totalWidth = 160;// 每个节点总宽度,空白+节点+空白
|
||||
int totalHeight = 200;// 每个节点总高度,空白+节点+空白
|
||||
int x = 0;
|
||||
int y = 0;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user