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

@@ -316,6 +316,9 @@
     }, {
       "name" : "BOOKCHILD5S",
       "codeName" : "Bookchild5s"
+    }, {
+      "name" : "USERID",
+      "codeName" : "UserId"
     }, {
       "name" : "BOOKNAME",
       "codeName" : "BookName"
@@ -1511,6 +1514,83 @@
     "stringLength" : 1048576,
     "valueFormat" : "%1$s",
     "queryColumn" : false
+  }, {
+    "getAllPSDEFDTColumns" : [ {
+      "columnName" : "USERID",
+      "dBType" : "MYSQL5",
+      "name" : "USERID",
+      "queryCodeExp" : "t1.`USERID`",
+      "standardColumnName" : "`USERID`"
+    } ],
+    "getAllPSDEFUIModes" : [ {
+      "codeName" : "MobileDefault",
+      "name" : "[USERID][用户标识]移动端默认",
+      "getPSDEFFormItem" : {
+        "codeName" : "MobileDefault",
+        "editorType" : "MOBTEXT",
+        "name" : "[USERID][用户标识]移动端默认",
+        "stringLength" : 100,
+        "uIMode" : "MOBILEDEFAULT",
+        "mobileMode" : true
+      },
+      "type" : "MOBILEDEFAULT",
+      "mobileMode" : true
+    }, {
+      "codeName" : "Default",
+      "name" : "[USERID][用户标识]",
+      "getPSDEFFormItem" : {
+        "codeName" : "Default",
+        "editorType" : "TEXTBOX",
+        "name" : "[USERID][用户标识]",
+        "stringLength" : 100,
+        "uIMode" : "DEFAULT"
+      },
+      "type" : "DEFAULT"
+    } ],
+    "getAllPSDEFValueRules" : [ {
+      "codeName" : "Default",
+      "name" : "默认规则",
+      "getPSDEFVRGroupCondition" : {
+        "condOp" : "AND",
+        "condType" : "GROUP",
+        "name" : "默认组",
+        "getPSDEFVRConditions" : [ {
+          "condType" : "STRINGLENGTH",
+          "dEFName" : "USERID",
+          "maxValue" : 100,
+          "name" : "默认字符串长度",
+          "ruleInfo" : "内容长度必须小于等于[100]",
+          "includeMaxValue" : true,
+          "includeMinValue" : false,
+          "keyCond" : true
+        } ],
+        "ruleInfo" : "内容长度必须小于等于[100]"
+      },
+      "ruleInfo" : "内容长度必须小于等于[100]",
+      "checkDefault" : true,
+      "defaultMode" : true,
+      "enableBackend" : true,
+      "enableFront" : true
+    } ],
+    "codeName" : "UserId",
+    "dEFType" : 1,
+    "dataType" : "TEXT",
+    "importOrder" : 1000,
+    "length" : 100,
+    "logicName" : "用户标识",
+    "name" : "USERID",
+    "getPSDEDBTable" : {
+      "modelref" : true,
+      "id" : "Table"
+    },
+    "getPSSysDBColumn" : {
+      "modelref" : true,
+      "id" : "USERID"
+    },
+    "serviceCodeName" : "UserId",
+    "stdDataType" : 25,
+    "stringLength" : 100,
+    "valueFormat" : "%1$s"
   }, {
     "getAllPSDEFDTColumns" : [ {
       "columnName" : "BOOKNAME",
@@ -6383,6 +6463,17 @@
       "sourceType" : "DEFIELD",
       "stringLength" : 1048576,
       "type" : "DTOS"
+    }, {
+      "logicName" : "用户标识",
+      "name" : "UserId",
+      "getPSDEField" : {
+        "name" : "USERID",
+        "codeName" : "UserId"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "stringLength" : 100,
+      "type" : "SIMPLE"
     }, {
       "logicName" : "书标识",
       "name" : "BookId",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Book/PSDEDATAQUERIES/Default/PSDEDQCODES/MYSQL5.json

@@ -190,7 +190,10 @@
   }, {
     "expression" : "t1.`UPDATEMAN`",
     "name" : "UPDATEMAN"
+  }, {
+    "expression" : "t1.`USERID`",
+    "name" : "USERID"
   } ],
-  "queryCode" : "SELECT\nt1.`BOOKID`,\nt1.`BOOKNAME`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DATE`,\nt1.`DEPTID`,\nt1.`END`,\nt1.`FIELD`,\nt1.`FIELD10`,\nt1.`FIELD11`,\nt1.`FIELD12`,\nt1.`FIELD13`,\nt1.`FIELD14`,\nt1.`FIELD15`,\nt1.`FIELD16`,\nt1.`FIELD17`,\nt1.`FIELD19`,\nt1.`FIELD2`,\nt1.`FIELD20`,\nt1.`FIELD21`,\nt1.`FIELD22`,\nt1.`FIELD23`,\nt1.`FIELD25`,\nt1.`FIELD26`,\nt1.`FIELD27`,\nt1.`FIELD28`,\nt1.`FIELD29`,\nt1.`FIELD3`,\nt1.`FIELD30`,\nt1.`FIELD31`,\nt1.`FIELD32`,\nt1.`FIELD33`,\nt1.`FIELD34`,\nt1.`FIELD35`,\nt1.`FIELD36`,\nt1.`FIELD37`,\nt1.`FIELD38`,\nt1.`FIELD39`,\nt1.`FIELD4`,\nt1.`FIELD40`,\nt1.`FIELD41`,\nt1.`FIELD42`,\nt1.`FIELD43`,\nt1.`FIELD44`,\nt1.`FIELD45`,\nt1.`FIELD5`,\nt1.`FIELD6`,\nt1.`FIELD7`,\nt1.`FIELD8`,\nt1.`ORGID`,\nt1.`PBOOKID`,\nt1.`PHONEID`,\nt1.`TYPE`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_BOOK` t1 \n",
+  "queryCode" : "SELECT\nt1.`BOOKID`,\nt1.`BOOKNAME`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DATE`,\nt1.`DEPTID`,\nt1.`END`,\nt1.`FIELD`,\nt1.`FIELD10`,\nt1.`FIELD11`,\nt1.`FIELD12`,\nt1.`FIELD13`,\nt1.`FIELD14`,\nt1.`FIELD15`,\nt1.`FIELD16`,\nt1.`FIELD17`,\nt1.`FIELD19`,\nt1.`FIELD2`,\nt1.`FIELD20`,\nt1.`FIELD21`,\nt1.`FIELD22`,\nt1.`FIELD23`,\nt1.`FIELD25`,\nt1.`FIELD26`,\nt1.`FIELD27`,\nt1.`FIELD28`,\nt1.`FIELD29`,\nt1.`FIELD3`,\nt1.`FIELD30`,\nt1.`FIELD31`,\nt1.`FIELD32`,\nt1.`FIELD33`,\nt1.`FIELD34`,\nt1.`FIELD35`,\nt1.`FIELD36`,\nt1.`FIELD37`,\nt1.`FIELD38`,\nt1.`FIELD39`,\nt1.`FIELD4`,\nt1.`FIELD40`,\nt1.`FIELD41`,\nt1.`FIELD42`,\nt1.`FIELD43`,\nt1.`FIELD44`,\nt1.`FIELD45`,\nt1.`FIELD5`,\nt1.`FIELD6`,\nt1.`FIELD7`,\nt1.`FIELD8`,\nt1.`ORGID`,\nt1.`PBOOKID`,\nt1.`PHONEID`,\nt1.`TYPE`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`,\nt1.`USERID`\nFROM `T_BOOK` t1 \n",
   "id" : "PSMODULES/common/PSDATAENTITIES/Book/PSDEDATAQUERIES/Default/PSDEDQCODES/MYSQL5.json"
 }
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Book/PSDEDATAQUERIES/Default2/PSDEDQCODES/MYSQL5.json

@@ -190,7 +190,10 @@
   }, {
     "expression" : "t1.`UPDATEMAN`",
     "name" : "UPDATEMAN"
+  }, {
+    "expression" : "t1.`USERID`",
+    "name" : "USERID"
   } ],
