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

伊利项目【架构筛选】创建人筛选时加段排查正式环境不起作用的日志

Browse Source
This commit is contained in:
qinoy 2022-07-27 15:38:40 +08:00
parent eaaaf91070
commit 1cc903f2bc
2 changed files with 73 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

73
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java
View File

@ -8964,6 +8964,18 @@ public String deleteReply(String replyid, String messageid) {
JSONObject methodIcons = new JSONObject(); JSONObject methodIcons = new JSONObject();
// 获取最近编辑的文件 // 获取最近编辑的文件
List<PALRepositoryModel> recentList = CoeProcessLevelUtil.getRecentUpdateRepositoryList(wsId, teamId, _uc.getUID(), null, null, 30); List<PALRepositoryModel> recentList = CoeProcessLevelUtil.getRecentUpdateRepositoryList(wsId, teamId, _uc.getUID(), null, null, 30);
JSONArray tempArr = new JSONArray();
recentList.stream().forEach(model -> {
JSONObject temp = new JSONObject();
temp.put("id",model.getId());
temp.put("name",model.getName());
temp.put("category",model.getMethodCategory());
temp.put("methodId",model.getMethodId());
temp.put("createUser",model.getCreateUser());
temp.put("modifyUser",model.getModifyUser());
tempArr.add(temp);
});
SDK.getLogAPI().consoleInfo("当前接口【最近编辑与收藏】过滤前数据是 " + tempArr);
// 伊利需求【架构筛选】不过滤组织图与IT系统图 // 伊利需求【架构筛选】不过滤组织图与IT系统图
// 先过滤掉空的架构与空的文件夹 // 先过滤掉空的架构与空的文件夹
if (createUserList.size() > 0 || orgIdList.size() > 0 || methodIdList.size() > 0) { if (createUserList.size() > 0 || orgIdList.size() > 0 || methodIdList.size() > 0) {
@ -8997,6 +9009,18 @@ public String deleteReply(String replyid, String messageid) {
} }
// 如果勾选了创建人则用创建人与模型的创建人与修改人匹配 // 如果勾选了创建人则用创建人与模型的创建人与修改人匹配
if (createUserList.size() > 0) { if (createUserList.size() > 0) {
JSONArray filterBeforeArr = new JSONArray();
JSONArray filterAfterArr = new JSONArray();
recentList.stream().forEach(model -> {
JSONObject temp = new JSONObject();
temp.put("id",model.getId());
temp.put("name",model.getName());
temp.put("category",model.getMethodCategory());
temp.put("methodId",model.getMethodId());
temp.put("createUser",model.getCreateUser());
temp.put("modifyUser",model.getModifyUser());
filterBeforeArr.add(temp);
});
recentList = recentList.stream().filter(model -> { recentList = recentList.stream().filter(model -> {
boolean flag = false; boolean flag = false;
if ("org".equals(model.getMethodCategory()) || "itsystem.normal".equals(model.getMethodId())) { if ("org".equals(model.getMethodCategory()) || "itsystem.normal".equals(model.getMethodId())) {
@ -9007,6 +9031,18 @@ public String deleteReply(String replyid, String messageid) {
} }
return flag; return flag;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
recentList.stream().forEach(model -> {
JSONObject temp = new JSONObject();
temp.put("id",model.getId());
temp.put("name",model.getName());
temp.put("category",model.getMethodCategory());
temp.put("methodId",model.getMethodId());
temp.put("createUser",model.getCreateUser());
temp.put("modifyUser",model.getModifyUser());
filterAfterArr.add(temp);
});
SDK.getLogAPI().consoleInfo("当前接口【最近编辑与收藏】过滤前【创建人集合】是 "+createUserList+" 过滤前数据是 " + filterBeforeArr);
SDK.getLogAPI().consoleInfo("当前接口【最近编辑与收藏】过滤后【创建人集合】是 "+createUserList+" 过滤后数据是 " + filterAfterArr);
} }
// 如果勾选了组织机构则根据文件属性中的发布部门去匹配 // 如果勾选了组织机构则根据文件属性中的发布部门去匹配
if (orgIdList.size() > 0) { if (orgIdList.size() > 0) {
@ -9540,6 +9576,18 @@ public String deleteReply(String replyid, String messageid) {
JSONArray createUserList = UtilString.isNotEmpty(createUsers) ? JSONArray.parseArray(createUsers) : new JSONArray(); JSONArray createUserList = UtilString.isNotEmpty(createUsers) ? JSONArray.parseArray(createUsers) : new JSONArray();
JSONArray orgIdList = UtilString.isNotEmpty(orgIds) ? JSONArray.parseArray(orgIds) : new JSONArray(); JSONArray orgIdList = UtilString.isNotEmpty(orgIds) ? JSONArray.parseArray(orgIds) : new JSONArray();
JSONArray methodIdList = UtilString.isNotEmpty(methodIds) ? JSONArray.parseArray(methodIds) : new JSONArray(); JSONArray methodIdList = UtilString.isNotEmpty(methodIds) ? JSONArray.parseArray(methodIds) : new JSONArray();
JSONArray tempArr = new JSONArray();
tableData.stream().forEach(item -> {
JSONObject temp = new JSONObject();
temp.put("id",((JSONObject)item).getString("id"));
temp.put("name",((JSONObject)item).getString("name"));
temp.put("category",((JSONObject)item).getString("category"));
temp.put("methodId",((JSONObject)item).getString("methodId"));
temp.put("createUser",((JSONObject)item).getString("createUser"));
temp.put("modifyUser",((JSONObject)item).getString("modifyUser"));
tempArr.add(temp);
});
SDK.getLogAPI().consoleInfo("当前接口【左侧树点击右侧显示子文件】过滤前【初始数据】是 " + tempArr);
// 先过滤掉空的架构与空的文件夹 // 先过滤掉空的架构与空的文件夹
if (createUserList.size() > 0 || orgIdList.size() > 0 || methodIdList.size() > 0) { if (createUserList.size() > 0 || orgIdList.size() > 0 || methodIdList.size() > 0) {
tableData = tableData.stream().filter(item -> { tableData = tableData.stream().filter(item -> {
@ -9572,6 +9620,19 @@ public String deleteReply(String replyid, String messageid) {
} }
// 根据创建人过滤 // 根据创建人过滤
if (createUserList.size() > 0) { if (createUserList.size() > 0) {
JSONArray filterBeforeArr = new JSONArray();
JSONArray filterAfterArr = new JSONArray();
tableData.stream().forEach(item -> {
JSONObject temp = new JSONObject();
temp.put("id",((JSONObject)item).getString("id"));
temp.put("name",((JSONObject)item).getString("name"));
temp.put("category",((JSONObject)item).getString("category"));
temp.put("methodId",((JSONObject)item).getString("methodId"));
temp.put("createUser",((JSONObject)item).getString("createUser"));
temp.put("modifyUser",((JSONObject)item).getString("modifyUser"));
filterBeforeArr.add(temp);
});
tableData = tableData.stream() tableData = tableData.stream()
.filter(item -> { .filter(item -> {
if ("org".equals(((JSONObject)item).getString("category")) || "itsystem.normal".equals(((JSONObject)item).getString("methodId"))) { if ("org".equals(((JSONObject)item).getString("category")) || "itsystem.normal".equals(((JSONObject)item).getString("methodId"))) {
@ -9584,6 +9645,18 @@ public String deleteReply(String replyid, String messageid) {
return flag; return flag;
}) })
.collect(Collectors.toCollection(JSONArray::new)); .collect(Collectors.toCollection(JSONArray::new));
tableData.stream().forEach(item -> {
JSONObject temp = new JSONObject();
temp.put("id",((JSONObject)item).getString("id"));
temp.put("name",((JSONObject)item).getString("name"));
temp.put("category",((JSONObject)item).getString("category"));
temp.put("methodId",((JSONObject)item).getString("methodId"));
temp.put("createUser",((JSONObject)item).getString("createUser"));
temp.put("modifyUser",((JSONObject)item).getString("modifyUser"));
filterAfterArr.add(temp);
});
SDK.getLogAPI().consoleInfo("当前接口【左侧树点击右侧显示子文件】过滤前【创建人集合】是 "+createUserList+" 过滤前数据是 " + filterBeforeArr);
SDK.getLogAPI().consoleInfo("当前接口【左侧树点击右侧显示子文件】过滤后【创建人集合】是 "+createUserList+" 过滤后数据是 " + filterAfterArr);
} }
// 根据组织架构过滤 // 根据组织架构过滤
if (orgIdList.size() > 0) { if (orgIdList.size() > 0) {