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

app_Web/swarm.yaml

@@ -3,7 +3,7 @@ services:
   trainsys-app-web:
     image: dstimage
     ports:
-      - "50100:80"
+      - "80:80"
     networks:
       - agent_network
     environment:

config.xml

@@ -55,15 +55,6 @@
 	  git clone -b master $para2 trainsys/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd trainsys/
-      mkdir -p /var/lib/jenkins/appcache/A3064A91-F42D-4D7F-BC1C-4173A4F5772C
-      if [ -e app_Web/.dynamic ]
-      then
-          cd app_Web
-      else
-          cd app_Web/app
-      fi
-      sed -i "s#dstimage#registry.cn-shanghai.aliyuncs.com/ibizsys/ibizcloud-standardsys-app-webapp:2022.07.29.003#g" swarm.yaml
-      docker -H $para1 stack deploy --compose-file=swarm.yaml ebsx --with-registry-auth    
       </command>
     </hudson.tasks.Shell>
   </builders>

trainsys-core/src/main/resources/liquibase/h2_table.xml

@@ -2,7 +2,7 @@
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
 
     <!--输出实体[BXD]数据结构 -->
-    <changeSet author="root" id="tab-bxd-20-1">
+    <changeSet author="root" id="tab-bxd-21-1">
         <createTable tableName="T_BXD">
                 <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
                 </column>
@@ -25,7 +25,7 @@
     </changeSet>
 
     <!--输出实体[BXDMX]数据结构 -->
-    <changeSet author="root" id="tab-bxdmx-22-2">
+    <changeSet author="root" id="tab-bxdmx-29-2">
         <createTable tableName="T_BXDMX">
                 <column name="BXDMXID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_BXDMX"/>
@@ -50,7 +50,7 @@
     </changeSet>
 
     <!--输出实体[BOOK]数据结构 -->
-    <changeSet author="root" id="tab-book-112-3">
+    <changeSet author="root" id="tab-book-114-3">
         <createTable tableName="T_BOOK">
                 <column name="BOOKNAME" remarks="" type="VARCHAR(200)">
                 </column>
@@ -150,25 +150,6 @@
         </createTable>
     </changeSet>
 
-    <!--输出实体[RAWMATERIAL]数据结构 -->
-    <changeSet author="root" id="tab-rawmaterial-19-6">
-        <createTable tableName="T_RAWMATERIAL">
-                <column name="RAWMATERIALID" remarks="" type="VARCHAR(100)">
-                    <constraints primaryKey="true" primaryKeyName="PK_RAWMATERIAL"/>
-                </column>
-                <column name="CREATEDATE" remarks="" type="DATETIME">
-                </column>
-                <column name="RAWMATERIALNAME" remarks="" type="VARCHAR(200)">
-                </column>
-                <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
-                </column>
-                <column name="UPDATEDATE" remarks="" type="DATETIME">
-                </column>
-                <column name="UPDATEMAN" remarks="" type="VARCHAR(60)">
-                </column>
-        </createTable>
-    </changeSet>
-
     <!--输出实体[REGINFO]数据结构 -->
     <changeSet author="root" id="tab-reginfo-34-7">
         <createTable tableName="T_REGINFO">
@@ -206,7 +187,7 @@
 
 
     <!--输出实体[BXDMX]外键关系 -->
-    <changeSet author="root" id="fk-bxdmx-22-8">
+    <changeSet author="root" id="fk-bxdmx-29-8">
        <addForeignKeyConstraint baseColumnNames="BXDID" baseTableName="T_BXDMX" constraintName="F821DB7B87E31B879F" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="BXDID" referencedTableName="T_BXD" validate="true"/>
     </changeSet>
 

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/RawMaterial.json

@@ -174,14 +174,6 @@
     },
     "builtinAction" : true
   } ],
-  "getAllPSDEDBConfigs" : [ {
-    "dBType" : "MYSQL5",
-    "name" : "MYSQL5",
-    "objNameCase" : "DEFAULT",
-    "standardTableName" : "`T_RAWMATERIAL`",
-    "tableName" : "T_RAWMATERIAL",
-    "valid" : true
-  } ],
   "getAllPSDEDBTables" : [ {
     "getAllPSDEFields" : [ {
       "name" : "RAWMATERIALID",

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

@@ -270,9 +270,27 @@
           "codeName" : "Field"
         },
         "getPSEditor" : {
+          "editorParams" : {
+            "SRFNAVPARAM.n_state_eq" : "1 ",
+            "bbb" : "%ccc%",
+            "SRFNAVCTX.device" : "%sv_deviceid%",
+            "aaa" : "1"
+          },
           "editorType" : "TEXTBOX",
           "maxLength" : 100,
-          "name" : "field"
+          "name" : "field",
+          "getPSNavigateContexts" : [ {
+            "key" : "DEVICE",
+            "name" : "DEVICE",
+            "value" : "sv_deviceid",
+            "rawValue" : false
+          } ],
+          "getPSNavigateParams" : [ {
+            "key" : "n_state_eq",
+            "name" : "n_state_eq",
+            "value" : "1 ",
+            "rawValue" : true
+          } ]
         },
         "getPSLayoutPos" : {
           "colMD" : 24,

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

@@ -391,9 +391,27 @@
             "codeName" : "Field"
           },
           "getPSEditor" : {
+            "editorParams" : {
+              "SRFNAVPARAM.n_state_eq" : "1 ",
+              "bbb" : "%ccc%",
+              "SRFNAVCTX.device" : "%sv_deviceid%",
+              "aaa" : "1"
+            },
             "editorType" : "TEXTBOX",
             "maxLength" : 100,
-            "name" : "field"
+            "name" : "field",
+            "getPSNavigateContexts" : [ {
+              "key" : "DEVICE",
+              "name" : "DEVICE",
+              "value" : "sv_deviceid",
+              "rawValue" : false
+            } ],
+            "getPSNavigateParams" : [ {
+              "key" : "n_state_eq",
+              "name" : "n_state_eq",
+              "value" : "1 ",
+              "rawValue" : true
+            } ]
           },
           "getPSLayoutPos" : {
             "colMD" : 24,