连线校验除了表单图,制度图,泳道图不需要进行连线校验其他的可以进行连线校验
This commit is contained in:
parent
98c133fd11
commit
70e8c22204
@ -9445,90 +9445,93 @@ public class CoeProcessLevelWeb extends ActionWeb {
|
|||||||
sb.append(sb1.substring(0, sb1.length() - 1));
|
sb.append(sb1.substring(0, sb1.length() - 1));
|
||||||
sb.append("未填写，请检查！").append("</br>");
|
sb.append("未填写，请检查！").append("</br>");
|
||||||
}
|
}
|
||||||
List<String> list_linker = new LinkedList<>();
|
if(!model.getMethodId().equals("control.policy")&&!model.getMethodId().equals("data.form")&&!model.getMethodId().equals("process.flowchart")) {
|
||||||
List<JSONObject> resultLists = new ArrayList<>();
|
|
||||||
List<JSONObject> elements_fei = ShapeUtil.getShapeJsonToJsonObject2(obj);
|
|
||||||
JSONObject jsonObjects = new JSONObject(new LinkedHashMap<>());
|
|
||||||
for (JSONObject o : elements_fei) {
|
|
||||||
String shapeId = o.getString("id");
|
|
||||||
String shapeName = o.getString("name");
|
|
||||||
String title = o.getString("text");
|
|
||||||
if (!shapeName.equals("linker")) {
|
|
||||||
list_linker.add(shapeId);
|
|
||||||
jsonObjects.put(shapeId,title);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
for (JSONObject o : elements_fei) {
|
|
||||||
String shapeId = o.getString("id");
|
|
||||||
|
|
||||||
String shapeName = o.getString("name");
|
List<String> list_linker = new LinkedList<>();
|
||||||
//System.out.println("这个名字是什么>>>>>>>" + shapeName);
|
List<JSONObject> resultLists = new ArrayList<>();
|
||||||
if (shapeName.equals("linker")) {
|
List<JSONObject> elements_fei = ShapeUtil.getShapeJsonToJsonObject2(obj);
|
||||||
JSONObject from = o.getJSONObject("from");
|
JSONObject jsonObjects = new JSONObject(new LinkedHashMap<>());
|
||||||
JSONObject to = o.getJSONObject("to");
|
for (JSONObject o : elements_fei) {
|
||||||
if(from==null||to==null){
|
String shapeId = o.getString("id");
|
||||||
sb.append("<span>连线校验<span><br/>");
|
String shapeName = o.getString("name");
|
||||||
sb6.append("出入线未与其他形状进行关联,请查看模型");
|
String title = o.getString("text");
|
||||||
sb6.append("校验未通过,请检查模型是否都已连线!");
|
if (!shapeName.equals("linker")) {
|
||||||
sb.append(sb6);
|
list_linker.add(shapeId);
|
||||||
ro.put("result","error");
|
jsonObjects.put(shapeId, title);
|
||||||
ro.put("sb",sb);
|
|
||||||
return ro.toString();
|
|
||||||
}
|
|
||||||
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)){
|
|
||||||
sb.append("<span>连线校验<span><br/>");
|
|
||||||
sb6.append("出入线未与其他形状进行关联,请查看模型");
|
|
||||||
sb6.append("校验未通过,请检查模型是否都已连线!");
|
|
||||||
sb.append(sb6);
|
|
||||||
ro.put("result","error");
|
|
||||||
ro.put("sb",sb);
|
|
||||||
return ro.toString();
|
|
||||||
}
|
|
||||||
if (UtilString.isNotEmpty(from_id)) {
|
|
||||||
list_linker.remove(from_id);
|
|
||||||
}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+"\""+"连线没有入线");
|
|
||||||
}
|
|
||||||
if (UtilString.isNotEmpty(to_id)) {
|
|
||||||
list_linker.remove(to_id);
|
|
||||||
}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+"\""+"连线没有出线");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//System.out.println("m的值>>>>>>>>>>>" + ms);
|
for (JSONObject o : elements_fei) {
|
||||||
}
|
String shapeId = o.getString("id");
|
||||||
System.out.println("剩余的list是什么>>>>>>>>>>"+list_linker.toString());
|
|
||||||
|
String shapeName = o.getString("name");
|
||||||
|
//System.out.println("这个名字是什么>>>>>>>" + shapeName);
|
||||||
|
if (shapeName.equals("linker")) {
|
||||||
|
JSONObject from = o.getJSONObject("from");
|
||||||
|
JSONObject to = o.getJSONObject("to");
|
||||||
|
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);
|
||||||
|
return ro.toString();
|
||||||
|
}
|
||||||
|
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)) {
|
||||||
|
sb.append("<span>连线校验<span><br/>");
|
||||||
|
sb6.append("出入线未与其他形状进行关联,请查看模型");
|
||||||
|
sb6.append("校验未通过,请检查模型是否都已连线!");
|
||||||
|
sb.append(sb6);
|
||||||
|
ro.put("result", "error");
|
||||||
|
ro.put("sb", sb);
|
||||||
|
return ro.toString();
|
||||||
|
}
|
||||||
|
if (UtilString.isNotEmpty(from_id)) {
|
||||||
|
list_linker.remove(from_id);
|
||||||
|
} 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 + "\"" + "连线没有入线");
|
||||||
|
}
|
||||||
|
if (UtilString.isNotEmpty(to_id)) {
|
||||||
|
list_linker.remove(to_id);
|
||||||
|
} 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 + "\"" + "连线没有出线");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//System.out.println("m的值>>>>>>>>>>>" + ms);
|
||||||
|
}
|
||||||
|
System.out.println("剩余的list是什么>>>>>>>>>>" + list_linker.toString());
|
||||||
//System.out.println("linker>>>>>>>>>>>>" + list_linker.size());
|
//System.out.println("linker>>>>>>>>>>>>" + list_linker.size());
|
||||||
//连线校验增加体术语句
|
//连线校验增加体术语句
|
||||||
if (list_linker.size() > 0) {
|
if (list_linker.size() > 0) {
|
||||||
sb.append("<span>连线校验<span><br/>");
|
sb.append("<span>连线校验<span><br/>");
|
||||||
for (String d :
|
for (String d :
|
||||||
list_linker) {
|
list_linker) {
|
||||||
String name = jsonObjects.getString(d);
|
String name = jsonObjects.getString(d);
|
||||||
sb6.append(name).append("没有连线");
|
sb6.append(name).append("没有连线");
|
||||||
|
}
|
||||||
|
sb6.append("校验未通过,请检查模型是否都已连线!");
|
||||||
|
sb.append(sb6);
|
||||||
}
|
}
|
||||||
sb6.append("校验未通过,请检查模型是否都已连线!");
|
|
||||||
sb.append(sb6);
|
System.out.println("sb>>>>>>>>>>>" + sb);
|
||||||
}
|
}
|
||||||
|
|
||||||
System.out.println("sb>>>>>>>>>>>"+sb);
|
|
||||||
|
|
||||||
/***************************************************数据属性校验*************************************************/
|
/***************************************************数据属性校验*************************************************/
|
||||||
|
|
||||||
Map<String, PALMethodAttributeModel> methodAttributeModelMap = new HashMap<>();
|
Map<String, PALMethodAttributeModel> methodAttributeModelMap = new HashMap<>();
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user