yili/apps
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://e.coding.net/yilidev/yilipalkaifa/apps

Browse Source
This commit is contained in:
zhal 2022-07-05 19:58:15 +08:00
commit 930e1f83b0
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
com.actionsoft.apps.coe.pal.datamigration/lib/com.actionsoft.apps.coe.pal.datamigration.jar
View File

Binary file not shown.

23
com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/aris/web/ArisXmlImportRun.java
View File

@ -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，作为角色的顶级文件夹
@ -1177,9 +1190,9 @@ public class ArisXmlImportRun {
for (int i = 0; i < elements.size(); i++) {
JSONObject shape = elements.getJSONObject(i);
count++;
if (count % (shapeRowCount + 1) == 0) {
if (count % (shapeRowCount+1) == 0) {
count = 1;
initY += 130;
initY += 90;
// 换行
initX = 0;
initX = pageEdge + initX;
@ -1192,14 +1205,14 @@ public class ArisXmlImportRun {
}
shape.put("dataAttributes", dataAttributes);
}
int totalWidth = 240;// 每个节点总宽度，空白+节点+空白
int totalWidth = 160;// 每个节点总宽度，空白+节点+空白
int totalHeight = 200;// 每个节点总高度，空白+节点+空白
int x = 0;
int y = 0;
int w = validateJson(shape.getJSONObject("props").getInteger("w"));
int h = validateJson(shape.getJSONObject("props").getInteger("h"));
int leftBlankWidth = (totalWidth - w) / 2;
int topBlankHeight = (totalHeight - h) / 2;
int leftBlankWidth = (totalWidth - w)/2;
int topBlankHeight = (totalHeight - h)/2;
x = initX + leftBlankWidth;
initX = x + w + leftBlankWidth;
y = initY + topBlankHeight;