-  "queryCode" : "SELECT\nt1.`BOOKID`,\nt1.`BOOKNAME`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DATE`,\nt1.`DEPTID`,\nt1.`END`,\nt1.`FIELD`,\nt1.`FIELD10`,\nt1.`FIELD11`,\nt1.`FIELD12`,\nt1.`FIELD13`,\nt1.`FIELD14`,\nt1.`FIELD15`,\nt1.`FIELD16`,\nt1.`FIELD17`,\nt1.`FIELD19`,\nt1.`FIELD2`,\nt1.`FIELD20`,\nt1.`FIELD21`,\nt1.`FIELD22`,\nt1.`FIELD23`,\nt1.`FIELD25`,\nt1.`FIELD26`,\nt1.`FIELD27`,\nt1.`FIELD28`,\nt1.`FIELD29`,\nt1.`FIELD3`,\nt1.`FIELD30`,\nt1.`FIELD31`,\nt1.`FIELD32`,\nt1.`FIELD33`,\nt1.`FIELD34`,\nt1.`FIELD35`,\nt1.`FIELD36`,\nt1.`FIELD37`,\nt1.`FIELD38`,\nt1.`FIELD39`,\nt1.`FIELD4`,\nt1.`FIELD40`,\nt1.`FIELD41`,\nt1.`FIELD42`,\nt1.`FIELD43`,\nt1.`FIELD44`,\nt1.`FIELD45`,\nt1.`FIELD5`,\nt1.`FIELD6`,\nt1.`FIELD7`,\nt1.`FIELD8`,\nt1.`ORGID`,\nt1.`PBOOKID`,\nt1.`PHONEID`,\nt1.`TYPE`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_BOOK` t1 \n",
+  "queryCode" : "SELECT\nt1.`BOOKID`,\nt1.`BOOKNAME`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DATE`,\nt1.`DEPTID`,\nt1.`END`,\nt1.`FIELD`,\nt1.`FIELD10`,\nt1.`FIELD11`,\nt1.`FIELD12`,\nt1.`FIELD13`,\nt1.`FIELD14`,\nt1.`FIELD15`,\nt1.`FIELD16`,\nt1.`FIELD17`,\nt1.`FIELD19`,\nt1.`FIELD2`,\nt1.`FIELD20`,\nt1.`FIELD21`,\nt1.`FIELD22`,\nt1.`FIELD23`,\nt1.`FIELD25`,\nt1.`FIELD26`,\nt1.`FIELD27`,\nt1.`FIELD28`,\nt1.`FIELD29`,\nt1.`FIELD3`,\nt1.`FIELD30`,\nt1.`FIELD31`,\nt1.`FIELD32`,\nt1.`FIELD33`,\nt1.`FIELD34`,\nt1.`FIELD35`,\nt1.`FIELD36`,\nt1.`FIELD37`,\nt1.`FIELD38`,\nt1.`FIELD39`,\nt1.`FIELD4`,\nt1.`FIELD40`,\nt1.`FIELD41`,\nt1.`FIELD42`,\nt1.`FIELD43`,\nt1.`FIELD44`,\nt1.`FIELD45`,\nt1.`FIELD5`,\nt1.`FIELD6`,\nt1.`FIELD7`,\nt1.`FIELD8`,\nt1.`ORGID`,\nt1.`PBOOKID`,\nt1.`PHONEID`,\nt1.`TYPE`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`,\nt1.`USERID`\nFROM `T_BOOK` t1 \n",
   "id" : "PSMODULES/common/PSDATAENTITIES/Book/PSDEDATAQUERIES/Default2/PSDEDQCODES/MYSQL5.json"
 }
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Book/PSDEDATAQUERIES/View/PSDEDQCODES/MYSQL5.json

@@ -190,7 +190,10 @@
   }, {
     "expression" : "t1.`UPDATEMAN`",
     "name" : "UPDATEMAN"
+  }, {
+    "expression" : "t1.`USERID`",
+    "name" : "USERID"
   } ],
-  "queryCode" : "SELECT\nt1.`BOOKCHILD1S`,\nt1.`BOOKCHILD2S`,\nt1.`BOOKCHILD3S`,\nt1.`BOOKCHILD4S`,\nt1.`BOOKCHILD5S`,\nt1.`BOOKID`,\nt1.`BOOKNAME`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DATE`,\nt1.`DEPTID`,\nt1.`END`,\nt1.`FIELD`,\nt1.`FIELD10`,\nt1.`FIELD11`,\nt1.`FIELD12`,\nt1.`FIELD13`,\nt1.`FIELD14`,\nt1.`FIELD15`,\nt1.`FIELD16`,\nt1.`FIELD17`,\nt1.`FIELD18`,\nt1.`FIELD19`,\nt1.`FIELD2`,\nt1.`FIELD20`,\nt1.`FIELD21`,\nt1.`FIELD22`,\nt1.`FIELD23`,\nt1.`FIELD24`,\nt1.`FIELD25`,\nt1.`FIELD26`,\nt1.`FIELD27`,\nt1.`FIELD28`,\nt1.`FIELD29`,\nt1.`FIELD3`,\nt1.`FIELD30`,\nt1.`FIELD31`,\nt1.`FIELD32`,\nt1.`FIELD33`,\nt1.`FIELD34`,\nt1.`FIELD35`,\nt1.`FIELD36`,\nt1.`FIELD37`,\nt1.`FIELD38`,\nt1.`FIELD39`,\nt1.`FIELD4`,\nt1.`FIELD40`,\nt1.`FIELD41`,\nt1.`FIELD42`,\nt1.`FIELD43`,\nt1.`FIELD44`,\nt1.`FIELD45`,\nt1.`FIELD5`,\nt1.`FIELD6`,\nt1.`FIELD7`,\nt1.`FIELD8`,\nt1.`FIELD9`,\nt1.`ORGID`,\nt1.`PBOOKID`,\nt1.`PHONEID`,\nt1.`TYPE`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_BOOK` t1 \n",
+  "queryCode" : "SELECT\nt1.`BOOKCHILD1S`,\nt1.`BOOKCHILD2S`,\nt1.`BOOKCHILD3S`,\nt1.`BOOKCHILD4S`,\nt1.`BOOKCHILD5S`,\nt1.`BOOKID`,\nt1.`BOOKNAME`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DATE`,\nt1.`DEPTID`,\nt1.`END`,\nt1.`FIELD`,\nt1.`FIELD10`,\nt1.`FIELD11`,\nt1.`FIELD12`,\nt1.`FIELD13`,\nt1.`FIELD14`,\nt1.`FIELD15`,\nt1.`FIELD16`,\nt1.`FIELD17`,\nt1.`FIELD18`,\nt1.`FIELD19`,\nt1.`FIELD2`,\nt1.`FIELD20`,\nt1.`FIELD21`,\nt1.`FIELD22`,\nt1.`FIELD23`,\nt1.`FIELD24`,\nt1.`FIELD25`,\nt1.`FIELD26`,\nt1.`FIELD27`,\nt1.`FIELD28`,\nt1.`FIELD29`,\nt1.`FIELD3`,\nt1.`FIELD30`,\nt1.`FIELD31`,\nt1.`FIELD32`,\nt1.`FIELD33`,\nt1.`FIELD34`,\nt1.`FIELD35`,\nt1.`FIELD36`,\nt1.`FIELD37`,\nt1.`FIELD38`,\nt1.`FIELD39`,\nt1.`FIELD4`,\nt1.`FIELD40`,\nt1.`FIELD41`,\nt1.`FIELD42`,\nt1.`FIELD43`,\nt1.`FIELD44`,\nt1.`FIELD45`,\nt1.`FIELD5`,\nt1.`FIELD6`,\nt1.`FIELD7`,\nt1.`FIELD8`,\nt1.`FIELD9`,\nt1.`ORGID`,\nt1.`PBOOKID`,\nt1.`PHONEID`,\nt1.`TYPE`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`,\nt1.`USERID`\nFROM `T_BOOK` t1 \n",
   "id" : "PSMODULES/common/PSDATAENTITIES/Book/PSDEDATAQUERIES/View/PSDEDQCODES/MYSQL5.json"
 }
\ No newline at end of file

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

@@ -350,9 +350,6 @@
   }, {
     "modelref" : true,
     "path" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDEDRITEMS/DRItem234.json"
-  }, {
-    "modelref" : true,
-    "path" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDEDRITEMS/UsrDRItem0515536361.json"
   } ],
   "getAllPSDEDataImports" : [ {
     "batchSize" : 1000,
@@ -769,9 +766,6 @@
   }, {
     "modelref" : true,
     "path" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDEDATARELATIONS/DataRelation5.json"
-  }, {
-    "modelref" : true,
-    "path" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDEDATARELATIONS/DataRelation6.json"
   }, {
     "modelref" : true,
     "path" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDEDATARELATIONS/Default.json"
@@ -5052,12 +5046,6 @@
     "name" : "Edit",
     "realModelSubType" : "DEMOBEDITVIEW",
     "realModelType" : "PSDEVIEWBASE"
-  }, {
-    "codeName" : "MultiDashboardView",
-    "logicName" : "多模式数据看板",
-    "name" : "多模式数据看板",
-    "realModelSubType" : "DEPORTALVIEW",
-    "realModelType" : "PSDEVIEWBASE"
   }, {
     "codeName" : "Usr04107034PickupView",
     "logicName" : "视图消息数据选择视图",

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

@@ -1125,6 +1125,37 @@
     "name" : "BOOKCHILD5S",
     "stdDataType" : 21,
     "stringLength" : 1048576
+  }, {
+    "getAllPSAppDEFUIModes" : [ {
+      "codeName" : "MobileDefault",
+      "name" : "[USERID][用户标识]移动端默认",
+      "getPSDEFFormItem" : {
+        "codeName" : "MobileDefault",
+        "editorType" : "MOBTEXT",
+        "name" : "[USERID][用户标识]移动端默认",
+        "stringLength" : 100,
+        "uIMode" : "MOBILEDEFAULT",
+        "mobileMode" : true
+      },
+      "type" : "MOBILEDEFAULT",
+      "mobileMode" : true
+    }, {
+      "codeName" : "Default",
+      "name" : "[USERID][用户标识]",
+      "getPSDEFFormItem" : {
+        "codeName" : "Default",
+        "editorType" : "TEXTBOX",
+        "name" : "[USERID][用户标识]",
+        "stringLength" : 100,
+        "uIMode" : "DEFAULT"
+      },
+      "type" : "DEFAULT"
+    } ],
+    "codeName" : "UserId",
+    "logicName" : "用户标识",
+    "name" : "USERID",
+    "stdDataType" : 25,
+    "stringLength" : 100
   }, {
     "getAllPSAppDEFUIModes" : [ {
       "codeName" : "MobileDefault",
@@ -3129,6 +3160,17 @@
       },
       "sourceType" : "DEFIELD",
       "type" : "DTOS"
+    }, {
+      "codeName" : "UserId",
+      "logicName" : "用户标识",
+      "name" : "UserId",
+      "getPSAppDEField" : {
+        "name" : "USERID",
+        "codeName" : "UserId"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
     }, {
       "codeName" : "BookId",
       "logicName" : "书标识",

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

@@ -1125,6 +1125,37 @@
     "name" : "BOOKCHILD5S",
     "stdDataType" : 21,
     "stringLength" : 1048576
+  }, {
+    "getAllPSAppDEFUIModes" : [ {
+      "codeName" : "MobileDefault",
+      "name" : "[USERID][用户标识]移动端默认",
+      "getPSDEFFormItem" : {
+        "codeName" : "MobileDefault",
+        "editorType" : "MOBTEXT",
+        "name" : "[USERID][用户标识]移动端默认",
+        "stringLength" : 100,
+        "uIMode" : "MOBILEDEFAULT",
+        "mobileMode" : true
+      },
+      "type" : "MOBILEDEFAULT",
+      "mobileMode" : true
+    }, {
+      "codeName" : "Default",
+      "name" : "[USERID][用户标识]",
+      "getPSDEFFormItem" : {
+        "codeName" : "Default",
+        "editorType" : "TEXTBOX",
+        "name" : "[USERID][用户标识]",
+        "stringLength" : 100,
+        "uIMode" : "DEFAULT"
+      },
+      "type" : "DEFAULT"
+    } ],
+    "codeName" : "UserId",
+    "logicName" : "用户标识",
+    "name" : "USERID",
+    "stdDataType" : 25,
+    "stringLength" : 100
   }, {
     "getAllPSAppDEFUIModes" : [ {
       "codeName" : "MobileDefault",
@@ -3129,6 +3160,17 @@
       },
       "sourceType" : "DEFIELD",
       "type" : "DTOS"
+    }, {
+      "codeName" : "UserId",
+      "logicName" : "用户标识",
+      "name" : "UserId",
+      "getPSAppDEField" : {
+        "name" : "USERID",
+        "codeName" : "UserId"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
     }, {
       "codeName" : "BookId",
       "logicName" : "书标识",

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

@@ -1125,6 +1125,37 @@
     "name" : "BOOKCHILD5S",
     "stdDataType" : 21,
     "stringLength" : 1048576
+  }, {
+    "getAllPSAppDEFUIModes" : [ {
+      "codeName" : "MobileDefault",
+      "name" : "[USERID][用户标识]移动端默认",
+      "getPSDEFFormItem" : {
+        "codeName" : "MobileDefault",
+        "editorType" : "MOBTEXT",
+        "name" : "[USERID][用户标识]移动端默认",
+        "stringLength" : 100,
+        "uIMode" : "MOBILEDEFAULT",
+        "mobileMode" : true
+      },
+      "type" : "MOBILEDEFAULT",
+      "mobileMode" : true
+    }, {
+      "codeName" : "Default",
+      "name" : "[USERID][用户标识]",
+      "getPSDEFFormItem" : {
+        "codeName" : "Default",
+        "editorType" : "TEXTBOX",
+        "name" : "[USERID][用户标识]",
+        "stringLength" : 100,
+        "uIMode" : "DEFAULT"
+      },
+      "type" : "DEFAULT"
+    } ],
+    "codeName" : "UserId",
+    "logicName" : "用户标识",
+    "name" : "USERID",
+    "stdDataType" : 25,
+    "stringLength" : 100
   }, {
     "getAllPSAppDEFUIModes" : [ {
       "codeName" : "MobileDefault",
@@ -3129,6 +3160,17 @@
       },
       "sourceType" : "DEFIELD",
       "type" : "DTOS"
+    }, {
+      "codeName" : "UserId",
+      "logicName" : "用户标识",
+      "name" : "UserId",
+      "getPSAppDEField" : {
+        "name" : "USERID",
+        "codeName" : "UserId"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
     }, {
       "codeName" : "BookId",
       "logicName" : "书标识",

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

@@ -3286,10 +3286,6 @@
     "ungroup" : false
   } ],
   "getAllPSAppViews" : [ {
-    "modelref" : true,
-    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/phoneMultiDashboardView.json",
-    "viewType" : "DEPORTALVIEW"
-  }, {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/phoneUsr0321702002CustomView.json",
     "viewType" : "DECUSTOMVIEW"

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone/PSDASHBOARDS/Dashboard.json

@@ -8,10 +8,6 @@
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone.json"
   },
-  "getPSAppDynaDashboardUtil" : {
-    "modelref" : true,
-    "id" : "dynadashboard"
-  },
   "getPSLayout" : {
     "childColLG" : -1,
     "childColMD" : 24,
@@ -21,7 +17,7 @@
     "layout" : "TABLE_24COL"
   },
   "getPSControls" : [ {
-    "codeName" : "MultiDashboardViewdashboard_container1",
+    "codeName" : "DashboardView9dashboard_container1",
     "controlType" : "PORTLET",
     "name" : "dashboard_container1",
     "getPSAppDataEntity" : {
@@ -46,7 +42,7 @@
       "layout" : "TABLE_24COL"
     },
     "getPSControls" : [ {
-      "codeName" : "MultiDashboardViewdashboard_container2",
+      "codeName" : "DashboardView9dashboard_container2",
       "controlType" : "PORTLET",
       "height" : 100.0,
       "name" : "dashboard_container2",
@@ -81,7 +77,7 @@
         "widthMode" : "PX"
       },
       "getPSControls" : [ {
-        "codeName" : "MultiDashboardViewdashboard_rawitem1",
+        "codeName" : "DashboardView9dashboard_rawitem1",
         "contentType" : "RAW",
         "controlType" : "PORTLET",
         "name" : "dashboard_rawitem1",
@@ -114,7 +110,7 @@
       "width" : 100.0,
       "showTitleBar" : true
     }, {
-      "codeName" : "MultiDashboardViewdashboard_container3",
+      "codeName" : "DashboardView9dashboard_container3",
       "controlType" : "PORTLET",
       "name" : "dashboard_container3",
       "getPSAppDataEntity" : {
@@ -145,7 +141,7 @@
         "widthMode" : "PX"
       },
       "getPSControls" : [ {
-        "codeName" : "MultiDashboardViewdashboard_rawitem2",
+        "codeName" : "DashboardView9dashboard_rawitem2",
         "contentType" : "HTML",
         "controlType" : "PORTLET",
         "htmlContent" : "<p>&lt;div&gt;11111111&lt;/div&gt;</p>",
@@ -1930,7 +1926,7 @@
       "showBusyIndicator" : true
     },
     "getPSControls" : [ {
-      "codeName" : "MultiDashboardViewdashboard_sysportlet3_toolbar",
+      "codeName" : "DashboardView9dashboard_sysportlet3_toolbar",
       "controlType" : "TOOLBAR",
       "logicName" : "门户工具栏",
       "name" : "dashboard_sysportlet3_toolbar",
@@ -2512,7 +2508,7 @@
     "modelid" : "270E66C1-B640-48DA-BEA7-1C572AF6B44A",
     "modeltype" : "PSSYSDBPART"
   } ],
-  "enableCustomized" : true,
-  "modelid" : "0dd1bd5beaff72388b8bf61a1d5afebe",
+  "enableCustomized" : false,
+  "modelid" : "cc62e9f4bef7c39cac778773b136bb50",
   "modeltype" : "PSSYSDASHBOARD"
 }
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSCHARTS/Usr0301355514.json

@@ -18,7 +18,7 @@
       "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
     }
   },
-  "height" : 300.0,
+  "hookEventNames" : [ "SELECTIONCHANGE", "LOAD" ],
   "logicName" : "Chart3",
   "getPSAppDataEntity" : {
     "modelref" : true,
@@ -143,6 +143,17 @@
     "type" : "numeric",
     "id" : "0"
   } ],
+  "getPSControlLogics" : [ {
+    "eventNames" : "SELECTIONCHANGE",
+    "logicTag" : "chartexpbar_chart",
+    "logicType" : "CUSTOM",
+    "name" : "chartexpbar_selectionchange"
+  }, {
+    "eventNames" : "LOAD",
+    "logicTag" : "chartexpbar_chart",
+    "logicType" : "CUSTOM",
+    "name" : "chartexpbar_load"
+  } ],
   "getPSDEChartDataGrid" : {
     "index" : 0,
     "showDataGrid" : true,

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

@@ -38,6 +38,7 @@
       "autoLoad" : true,
       "showBusyIndicator" : true,
       "ctrlParams" : {
+        "MULTIMODE" : "true",
         "CATEGORYTAG" : "view"
       },
       "id" : "DASHBOARD"

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

@@ -1228,28 +1228,6 @@
           "layout" : "TABLE_24COL"
         },
         "tooltip" : "数据看板视图（部件）"
-      }, {
-        "accUserMode" : 2,
-        "caption" : "数据看板（多模式）",
-        "itemType" : "MENUITEM",
-        "name" : "menuitem285",
-        "getPSAppFunc" : {
-          "modelref" : true,
-          "id" : "UsrAppFunc0515409812"
-        },
-        "getPSLayout" : {
-          "childColLG" : -1,
-          "childColMD" : 24,
-          "childColSM" : -1,
-          "childColXS" : -1,
-          "columnCount" : 24,
-          "layout" : "TABLE_24COL"
-        },
-        "getPSLayoutPos" : {
-          "colMD" : 24,
-          "layout" : "TABLE_24COL"
-        },
-        "tooltip" : "数据看板（多模式）"
       }, {
         "accUserMode" : 2,
         "caption" : "选项操作",

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

@@ -548,16 +548,6 @@
         "id" : "AppFunc40"
       },
       "tooltip" : "数据看板视图（部件）"
-    }, {
-      "accUserMode" : 2,
-      "caption" : "数据看板（多模式）",
-      "itemType" : "MENUITEM",
-      "name" : "menuitem285",
-      "getPSAppFunc" : {
-        "modelref" : true,
-        "id" : "UsrAppFunc0515409812"
-      },
-      "tooltip" : "数据看板（多模式）"
     }, {
       "accUserMode" : 2,
       "caption" : "选项操作",

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

@@ -434,16 +434,6 @@
     "refMode" : "CONTROL",
     "refTag" : "DRBAR",
     "runtimeObject" : true
-  }, {
-    "name" : "多模式仪表盘",
-    "getPSSysPFPlugin" : {
-      "pluginType" : "VIEW_CUSTOM",
-      "pluginCode" : "MULTI_DASHBOARD"
-    },
-    "pluginCode" : "MULTI_DASHBOARD",
-    "pluginType" : "VIEW_CUSTOM",
-    "refMode" : "APPVIEW",
-    "refTag" : "DEPORTALVIEW"
   }, {
     "name" : "实体方法Delete插件",
     "getPSSysPFPlugin" : {

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSDBSCHEMES/DEFAULT.json

@@ -442,6 +442,13 @@
       "name" : "UPDATEMAN",
       "stdDataType" : 25,
       "nullable" : true
+    }, {
+      "codeName" : "USERID",
+      "length" : 100,
+      "logicName" : "用户标识",
+      "name" : "USERID",
+      "stdDataType" : 25,
+      "nullable" : true
     } ],
     "getAllPSSysDBIndices" : [ {
       "getAllPSSysDBIndexColumns" : [ {

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSSERVICEAPIS/TrainSys.json

@@ -10409,6 +10409,19 @@
       "enableModify" : true,
       "keyField" : false,
       "majorField" : false
+    }, {
+      "codeName" : "UserId",
+      "codeName2" : "UserId",
+      "logicName" : "用户标识",
+      "name" : "USERID",
+      "orderValue" : 360,
+      "stdDataType" : 25,
+      "stringLength" : 100,
+      "allowEmpty" : true,
+      "enableCreate" : true,
+      "enableModify" : true,
+      "keyField" : false,
+      "majorField" : false
     }, {
       "codeName" : "BookName",
       "codeName2" : "BookName",

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: