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

连线校验除了表单图,制度图,泳道图不需要进行连线校验其他的可以进行连线校验

Browse Source
This commit is contained in:
Mr-wang 2023-08-01 09:48:31 +08:00
parent 98c133fd11
commit 70e8c22204
1 changed files with 79 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9445,6 +9445,9 @@ public class CoeProcessLevelWeb extends ActionWeb {
sb.append(sb1.substring(0, sb1.length() - 1));
sb.append("未填写，请检查！").append("</br>");
}
if(!model.getMethodId().equals("control.policy")&&!model.getMethodId().equals("data.form")&&!model.getMethodId().equals("process.flowchart")) {
List<String> list_linker = new LinkedList<>();
List<JSONObject> resultLists = new ArrayList<>();
List<JSONObject> elements_fei = ShapeUtil.getShapeJsonToJsonObject2(obj);
@ -9455,7 +9458,7 @@ public class CoeProcessLevelWeb extends ActionWeb {
String title = o.getString("text");
if (!shapeName.equals("linker")) {
list_linker.add(shapeId);
jsonObjects.put(shapeId,title);
jsonObjects.put(shapeId, title);
}
}
@ -9467,53 +9470,53 @@ public class CoeProcessLevelWeb extends ActionWeb {
if (shapeName.equals("linker")) {
JSONObject from = o.getJSONObject("from");
JSONObject to = o.getJSONObject("to");
if(from==null||to==null){
if (from == null || to == null) {
sb.append("<span>连线校验<span><br/>");
sb6.append("出入线未与其他形状进行关联,请查看模型");
sb6.append("校验未通过,请检查模型是否都已连线!");
sb.append(sb6);
ro.put("result","error");
ro.put("sb",sb);
ro.put("result", "error");
ro.put("sb", sb);
return ro.toString();
}
SDK.getLogAPI().consoleInfo("form>>>>>>>>>>>"+from);
SDK.getLogAPI().consoleInfo("to>>>>>>>>>>>"+to);
SDK.getLogAPI().consoleInfo("form>>>>>>>>>>>" + from);
SDK.getLogAPI().consoleInfo("to>>>>>>>>>>>" + to);
String from_id = from.getString("id");
String to_id = to.getString("id");
if(UtilString.isEmpty(from_id)&&UtilString.isEmpty(to_id)){
if (UtilString.isEmpty(from_id) && UtilString.isEmpty(to_id)) {
sb.append("<span>连线校验<span><br/>");
sb6.append("出入线未与其他形状进行关联,请查看模型");
sb6.append("校验未通过,请检查模型是否都已连线!");
sb.append(sb6);
ro.put("result","error");
ro.put("sb",sb);
ro.put("result", "error");
ro.put("sb", sb);
return ro.toString();
}
if (UtilString.isNotEmpty(from_id)) {
list_linker.remove(from_id);
}else {
} else {
JSONObject definition = JSONObject.parseObject(obj);
JSONObject elements = definition.getJSONObject("elements");
JSONObject string = elements.getJSONObject(to_id);
String title = string.getString("title");
sb6.append("\""+title+"\"").append("连线没有入线");
list_linker.add("\""+title+"\""+"连线没有入线");
sb6.append("\"" + title + "\"").append("连线没有入线");
list_linker.add("\"" + title + "\"" + "连线没有入线");
}
if (UtilString.isNotEmpty(to_id)) {
list_linker.remove(to_id);
}else {
} else {
JSONObject definition = JSONObject.parseObject(obj);
JSONObject elements = definition.getJSONObject("elements");
JSONObject string = elements.getJSONObject(from_id);
String title = string.getString("title");
sb6.append("\""+title+"\"").append("连线没有出线");
list_linker.add("\""+title+"\""+"连线没有出线");
sb6.append("\"" + title + "\"").append("连线没有出线");
list_linker.add("\"" + title + "\"" + "连线没有出线");
}
}
//System.out.println("m的值>>>>>>>>>>>" + ms);
}
System.out.println("剩余的list是什么>>>>>>>>>>"+list_linker.toString());
System.out.println("剩余的list是什么>>>>>>>>>>" + list_linker.toString());
//System.out.println("linker>>>>>>>>>>>>" + list_linker.size());
//连线校验增加体术语句
if (list_linker.size() > 0) {
@ -9527,8 +9530,8 @@ public class CoeProcessLevelWeb extends ActionWeb {
sb.append(sb6);
}
System.out.println("sb>>>>>>>>>>>"+sb);
System.out.println("sb>>>>>>>>>>>" + sb);
}
/***************************************************数据属性校验*************************************************/
Map<String, PALMethodAttributeModel> methodAttributeModelMap = new HashMap<>();