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-07-10 20:26:42 +08:00
parent 443b5b1041
commit 35044f232e
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/event/PublishFormBeforeSaveEvent.java
View File

@ -259,12 +259,15 @@ public class PublishFormBeforeSaveEvent extends InterruptListener implements Int
StringBuilder sbs = new StringBuilder(); StringBuilder sbs = new StringBuilder();
List<String> list_linker = new LinkedList<>(); List<String> list_linker = new LinkedList<>();
//连线数据增加 //连线数据增加
JSONObject json = new JSONObject(new LinkedHashMap<>());
for (JSONObject o : elements_fei) { for (JSONObject o : elements_fei) {
String shapeId = o.getString("id"); String shapeId = o.getString("id");
String shapeName = o.getString("name"); String shapeName = o.getString("name");
String title = o.getString("title");
if (!shapeName.equals("linker")) { if (!shapeName.equals("linker")) {
list_linker.add(shapeId); list_linker.add(shapeId);
json.put(shapeId,title);
} }
} }
@ -298,7 +301,6 @@ public class PublishFormBeforeSaveEvent extends InterruptListener implements Int
sb6.append("\""+title+"\"").append("连线没有出线"); sb6.append("\""+title+"\"").append("连线没有出线");
list_linker.add("\""+title+"\""+"连线没有出线"); list_linker.add("\""+title+"\""+"连线没有出线");
} }
continue;
} }
//System.out.println("m的值>>>>>>>>>>>" + ms); //System.out.println("m的值>>>>>>>>>>>" + ms);
} }
@ -306,8 +308,13 @@ public class PublishFormBeforeSaveEvent extends InterruptListener implements Int
//System.out.println("linker>>>>>>>>>>>>" + list_linker.size()); //System.out.println("linker>>>>>>>>>>>>" + list_linker.size());
if (list_linker.size() > 0) { if (list_linker.size() > 0) {
sbs.append("连线校验:"); sbs.append("连线校验:");
sbs.append(sb6); for (String d :
list_linker) {
String name = json.getString(d);
sb6.append(name).append("没有连线");
}
sb6.append("校验未通过,请检查模型是否都已连线!"); sb6.append("校验未通过,请检查模型是否都已连线!");
sbs.append(sb6);
} }
if (sbs.length()>0){ if (sbs.length()>0){
throw new BPMNError("0313", sbs.toString()); throw new BPMNError("0313", sbs.toString());

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

@ -9510,12 +9510,14 @@ public class CoeProcessLevelWeb extends ActionWeb {
List<String> list_linker = new LinkedList<>(); List<String> list_linker = new LinkedList<>();
List<JSONObject> resultLists = new ArrayList<>(); List<JSONObject> resultLists = new ArrayList<>();
List<JSONObject> elements_fei = ShapeUtil.getShapeJsonToJsonObject2(obj); List<JSONObject> elements_fei = ShapeUtil.getShapeJsonToJsonObject2(obj);
JSONObject jsonObjects = new JSONObject(new LinkedHashMap<>());
for (JSONObject o : elements_fei) { for (JSONObject o : elements_fei) {
String shapeId = o.getString("id"); String shapeId = o.getString("id");
String shapeName = o.getString("name"); String shapeName = o.getString("name");
String title = o.getString("title");
if (!shapeName.equals("linker")) { if (!shapeName.equals("linker")) {
list_linker.add(shapeId); list_linker.add(shapeId);
jsonObjects.put(shapeId,title);
} }
} }
@ -9549,24 +9551,25 @@ public class CoeProcessLevelWeb extends ActionWeb {
sb6.append("\""+title+"\"").append("连线没有出线"); sb6.append("\""+title+"\"").append("连线没有出线");
list_linker.add("\""+title+"\""+"连线没有出线"); list_linker.add("\""+title+"\""+"连线没有出线");
} }
continue;
} }
//System.out.println("m的值>>>>>>>>>>>" + ms); //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/>");
ResponseObject ros = ResponseObject.newOkResponse();
for (String d : for (String d :
list_linker) { list_linker) {
JSONObject tmp = new JSONObject(); String name = jsonObjects.getString(d);
tmp.put("shapeId", d); sb6.append(name).append("没有连线");
} }
sb.append(sb6);
sb6.append("校验未通过,请检查模型是否都已连线!"); sb6.append("校验未通过,请检查模型是否都已连线!");
sb.append(sb6);
} }
System.out.println("sb>>>>>>>>>>>"+sb);
/***************************************************数据属性校验*************************************************/ /***************************************************数据属性校验*************************************************/
Map<String, PALMethodAttributeModel> methodAttributeModelMap = new HashMap<>(); Map<String, PALMethodAttributeModel> methodAttributeModelMap = new HashMap<>();