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/PSMODULES/common/PSDATAENTITIES/Book.json

@@ -530,6 +530,12 @@
   }, {
     "modelref" : true,
     "path" : "PSMODULES/common/PSDATAENTITIES/Book/PSDEDRITEMS/UsrDRItem0311726913.json"
+  }, {
+    "modelref" : true,
+    "path" : "PSMODULES/common/PSDATAENTITIES/Book/PSDEDRITEMS/UsrDRItem0816048233.json"
+  }, {
+    "modelref" : true,
+    "path" : "PSMODULES/common/PSDATAENTITIES/Book/PSDEDRITEMS/UsrDRItem0816439309.json"
   } ],
   "getAllPSDEDataExports" : [ {
     "codeName" : "DataExport",
@@ -8305,6 +8311,12 @@
     "name" : "书实体测试编辑器表格视图",
     "realModelSubType" : "DEGRIDVIEW",
     "realModelType" : "PSDEVIEWBASE"
+  }, {
+    "codeName" : "TEST2PickupTreeView",
+    "logicName" : "书实体选择树视图（部件视图）",
+    "name" : "书实体选择树视图（部件视图）",
+    "realModelSubType" : "DEPICKUPTREEVIEW",
+    "realModelType" : "PSDEVIEWBASE"
   }, {
     "codeName" : "PickupGridView",
     "logicName" : "书实体选择表格视图（部件视图）",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Book/PSDEDATARELATIONS/test2024815.json

@@ -4,13 +4,25 @@
   "formCaption" : "书",
   "name" : "测试关系界面组",
   "getPSDEDRDetails" : [ {
-    "caption" : "书实体表格视图",
+    "caption" : "测试",
     "detailType" : "DRITEM",
-    "name" : "test",
+    "name" : "test2",
     "orderValue" : 100,
+    "originCaption" : "测试",
     "getPSDEDRItem" : {
       "modelref" : true,
-      "path" : "PSMODULES/common/PSDATAENTITIES/Book/PSDEDRITEMS/UsrDRItem0311726913.json"
+      "path" : "PSMODULES/common/PSDATAENTITIES/Book/PSDEDRITEMS/UsrDRItem0816439309.json"
     }
-  } ]
+  }, {
+    "caption" : "测试3",
+    "detailType" : "DRITEM",
+    "name" : "test3",
+    "orderValue" : 110,
+    "originCaption" : "测试3",
+    "getPSDEDRItem" : {
+      "modelref" : true,
+      "path" : "PSMODULES/common/PSDATAENTITIES/Book/PSDEDRITEMS/UsrDRItem0816048233.json"
+    }
+  } ],
+  "hideEditItem" : true
 }
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Book/PSDEDRITEMS/UsrDRItem0816048233.json

+{
+  "codeName" : "UsrDRItem0816048233",
+  "dynaModelFilePath" : "PSMODULES/common/PSDATAENTITIES/Book/PSDEDRITEMS/UsrDRItem0816048233.json",
+  "itemType" : "DER1N",
+  "name" : "书实体选择树视图（部件视图）（2）",
+  "getPSDER" : {
+    "modelref" : true,
+    "path" : "PSMODULES/common/PSDATAENTITIES/Book/PSDERS/DER1N_BOOK_BOOK_PBOOKID.json"
+  },
+  "parentDataJO" : {
+    "srfparentdefname" : "PBOOKID",
+    "srfparentdename" : "BOOK",
+    "SRFPARENTTYPE" : "DER1N",
+    "srfparentmode" : "DER1N_BOOK_BOOK_PBOOKID",
+    "SRFDER1NID" : "DER1N_BOOK_BOOK_PBOOKID"
+  },
+  "viewCodeName" : "TEST2PickupTreeView",
+  "getViewPSDataEntity" : {
+    "modelref" : true,
+    "path" : "PSMODULES/common/PSDATAENTITIES/Book.json"
+  },
+  "viewParamJO" : {
+    "SRFPARENTTYPE" : "DER1N",
+    "SRFDER1NID" : "DER1N_BOOK_BOOK_PBOOKID"
+  }
+}
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Book/PSDEDRITEMS/UsrDRItem0816439309.json

+{
+  "codeName" : "UsrDRItem0816439309",
+  "dynaModelFilePath" : "PSMODULES/common/PSDATAENTITIES/Book/PSDEDRITEMS/UsrDRItem0816439309.json",
+  "itemType" : "DER1N",
+  "name" : "书实体选择树视图（部件视图）",
+  "getPSDER" : {
+    "modelref" : true,
+    "path" : "PSMODULES/common/PSDATAENTITIES/Book/PSDERS/DER1N_BOOK_BOOK_PBOOKID.json"
+  },
+  "parentDataJO" : {
+    "srfparentdefname" : "PBOOKID",
+    "srfparentdename" : "BOOK",
+    "SRFPARENTTYPE" : "DER1N",
+    "srfparentmode" : "DER1N_BOOK_BOOK_PBOOKID",
+    "SRFDER1NID" : "DER1N_BOOK_BOOK_PBOOKID"
+  },
+  "viewCodeName" : "PickupTreeView",
+  "getViewPSDataEntity" : {
+    "modelref" : true,
+    "path" : "PSMODULES/common/PSDATAENTITIES/Book.json"
+  },
+  "viewParamJO" : {
+    "SRFPARENTTYPE" : "DER1N",
+    "SRFDER1NID" : "DER1N_BOOK_BOOK_PBOOKID"
+  }
+}
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Book.json

