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

a450dbd4 · ibizdev · e7b96fa7 · a450dbd4 · a450dbd4 · a450dbd4
--- a/config.xml
+++ b/config.xml
@@ -55,12 +55,6 @@
 	  git clone -b master $para2 trainsys/
      export NODE_OPTIONS=--max-old-space-size=4096
      cd trainsys/
-      mvn clean package -Ptrainsys
-      mvn install -Ptrainsys
-      cd trainsys-provider
-      mvn -Ptrainsys docker:build
-      mvn -Ptrainsys docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/trainsys-provider-trainsys.yaml ebsx --with-registry-auth      
      </command>
    </hudson.tasks.Shell>
  </builders>

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json
@@ -1500,16 +1500,16 @@
    "codeName" : "VMGroup2",
    "name" : "视图消息组2",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息",
+      "name" : "视图消息2",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
      }
    }, {
-      "name" : "视图消息2",
+      "name" : "视图消息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
      }
    } ]
  }, {

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM/PSGANTTS/Usr12114819GanttView_Gantt.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM/PSGANTTS/Usr12114819GanttView_Gantt.json
 {
  "beginDataItemName" : "begin",
  "codeName" : "Usr12114819GanttView_Gantt",
+  "controlStyle" : "GANTT",
  "controlType" : "GANTT",
  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM/PSGANTTS/Usr12114819GanttView_Gantt.json",
  "endDataItemName" : "end",
@@ -223,18 +224,18 @@
    }, {
      "cLConvertMode" : "NONE",
      "dataType" : 25,
-      "name" : "name",
+      "name" : "sn",
      "getPSAppDEField" : {
-        "name" : "WORKITEMNAME",
-        "codeName" : "WORKITEMName"
+        "name" : "BH",
+        "codeName" : "BH"
      }
    }, {
      "cLConvertMode" : "NONE",
      "dataType" : 25,
-      "name" : "sn",
+      "name" : "name",
      "getPSAppDEField" : {
-        "name" : "BH",
-        "codeName" : "BH"
+        "name" : "WORKITEMNAME",
+        "codeName" : "WORKITEMName"
      }
    } ],
    "getTextPSAppDEField" : {
@@ -278,34 +279,34 @@
    "getPSDETreeNodeDataItems" : [ {
      "cLConvertMode" : "NONE",
      "dataType" : 25,
-      "name" : "name",
+      "name" : "sn",
      "getPSAppDEField" : {
-        "name" : "WORKITEMNAME",
-        "codeName" : "WORKITEMName"
+        "name" : "BH",
+        "codeName" : "BH"
      }
    }, {
      "cLConvertMode" : "NONE",
      "dataType" : 25,
-      "name" : "end",
+      "name" : "begin",
      "getPSAppDEField" : {
-        "name" : "END",
-        "codeName" : "END"
+        "name" : "BEGIN",
+        "codeName" : "BEGIN"
      }
    }, {
      "cLConvertMode" : "NONE",
      "dataType" : 25,
-      "name" : "sn",
+      "name" : "name",
      "getPSAppDEField" : {
-        "name" : "BH",
-        "codeName" : "BH"
+        "name" : "WORKITEMNAME",
+        "codeName" : "WORKITEMName"
      }
    }, {
      "cLConvertMode" : "NONE",
      "dataType" : 25,
-      "name" : "begin",
+      "name" : "end",
      "getPSAppDEField" : {
-        "name" : "BEGIN",
-        "codeName" : "BEGIN"
+        "name" : "END",
+        "codeName" : "END"
      }
    } ],
    "getTextPSAppDEField" : {
@@ -330,6 +331,10 @@
    "selected" : false,
    "id" : "top"
  } ],
+  "getPSSysPFPlugin" : {
+    "pluginType" : "TREE_RENDER",
+    "pluginCode" : "GANTT"
+  },
  "prevDataItemName" : "prev",
  "sNDataItemName" : "sn",
  "totalDataItemName" : "total",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/WORKITEMUsr12114819GanttView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/WORKITEMUsr12114819GanttView.json
@@ -23,6 +23,7 @@
  "getPSControls" : [ {
    "beginDataItemName" : "begin",
    "codeName" : "Usr12114819GanttView_Gantt",
+    "controlStyle" : "GANTT",
    "controlType" : "GANTT",
    "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM/PSGANTTS/Usr12114819GanttView_Gantt.json",
    "endDataItemName" : "end",
@@ -254,18 +255,18 @@
      }, {
        "cLConvertMode" : "NONE",
        "dataType" : 25,
-        "name" : "name",
+        "name" : "sn",
        "getPSAppDEField" : {
-          "name" : "WORKITEMNAME",
-          "codeName" : "WORKITEMName"
+          "name" : "BH",
+          "codeName" : "BH"
        }
      }, {
        "cLConvertMode" : "NONE",
        "dataType" : 25,
-        "name" : "sn",
+        "name" : "name",
        "getPSAppDEField" : {
-          "name" : "BH",
-          "codeName" : "BH"
+          "name" : "WORKITEMNAME",
+          "codeName" : "WORKITEMName"
        }
      } ],
      "getTextPSAppDEField" : {
@@ -309,34 +310,34 @@
      "getPSDETreeNodeDataItems" : [ {
        "cLConvertMode" : "NONE",
        "dataType" : 25,
-        "name" : "name",
+        "name" : "sn",
        "getPSAppDEField" : {
-          "name" : "WORKITEMNAME",
-          "codeName" : "WORKITEMName"
+          "name" : "BH",
+          "codeName" : "BH"
        }
      }, {
        "cLConvertMode" : "NONE",
        "dataType" : 25,
-        "name" : "end",
+        "name" : "begin",
        "getPSAppDEField" : {
-          "name" : "END",
-          "codeName" : "END"
+          "name" : "BEGIN",
+          "codeName" : "BEGIN"
        }
      }, {
        "cLConvertMode" : "NONE",
        "dataType" : 25,
-        "name" : "sn",
+        "name" : "name",
        "getPSAppDEField" : {
-          "name" : "BH",
-          "codeName" : "BH"
+          "name" : "WORKITEMNAME",
+          "codeName" : "WORKITEMName"
        }
      }, {
        "cLConvertMode" : "NONE",
        "dataType" : 25,
-        "name" : "begin",
+        "name" : "end",
        "getPSAppDEField" : {
-          "name" : "BEGIN",
-          "codeName" : "BEGIN"
+          "name" : "END",
+          "codeName" : "END"
        }
      } ],
      "getTextPSAppDEField" : {
@@ -361,6 +362,10 @@
      "selected" : false,
      "id" : "top"
    } ],
+    "getPSSysPFPlugin" : {
+      "pluginType" : "TREE_RENDER",
+      "pluginCode" : "GANTT"
+    },
    "prevDataItemName" : "prev",
    "sNDataItemName" : "sn",
    "totalDataItemName" : "total",

--- 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
@@ -4795,6 +4795,16 @@
    "pluginType" : "CUSTOM",
    "refMode" : "CONTROL",
    "refTag" : "CALENDAR"
+  }, {
+    "name" : "甘特图",
+    "getPSSysPFPlugin" : {
+      "pluginType" : "TREE_RENDER",
+      "pluginCode" : "GANTT"
+    },
+    "pluginCode" : "GANTT",
+    "pluginType" : "TREE_RENDER",
+    "refMode" : "CONTROL",
+    "refTag" : "GANTT"
  }, {
    "name" : "编辑器插件",
    "getPSSysPFPlugin" : {
@@ -11947,16 +11957,16 @@
    "codeName" : "VMGroup2",
    "name" : "视图消息组2",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息",
+      "name" : "视图消息2",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
      }
    }, {
-      "name" : "视图消息2",
+      "name" : "视图消息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
      }
    } ]
  }, {
@@ -11985,10 +11995,10 @@
    "codeName" : "VMGroup3",
    "name" : "视图消息类型测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-警告信息",
+      "name" : "消息类型-常规信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg5"
+        "id" : "ViewMsg4"
      }
    }, {
      "name" : "消息类型-错误信息",
@@ -11997,10 +12007,10 @@
        "id" : "ViewMsg6"
      }
    }, {
-      "name" : "消息类型-常规信息",
+      "name" : "消息类型-警告信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg4"
+        "id" : "ViewMsg5"
      }
    } ]
  }, {
@@ -12017,28 +12027,28 @@
    "codeName" : "VMGroup4",
    "name" : "视图消息位置测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-视图上方",
+      "name" : "消息位置-弹出",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg7"
+        "id" : "ViewMsg10"
      }
    }, {
-      "name" : "消息位置-视图下方",
+      "name" : "消息位置-视图上方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg7"
      }
    }, {
-      "name" : "消息位置-弹出",
+      "name" : "消息位置-视图内容区",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg10"
+        "id" : "ViewMsg9"
      }
    }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息位置-视图下方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg8"
      }
    } ]
  }, {
@@ -12057,17 +12067,16 @@
        "id" : "ViewMsg12"
      }
    }, {
-      "name" : "消息类型-警告信息",
+      "name" : "关闭模式-本次删除-上方-警告",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg5"
-      },
-      "position" : "POPUP"
+        "id" : "ViewMsg13"
+      }
    }, {
-      "name" : "关闭模式-本次删除-上方-警告",
+      "name" : "消息位置-视图下方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg8"
      }
    }, {
      "name" : "消息类型-错误信息",
@@ -12077,11 +12086,12 @@
      },
      "position" : "POPUP"
    }, {
-      "name" : "消息位置-视图下方",
+      "name" : "消息类型-警告信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg8"
-      }
+        "id" : "ViewMsg5"
+      },
+      "position" : "POPUP"
    }, {
      "name" : "消息类型-常规信息",
      "getPSAppViewMsg" : {
@@ -12122,16 +12132,16 @@
    "codeName" : "VMGroup6",
    "name" : "视图消息动态模式测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "动态模式-静态内容",
+      "name" : "动态模式-实体数据集",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg15"
+        "id" : "ViewMsg14"
      }
    }, {
-      "name" : "动态模式-实体数据集",
+      "name" : "动态模式-静态内容",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg14"
+        "id" : "ViewMsg15"
      }
    } ]
  } ],
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.simple.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.simple.json
@@ -273,6 +273,16 @@
    "pluginType" : "CUSTOM",
    "refMode" : "CONTROL",
    "refTag" : "CALENDAR"
