修改 视图出不来 +编辑器出不来

kimi

2020-05-27 a4bea28cecea3f49be5d0b0ddf118ec8715812a9

修改 视图出不来 +编辑器出不来

 src/main/java/com/highdatas/mdm/service/impl/ModelEditorServiceImpl.java

@@ -62,20 +62,23 @@
            String s = new String(modelEditorSource, "utf-8");
            JSONObject editorJsonNode = JSONObject.parseObject(s);
            JSONArray childShapes = editorJsonNode.getJSONArray("childShapes");
            for (Object childShape : childShapes) {
                JSONObject nextJsonNode = (JSONObject) childShape;
                JSONObject stencil = nextJsonNode.getJSONObject("stencil");
                String nodeType = stencil.getString(Constant.ID);
            if (childShapes != null) {
                for (Object childShape : childShapes) {
                    JSONObject nextJsonNode = (JSONObject) childShape;
                    JSONObject stencil = nextJsonNode.getJSONObject("stencil");
                    String nodeType = stencil.getString(Constant.ID);

                if (!nodeType.equalsIgnoreCase("SequenceFlow")) {
                    continue;
                    if (!nodeType.equalsIgnoreCase("SequenceFlow")) {
                        continue;
                    }

                    JSONObject properties = nextJsonNode.getJSONObject("properties");
                    String etlCondition = properties.getString("conditionsequenceflow");
                    etlCondition = etlCondition.replace("&&", "++");
                    properties.put("conditionsequenceflow", etlCondition);
                }

                JSONObject properties = nextJsonNode.getJSONObject("properties");
                String etlCondition = properties.getString("conditionsequenceflow");
                etlCondition = etlCondition.replace("&&", "++");
                properties.put("conditionsequenceflow", etlCondition);
            }

            JsonNode jsonNode = objectMapper.readTree(editorJsonNode.toJSONString());
            modelNode.put("model", jsonNode);


 src/main/java/com/highdatas/mdm/service/impl/SysViewServiceImpl.java

@@ -687,13 +687,10 @@

        JSONObject object = new JSONObject();
        object.fluentPut("records", maps);
        if (page == null) {
            object.fluentPut("pages", page.getPageCount());
            object.fluentPut("current", pageNo);
            object.fluentPut("total", count);
            object.fluentPut("pageSize", page.getPageSize());
        }

        object.fluentPut("pages", page.getPageCount());
        object.fluentPut("current", pageNo);
        object.fluentPut("total", count);
        object.fluentPut("pageSize", page.getPageSize());

        //fields
        ArrayList<ViewField> sysFields = new ArrayList<>();

 src/main/resources/application.yml

@@ -1,7 +1,7 @@
spring:
  profiles:
    active:
      pro
      rrs

  main:
    allow-bean-definition-overriding: true