From 70e8c22204fa82dfda618747d3eeb7d4603b5c4e Mon Sep 17 00:00:00 2001 From: Mr-wang Date: Tue, 1 Aug 2023 09:48:31 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=9E=E7=BA=BF=E6=A0=A1=E9=AA=8C=E9=99=A4?= =?UTF-8?q?=E4=BA=86=E8=A1=A8=E5=8D=95=E5=9B=BE,=E5=88=B6=E5=BA=A6?= =?UTF-8?q?=E5=9B=BE,=E6=B3=B3=E9=81=93=E5=9B=BE=E4=B8=8D=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E8=BF=9B=E8=A1=8C=E8=BF=9E=E7=BA=BF=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E5=85=B6=E4=BB=96=E7=9A=84=E5=8F=AF=E4=BB=A5=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E8=BF=9E=E7=BA=BF=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/web/CoeProcessLevelWeb.java | 155 +++++++++--------- 1 file changed, 79 insertions(+), 76 deletions(-) diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java index 1e94f29b..6a98d98c 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java @@ -9445,90 +9445,93 @@ public class CoeProcessLevelWeb extends ActionWeb { sb.append(sb1.substring(0, sb1.length() - 1)); sb.append("未填写，请检查！").append("
"); } - List list_linker = new LinkedList<>(); - List resultLists = new ArrayList<>(); - List 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); - } - } + if(!model.getMethodId().equals("control.policy")&&!model.getMethodId().equals("data.form")&&!model.getMethodId().equals("process.flowchart")) { - for (JSONObject o : elements_fei) { - String shapeId = o.getString("id"); - 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("连线校验
"); - 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("连线校验
"); - 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+"\""+"连线没有出线"); + List list_linker = new LinkedList<>(); + List resultLists = new ArrayList<>(); + List 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); } } - //System.out.println("m的值>>>>>>>>>>>" + ms); - } - System.out.println("剩余的list是什么>>>>>>>>>>"+list_linker.toString()); + for (JSONObject o : elements_fei) { + String shapeId = o.getString("id"); + + 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("连线校验
"); + 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("连线校验
"); + 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()); - //连线校验增加体术语句 - if (list_linker.size() > 0) { - sb.append("连线校验
"); - for (String d : - list_linker) { - String name = jsonObjects.getString(d); - sb6.append(name).append("没有连线"); + //连线校验增加体术语句 + if (list_linker.size() > 0) { + sb.append("连线校验
"); + for (String d : + list_linker) { + String name = jsonObjects.getString(d); + 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 methodAttributeModelMap = new HashMap<>();