+  }, {
+    "name" : "甘特图",
+    "getPSSysPFPlugin" : {
+      "pluginType" : "TREE_RENDER",
+      "pluginCode" : "GANTT"
+    },
+    "pluginCode" : "GANTT",
+    "pluginType" : "TREE_RENDER",
+    "refMode" : "CONTROL",
+    "refTag" : "GANTT"
  }, {
    "name" : "编辑器插件",
    "getPSSysPFPlugin" : {

--- a/trainsys-provider/pom.xml
+++ b/trainsys-provider/pom.xml
@@ -33,7 +33,7 @@

    <profiles>
        <profile>
-            <id>trainsys</id>
+            <id>runtime</id>
            <build>
                <resources>
                    <resource>

--- a/trainsys-provider/src/main/docker/Dockerfile
+++ b/trainsys-provider/src/main/docker/Dockerfile
@@ -10,6 +10,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
    sleep ${IBIZ_SLEEP} && \
    java ${JAVA_OPTS} -Duser.timezone=$TZ -Djava.security.egd=file:/dev/./urandom -jar /trainsys-provider.jar

-EXPOSE 50000
+EXPOSE 8081

 ADD trainsys-provider.jar /trainsys-provider.jar
--- a/trainsys-provider/src/main/docker/trainsys-provider-trainsys-k8s.yaml
+++ b/trainsys-provider/src/main/docker/trainsys-provider-trainsys-k8s.yaml
@@ -22,32 +22,7 @@ spec:
        image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
        imagePullPolicy: Always
        ports:
-        - containerPort: 50000
-        env:
-        - name: SPRING_CLOUD_NACOS_DISCOVERY_IP
-          value: "172.16.240.140"      
-        - name: SERVER_PORT
-          value: "50000"
-        - name: SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR
-          value: "172.16.240.140:8848"
-        - name: SPRING_REDIS_HOST
-          value: "127.0.0.1"
-        - name: SPRING_REDIS_PORT
-          value: "6379"
-        - name: SPRING_REDIS_DATABASE
-          value: "0"
-        - name: SPRING_DATASOURCE_USERNAME
-          value: "a_LAB01_d23cc850e"
-        - name: SPRING_DATASOURCE_PASSWORD
-          value: "f9Df4556"
-        - name: SPRING_DATASOURCE_URL
-          value: "jdbc:mysql://172.16.186.185:3306/a_LAB01_d23cc850e?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&serverTimezone=GMT%2B8"
-        - name: SPRING_DATASOURCE_DRIVER-CLASS-NAME
-          value: "com.mysql.jdbc.Driver"
-        - name: SPRING_DATASOURCE_DEFAULTSCHEMA
-          value: "a_LAB01_d23cc850e"
-        - name: NACOS
-          value: "172.16.240.140:8848"      
+        - containerPort: 8081

 ---
 apiVersion: v1
@@ -60,9 +35,9 @@ spec:
  type: NodePort
  ports:
  - name: http
-    port: 50000
-    targetPort: 50000
-    nodePort: 50000
+    port: 8081
+    targetPort: 8081
+    nodePort: 8081
    protocol: TCP
  selector:
    app: trainsys-provider

--- a/trainsys-provider/src/main/docker/trainsys-provider-trainsys.yaml
+++ b/trainsys-provider/src/main/docker/trainsys-provider-trainsys.yaml
@@ -3,23 +3,9 @@ services:
  trainsys-provider:
    image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
    ports:
-      - "50000:50000"
+      - "8081:8081"
    networks:
      - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.140
-      - SERVER_PORT=50000
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.140:8848
-      - SPRING_CLOUD_NACOS_CONFIG_SERVER-ADDR=172.16.240.140:8848
-      - SPRING_REDIS_HOST=127.0.0.1
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_LAB01_d23cc850e
-      - SPRING_DATASOURCE_PASSWORD=f9Df4556
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_d23cc850e?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&serverTimezone=GMT%2B8
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_d23cc850e
-      - NACOS=172.16.240.140:8848
    deploy:
      resources:
           limits: