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

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>

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/BXDMXUsr10257483CustomView.json

@@ -15,6 +15,10 @@
   "getPSDEViewCodeName" : "Usr10257483CustomView",
   "getPSDEViewId" : "350FE6DB-977D-4CE0-9D50-5C2F7591DC05",
   "getPSViewLayoutPanel" : {
+    "getAllPSPanelFields" : [ {
+      "id" : "field_slider",
+      "viewFieldName" : "age"
+    } ],
     "codeName" : "Usr1205588682",
     "controlType" : "VIEWLAYOUTPANEL",
     "layoutMode" : "FLEX",
@@ -29,14 +33,63 @@
       "layout" : "FLEX"
     },
     "getRootPSPanelItems" : [ {
-      "caption" : "分页部件",
+      "caption" : "容器",
       "itemStyle" : "DEFAULT",
-      "itemType" : "TABPANEL",
-      "name" : "tabpanel",
+      "itemType" : "CONTAINER",
+      "name" : "container",
+      "getPSLayout" : {
+        "layout" : "FLEX"
+      },
       "getPSLayoutPos" : {
         "grow" : -1,
         "layout" : "FLEX"
-      }
+      },
+      "getPSPanelItems" : [ {
+        "caption" : "单项数据容器",
+        "dataRegionType" : "SINGLEDATA",
+        "dataSourceType" : "DEACTION",
+        "itemStyle" : "DEFAULT",
+        "itemType" : "CONTAINER",
+        "name" : "container_singledata",
+        "getPSAppDEMethod" : {
+          "modelref" : true,
+          "id" : "GetDraft"
+        },
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Student.json"
+        },
+        "getPSLayout" : {
+          "layout" : "FLEX"
+        },
+        "getPSLayoutPos" : {
+          "grow" : -1,
+          "layout" : "FLEX"
+        },
+        "getPSPanelItems" : [ {
+          "caption" : "滑块",
+          "itemStyle" : "DEFAULT",
+          "itemType" : "FIELD",
+          "memo" : "TOTALFIELD=TOTAL表示总数取哪个数据",
+          "name" : "field_slider",
+          "getPSEditor" : {
+            "editorParams" : {
+              "TOTALFIELD" : "TOTAL"
+            },
+            "editorStyle" : "DASHBOARD_PROGRESS",
+            "editorType" : "SLIDER",
+            "name" : "field_slider",
+            "predefinedType" : "FIELD_SLIDER",
+            "stepValue" : 1.0
+          },
+          "getPSLayoutPos" : {
+            "grow" : -1,
+            "layout" : "FLEX"
+          },
+          "viewFieldName" : "age"
+        } ],
+        "predefinedType" : "CONTAINER_SINGLEDATA"
+      } ]
     } ],
     "layoutBodyOnly" : false,
     "layoutPanel" : true,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTPanelLayoutTest.json

@@ -18,6 +18,10 @@
   "getPSDEViewCodeName" : "PanelLayoutTest",
   "getPSDEViewId" : "15B8B886-E115-41F4-97B2-3FD4F5F5B863",
   "getPSViewLayoutPanel" : {
+    "getAllPSPanelFields" : [ {
+      "id" : "field_slider",
+      "viewFieldName" : "age"
+    } ],
     "codeName" : "Usr1205588682",
     "controlType" : "VIEWLAYOUTPANEL",
     "layoutMode" : "FLEX",
@@ -32,14 +36,63 @@
       "layout" : "FLEX"
     },
     "getRootPSPanelItems" : [ {
-      "caption" : "分页部件",
+      "caption" : "容器",
       "itemStyle" : "DEFAULT",
-      "itemType" : "TABPANEL",
-      "name" : "tabpanel",
+      "itemType" : "CONTAINER",
+      "name" : "container",
+      "getPSLayout" : {
+        "layout" : "FLEX"
+      },
       "getPSLayoutPos" : {
         "grow" : -1,
         "layout" : "FLEX"
-      }
+      },
+      "getPSPanelItems" : [ {
+        "caption" : "单项数据容器",
+        "dataRegionType" : "SINGLEDATA",
+        "dataSourceType" : "DEACTION",
+        "itemStyle" : "DEFAULT",
+        "itemType" : "CONTAINER",
+        "name" : "container_singledata",
+        "getPSAppDEMethod" : {
+          "modelref" : true,
+          "id" : "GetDraft"
+        },
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Student.json"
+        },
+        "getPSLayout" : {
+          "layout" : "FLEX"
+        },
+        "getPSLayoutPos" : {
+          "grow" : -1,
+          "layout" : "FLEX"
+        },
+        "getPSPanelItems" : [ {
+          "caption" : "滑块",
+          "itemStyle" : "DEFAULT",
+          "itemType" : "FIELD",
+          "memo" : "TOTALFIELD=TOTAL表示总数取哪个数据",
+          "name" : "field_slider",
+          "getPSEditor" : {
+            "editorParams" : {
+              "TOTALFIELD" : "TOTAL"
+            },
+            "editorStyle" : "DASHBOARD_PROGRESS",
+            "editorType" : "SLIDER",
+            "name" : "field_slider",
+            "predefinedType" : "FIELD_SLIDER",
+            "stepValue" : 1.0
+          },
+          "getPSLayoutPos" : {
+            "grow" : -1,
+            "layout" : "FLEX"
+          },
+          "viewFieldName" : "age"
+        } ],
+        "predefinedType" : "CONTAINER_SINGLEDATA"
+      } ]
     } ],
     "layoutBodyOnly" : false,
     "layoutPanel" : true,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json