@@ -4610,6 +4610,27 @@
     "uIActionType" : "DEUIACTION",
     "showBusyIndicator" : false,
     "id" : "dkdsjkp@Book"
+  }, {
+    "actionTarget" : "SINGLEKEY",
+    "caption" : "打开主数据视图",
+    "codeName" : "open_main_view",
+    "getFrontPSAppView" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/bookGridView.json",
+      "viewType" : "DEGRIDVIEW"
+    },
+    "frontProcessType" : "TOP",
+    "fullCodeName" : "Book_open_main_view",
+    "name" : "打开主数据视图",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Book.json"
+    },
+    "timeout" : 60000,
+    "uIActionMode" : "FRONT",
+    "uIActionTag" : "open_main_view",
+    "uIActionType" : "DEUIACTION",
+    "id" : "open_main_view@Book"
   }, {
     "actionTarget" : "SINGLEKEY",
     "caption" : "打开多数据表单",
@@ -5045,6 +5066,14 @@
     "modelref" : true,
     "path" : "PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/bookUsr3EditView.json",
     "viewType" : "DEEDITVIEW"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/bookPickupTreeView.json",
+    "viewType" : "DEPICKUPTREEVIEW"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/bookTEST2PickupTreeView.json",
+    "viewType" : "DEPICKUPTREEVIEW"
   }, {
     "modelref" : true,
     "path" : "PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/bookGridView.json",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/bookUsr2TestMPickupView.json

@@ -1017,15 +1017,24 @@
         "id" : "PICKUPVIEWPANEL"
       },
       "getPSDEDRTabPages" : [ {
-        "caption" : "书实体表格视图",
-        "name" : "test",
+        "caption" : "测试",
+        "name" : "test2",
         "getPSAppView" : {
           "modelref" : true,
-          "path" : "PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/bookGridView.json",
-          "viewType" : "DEGRIDVIEW"
+          "path" : "PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/bookPickupTreeView.json",
+          "viewType" : "DEPICKUPTREEVIEW"
+        }
+      }, {
+        "caption" : "测试3",
+        "name" : "test3",
+        "getPSAppView" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/bookTEST2PickupTreeView.json",
+          "viewType" : "DEPICKUPTREEVIEW"
         }
       } ],
       "uniqueTag" : "bookUsr2TestMPickupView__pickupviewpanel",
+      "hideEditItem" : true,
       "modelid" : "F92082C1-2210-454A-85F8-0D597196B4BE",
       "modeltype" : "PSDEDRTAB"
     }, {
@@ -1045,7 +1054,6 @@
   "viewStyle" : "DEFAULT",
   "viewType" : "DEMPICKUPVIEW",
   "enableDP" : true,
-  "showCaptionBar" : false,
   "modelid" : "8d287946400a57a757ebe982c1d0215e",
   "modeltype" : "PSAPPDEVIEW"
 }
\ No newline at end of file

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

@@ -2581,6 +2581,12 @@
     "viewType" : "DEREDIRECTVIEW",
     "resource" : "ControlTest",
     "view" : "RedirectView"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/bookPickupTreeView.json",
+    "viewType" : "DEPICKUPTREEVIEW",
+    "resource" : "Book",
+    "view" : "PickupTreeView"
   }, {
     "modelref" : true,
     "path" : "PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/phoneUsr0301714103GridExpView.json",
@@ -2622,6 +2628,12 @@
     "viewType" : "DEGRIDVIEW",
     "resource" : "TEST",
     "view" : "GridView"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/bookTEST2PickupTreeView.json",
+    "viewType" : "DEPICKUPTREEVIEW",
+    "resource" : "Book",
+    "view" : "TEST2PickupTreeView"
   }, {
     "modelref" : true,
     "path" : "PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/bookGridView.json",

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

@@ -5645,6 +5645,10 @@
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr0526356960EditView.json",
     "viewType" : "DEEDITVIEW"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookTEST2PickupTreeView.json",
+    "viewType" : "DEPICKUPTREEVIEW"
   }, {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookCalendarView.json",

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

@@ -1018,15 +1018,24 @@
         "id" : "PICKUPVIEWPANEL"
       },
       "getPSDEDRTabPages" : [ {
-        "caption" : "书实体表格视图",
-        "name" : "test",
+        "caption" : "测试",
+        "name" : "test2",
         "getPSAppView" : {
           "modelref" : true,
-          "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookGridView.json",
-          "viewType" : "DEGRIDVIEW"
+          "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookPickupTreeView.json",
+          "viewType" : "DEPICKUPTREEVIEW"
+        }
+      }, {
+        "caption" : "测试3",
+        "name" : "test3",
+        "getPSAppView" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookTEST2PickupTreeView.json",
+          "viewType" : "DEPICKUPTREEVIEW"
         }
       } ],
       "uniqueTag" : "bookUsr2TestMPickupView__pickupviewpanel",
+      "hideEditItem" : true,
       "modelid" : "F92082C1-2210-454A-85F8-0D597196B4BE",
       "modeltype" : "PSDEDRTAB"
     }, {
@@ -1045,7 +1054,6 @@
   "viewStyle" : "DEFAULT",
   "viewType" : "DEMPICKUPVIEW",
   "enableDP" : true,
-  "showCaptionBar" : false,
   "modelid" : "f4ef890323db4a3254e56a2be539f534",
   "modeltype" : "PSAPPDEVIEW"
 }
\ No newline at end of file

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: