lxm1993 发布系统代码 [TrainSys，网页端]

bb65bf92 · ibizdev · f6db33eb · bb65bf92 · bb65bf92 · bb65bf92
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/TEST.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/TEST.json
@@ -2239,13 +2239,14 @@
          "logicType" : "GROUP",
          "name" : "连接条件组",
          "getPSDELogicLinkConds" : [ {
+            "condOP" : "ISNOTNULL",
            "dstFieldName" : "TESTID",
            "getDstLogicParam" : {
              "modelref" : true,
              "id" : "Default"
            },
            "logicType" : "SINGLE",
-            "name" : "?"
+            "name" : "Default[TESTID] 值不为空(NotNil)"
          } ]
        },
        "getSrcPSDELogicNode" : {
@@ -2260,8 +2261,36 @@
      "leftPos" : 352,
      "logicNodeType" : "PREPAREPARAM",
      "name" : "准备参数",
+      "getPSDELogicLinks" : [ {
+        "getDstPSDELogicNode" : {
+          "modelref" : true,
+          "id" : "RESETPARAM1"
+        },
+        "name" : "链接333",
+        "getSrcPSDELogicNode" : {
+          "modelref" : true,
+          "id" : "Prepareparam1"
+        }
+      } ],
      "topPos" : 236,
      "parallelOutput" : true
+    }, {
+      "codeName" : "RESETPARAM1",
+      "leftPos" : 190,
+      "logicNodeType" : "RESETPARAM",
+      "name" : "重置参数",
+      "getPSDELogicLinks" : [ {
+        "getDstPSDELogicNode" : {
+          "modelref" : true,
+          "id" : "Begin"
+        },
+        "name" : "返回链接",
+        "getSrcPSDELogicNode" : {
+          "modelref" : true,
+          "id" : "RESETPARAM1"
+        }
+      } ],
+      "topPos" : 420
    } ],
    "getPSDELogicParams" : [ {
      "codeName" : "Default",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/TEST/PSDELOGICS/logic1.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/TEST/PSDELOGICS/logic1.json
@@ -20,13 +20,14 @@
        "logicType" : "GROUP",
        "name" : "连接条件组",
        "getPSDELogicLinkConds" : [ {
+          "condOP" : "ISNOTNULL",
          "dstFieldName" : "TESTID",
          "getDstLogicParam" : {
            "modelref" : true,
            "id" : "Default"
          },
          "logicType" : "SINGLE",
-          "name" : "?"
+          "name" : "Default[TESTID] 值不为空(NotNil)"
        } ]
      },
      "getSrcPSDELogicNode" : {
@@ -41,8 +42,36 @@
    "leftPos" : 352,
    "logicNodeType" : "PREPAREPARAM",
    "name" : "准备参数",
+    "getPSDELogicLinks" : [ {
+      "getDstPSDELogicNode" : {
+        "modelref" : true,
+        "id" : "RESETPARAM1"
+      },
+      "name" : "链接333",
+      "getSrcPSDELogicNode" : {
+        "modelref" : true,
+        "id" : "Prepareparam1"
+      }
+    } ],
    "topPos" : 236,
    "parallelOutput" : true
+  }, {
+    "codeName" : "RESETPARAM1",
+    "leftPos" : 190,
+    "logicNodeType" : "RESETPARAM",
+    "name" : "重置参数",
+    "getPSDELogicLinks" : [ {
+      "getDstPSDELogicNode" : {
+        "modelref" : true,
+        "id" : "Begin"
+      },
+      "name" : "返回链接",
+      "getSrcPSDELogicNode" : {
+        "modelref" : true,
+        "id" : "RESETPARAM1"
+      }
+    } ],
+    "topPos" : 420
  } ],
  "getPSDELogicParams" : [ {
    "codeName" : "Default",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json
@@ -1009,13 +1009,14 @@
          "logicType" : "GROUP",
          "name" : "连接条件组",
          "getPSDELogicLinkConds" : [ {
+            "condOP" : "ISNOTNULL",
            "dstFieldName" : "TESTID",
            "getDstLogicParam" : {
              "modelref" : true,
              "id" : "Default"
            },
            "logicType" : "SINGLE",
-            "name" : "?"
+            "name" : "Default[TESTID] 值不为空(NotNil)"
          } ]
        },
        "getSrcPSDELogicNode" : {
@@ -1030,8 +1031,36 @@
      "leftPos" : 352,
      "logicNodeType" : "PREPAREPARAM",
      "name" : "准备参数",
+      "getPSDELogicLinks" : [ {
+        "getDstPSDELogicNode" : {
+          "modelref" : true,
+          "id" : "RESETPARAM1"
+        },
+        "name" : "链接333",
+        "getSrcPSDELogicNode" : {
+          "modelref" : true,
+          "id" : "Prepareparam1"
+        }
+      } ],
      "topPos" : 236,
      "parallelOutput" : true
+    }, {
+      "codeName" : "RESETPARAM1",
+      "leftPos" : 190,
+      "logicNodeType" : "RESETPARAM",
+      "name" : "重置参数",
+      "getPSDELogicLinks" : [ {
+        "getDstPSDELogicNode" : {
+          "modelref" : true,
+          "id" : "Begin"
+        },
+        "name" : "返回链接",
+        "getSrcPSDELogicNode" : {
+          "modelref" : true,
+          "id" : "RESETPARAM1"
+        }
+      } ],
+      "topPos" : 420
    } ],
    "getPSDELogicParams" : [ {
      "codeName" : "Default",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
@@ -24813,13 +24813,14 @@
              "logicType" : "GROUP",
              "name" : "连接条件组",
              "getPSDELogicLinkConds" : [ {
+                "condOP" : "ISNOTNULL",
                "dstFieldName" : "TESTID",
                "getDstLogicParam" : {
                  "modelref" : true,
                  "id" : "Default"
                },
                "logicType" : "SINGLE",
-                "name" : "?"
+                "name" : "Default[TESTID] 值不为空(NotNil)"
              } ]
            },
            "getSrcPSDELogicNode" : {
@@ -24834,8 +24835,36 @@
          "leftPos" : 352,
          "logicNodeType" : "PREPAREPARAM",
          "name" : "准备参数",
+          "getPSDELogicLinks" : [ {
+            "getDstPSDELogicNode" : {
+              "modelref" : true,
+              "id" : "RESETPARAM1"
+            },
+            "name" : "链接333",
+            "getSrcPSDELogicNode" : {
+              "modelref" : true,
+              "id" : "Prepareparam1"
+            }
+          } ],
          "topPos" : 236,
          "parallelOutput" : true
+        }, {
+          "codeName" : "RESETPARAM1",
+          "leftPos" : 190,
+          "logicNodeType" : "RESETPARAM",
+          "name" : "重置参数",
+          "getPSDELogicLinks" : [ {
+            "getDstPSDELogicNode" : {
+              "modelref" : true,
+              "id" : "Begin"
+            },
+            "name" : "返回链接",
+            "getSrcPSDELogicNode" : {
+              "modelref" : true,
+              "id" : "RESETPARAM1"
+            }
+          } ],
+          "topPos" : 420
        } ],
        "getPSDELogicParams" : [ {
          "codeName" : "Default",