@@ -49485,6 +49485,10 @@
       "getPSDEViewCodeName" : "Usr10257483CustomView",
       "getPSDEViewId" : "350FE6DB-977D-4CE0-9D50-5C2F7591DC05",
       "getPSViewLayoutPanel" : {
+        "getAllPSPanelFields" : [ {
+          "id" : "field_slider",
+          "viewFieldName" : "age"
+        } ],
         "codeName" : "Usr1205588682",
         "controlType" : "VIEWLAYOUTPANEL",
         "layoutMode" : "FLEX",
@@ -49499,14 +49503,63 @@
           "layout" : "FLEX"
         },
         "getRootPSPanelItems" : [ {
-          "caption" : "分页部件",
+          "caption" : "容器",
           "itemStyle" : "DEFAULT",
-          "itemType" : "TABPANEL",
-          "name" : "tabpanel",
+          "itemType" : "CONTAINER",
+          "name" : "container",
+          "getPSLayout" : {
+            "layout" : "FLEX"
+          },
           "getPSLayoutPos" : {
             "grow" : -1,
             "layout" : "FLEX"
-          }
+          },
+          "getPSPanelItems" : [ {
+            "caption" : "单项数据容器",
+            "dataRegionType" : "SINGLEDATA",
+            "dataSourceType" : "DEACTION",
+            "itemStyle" : "DEFAULT",
+            "itemType" : "CONTAINER",
+            "name" : "container_singledata",
+            "getPSAppDEMethod" : {
+              "modelref" : true,
+              "id" : "GetDraft"
+            },
+            "getPSAppDataEntity" : {
+              "modelref" : true,
+              "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Student.json"
+            },
+            "getPSLayout" : {
+              "layout" : "FLEX"
+            },
+            "getPSLayoutPos" : {
+              "grow" : -1,
+              "layout" : "FLEX"
+            },
+            "getPSPanelItems" : [ {
+              "caption" : "滑块",
+              "itemStyle" : "DEFAULT",
+              "itemType" : "FIELD",
+              "memo" : "TOTALFIELD=TOTAL表示总数取哪个数据",
+              "name" : "field_slider",
+              "getPSEditor" : {
+                "editorParams" : {
+                  "TOTALFIELD" : "TOTAL"
+                },
+                "editorStyle" : "DASHBOARD_PROGRESS",
+                "editorType" : "SLIDER",
+                "name" : "field_slider",
+                "predefinedType" : "FIELD_SLIDER",
+                "stepValue" : 1.0
+              },
+              "getPSLayoutPos" : {
+                "grow" : -1,
+                "layout" : "FLEX"
+              },
+              "viewFieldName" : "age"
+            } ],
+            "predefinedType" : "CONTAINER_SINGLEDATA"
+          } ]
         } ],
         "layoutBodyOnly" : false,
         "layoutPanel" : true,

trainsys-provider/pom.xml

@@ -33,7 +33,7 @@
 
     <profiles>
         <profile>
-            <id>trainsys</id>
+            <id>runtime</id>
             <build>
                 <resources>
                     <resource>

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

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

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: