提交 6a55311f 编写于 作者: ibizdev's avatar ibizdev

lxm1993 发布系统代码 [TrainSys,网页端]

上级 43c58f37
...@@ -55,12 +55,6 @@ ...@@ -55,12 +55,6 @@
git clone -b master $para2 trainsys/ git clone -b master $para2 trainsys/
export NODE_OPTIONS=--max-old-space-size=4096 export NODE_OPTIONS=--max-old-space-size=4096
cd trainsys/ 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> </command>
</hudson.tasks.Shell> </hudson.tasks.Shell>
</builders> </builders>
......
...@@ -223,6 +223,9 @@ ...@@ -223,6 +223,9 @@
}, { }, {
"name" : "NUMBER4", "name" : "NUMBER4",
"codeName" : "Number4" "codeName" : "Number4"
}, {
"name" : "ORDER",
"codeName" : "Order"
}, { }, {
"name" : "CREATEDATE", "name" : "CREATEDATE",
"codeName" : "CreateDate" "codeName" : "CreateDate"
...@@ -763,6 +766,68 @@ ...@@ -763,6 +766,68 @@
"serviceCodeName" : "Number4", "serviceCodeName" : "Number4",
"stdDataType" : 9, "stdDataType" : 9,
"valueFormat" : "%1$s" "valueFormat" : "%1$s"
}, {
"getAllPSDEFDTColumns" : [ {
"columnName" : "ORDER",
"dBType" : "MYSQL5",
"name" : "ORDER",
"queryCodeExp" : "t1.`ORDER`",
"standardColumnName" : "`ORDER`"
} ],
"getAllPSDEFUIModes" : [ {
"codeName" : "MobileDefault",
"name" : "[ORDER][排序属性]移动端默认",
"getPSDEFFormItem" : {
"codeName" : "MobileDefault",
"editorType" : "MOBTEXT",
"name" : "[ORDER][排序属性]移动端默认",
"uIMode" : "MOBILEDEFAULT",
"mobileMode" : true
},
"type" : "MOBILEDEFAULT",
"mobileMode" : true
}, {
"codeName" : "Default",
"name" : "[ORDER][排序属性]",
"getPSDEFFormItem" : {
"codeName" : "Default",
"editorType" : "TEXTBOX",
"name" : "[ORDER][排序属性]",
"uIMode" : "DEFAULT"
},
"type" : "DEFAULT"
} ],
"getAllPSDEFValueRules" : [ {
"codeName" : "Default",
"name" : "默认规则",
"getPSDEFVRGroupCondition" : {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "默认组"
},
"ruleInfo" : "默认规则",
"checkDefault" : true,
"defaultMode" : true,
"enableBackend" : true,
"enableFront" : true
} ],
"codeName" : "Order",
"dEFType" : 1,
"dataType" : "INT",
"importOrder" : 1000,
"logicName" : "排序属性",
"name" : "ORDER",
"getPSDEDBTable" : {
"modelref" : true,
"id" : "Table"
},
"getPSSysDBColumn" : {
"modelref" : true,
"id" : "ORDER"
},
"serviceCodeName" : "Order",
"stdDataType" : 9,
"valueFormat" : "%1$s"
}, { }, {
"getAllPSDEFDTColumns" : [ { "getAllPSDEFDTColumns" : [ {
"columnName" : "CREATEDATE", "columnName" : "CREATEDATE",
...@@ -3192,6 +3257,16 @@ ...@@ -3192,6 +3257,16 @@
"sourceType" : "DEFIELD", "sourceType" : "DEFIELD",
"stdDataType" : 9, "stdDataType" : 9,
"type" : "SIMPLE" "type" : "SIMPLE"
}, {
"logicName" : "排序属性",
"name" : "Order",
"getPSDEField" : {
"name" : "ORDER",
"codeName" : "Order"
},
"sourceType" : "DEFIELD",
"stdDataType" : 9,
"type" : "SIMPLE"
}, { }, {
"logicName" : "金额", "logicName" : "金额",
"name" : "Amount", "name" : "Amount",
......
...@@ -58,6 +58,9 @@ ...@@ -58,6 +58,9 @@
}, { }, {
"expression" : "t1.`NUMBER4`", "expression" : "t1.`NUMBER4`",
"name" : "NUMBER4" "name" : "NUMBER4"
}, {
"expression" : "t1.`ORDER`",
"name" : "ORDER"
}, { }, {
"expression" : "t1.`TESTID`", "expression" : "t1.`TESTID`",
"name" : "TESTID" "name" : "TESTID"
...@@ -74,6 +77,6 @@ ...@@ -74,6 +77,6 @@
"expression" : "t1.`UPDATEMAN`", "expression" : "t1.`UPDATEMAN`",
"name" : "UPDATEMAN" "name" : "UPDATEMAN"
} ], } ],
"queryCode" : "SELECT\nt1.`AMOUNT`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`FIELD`,\nt1.`FIELD10`,\nt1.`FIELD11`,\nt1.`FIELD12`,\nt1.`FIELD2`,\nt1.`FIELD3`,\nt1.`FIELD4`,\nt1.`FIELD5`,\nt1.`FIELD6`,\nt1.`FIELD7`,\nt1.`FIELD8`,\nt1.`FIELD9`,\nt1.`NUMBER1`,\nt1.`NUMBER2`,\nt1.`NUMBER3`,\nt1.`NUMBER4`,\nt1.`TESTID`,\nt1.`TESTNAME`,\nt1.`TYPE`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_TEST` t1 \n", "queryCode" : "SELECT\nt1.`AMOUNT`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`FIELD`,\nt1.`FIELD10`,\nt1.`FIELD11`,\nt1.`FIELD12`,\nt1.`FIELD2`,\nt1.`FIELD3`,\nt1.`FIELD4`,\nt1.`FIELD5`,\nt1.`FIELD6`,\nt1.`FIELD7`,\nt1.`FIELD8`,\nt1.`FIELD9`,\nt1.`NUMBER1`,\nt1.`NUMBER2`,\nt1.`NUMBER3`,\nt1.`NUMBER4`,\nt1.`ORDER`,\nt1.`TESTID`,\nt1.`TESTNAME`,\nt1.`TYPE`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_TEST` t1 \n",
"id" : "PSMODULES/Test/PSDATAENTITIES/TEST/PSDEDATAQUERIES/Default/PSDEDQCODES/MYSQL5.json" "id" : "PSMODULES/Test/PSDATAENTITIES/TEST/PSDEDATAQUERIES/Default/PSDEDQCODES/MYSQL5.json"
} }
\ No newline at end of file
...@@ -58,6 +58,9 @@ ...@@ -58,6 +58,9 @@
}, { }, {
"expression" : "t1.`NUMBER4`", "expression" : "t1.`NUMBER4`",
"name" : "NUMBER4" "name" : "NUMBER4"
}, {
"expression" : "t1.`ORDER`",
"name" : "ORDER"
}, { }, {
"expression" : "t1.`TESTID`", "expression" : "t1.`TESTID`",
"name" : "TESTID" "name" : "TESTID"
...@@ -74,6 +77,6 @@ ...@@ -74,6 +77,6 @@
"expression" : "t1.`UPDATEMAN`", "expression" : "t1.`UPDATEMAN`",
"name" : "UPDATEMAN" "name" : "UPDATEMAN"
} ], } ],
"queryCode" : "SELECT\nt1.`AMOUNT`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`FIELD`,\nt1.`FIELD10`,\nt1.`FIELD11`,\nt1.`FIELD12`,\nt1.`FIELD2`,\nt1.`FIELD3`,\nt1.`FIELD4`,\nt1.`FIELD5`,\nt1.`FIELD6`,\nt1.`FIELD7`,\nt1.`FIELD8`,\nt1.`FIELD9`,\nt1.`NUMBER1`,\nt1.`NUMBER2`,\nt1.`NUMBER3`,\nt1.`NUMBER4`,\nt1.`TESTID`,\nt1.`TESTNAME`,\nt1.`TYPE`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_TEST` t1 \n", "queryCode" : "SELECT\nt1.`AMOUNT`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`FIELD`,\nt1.`FIELD10`,\nt1.`FIELD11`,\nt1.`FIELD12`,\nt1.`FIELD2`,\nt1.`FIELD3`,\nt1.`FIELD4`,\nt1.`FIELD5`,\nt1.`FIELD6`,\nt1.`FIELD7`,\nt1.`FIELD8`,\nt1.`FIELD9`,\nt1.`NUMBER1`,\nt1.`NUMBER2`,\nt1.`NUMBER3`,\nt1.`NUMBER4`,\nt1.`ORDER`,\nt1.`TESTID`,\nt1.`TESTNAME`,\nt1.`TYPE`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_TEST` t1 \n",
"id" : "PSMODULES/Test/PSDATAENTITIES/TEST/PSDEDATAQUERIES/View/PSDEDQCODES/MYSQL5.json" "id" : "PSMODULES/Test/PSDATAENTITIES/TEST/PSDEDATAQUERIES/View/PSDEDQCODES/MYSQL5.json"
} }
\ No newline at end of file
...@@ -700,8 +700,10 @@ ...@@ -700,8 +700,10 @@
"showstops" : "true" "showstops" : "true"
}, },
"editorType" : "MOBSLIDER", "editorType" : "MOBSLIDER",
"maxValue" : 200.0,
"minValue" : 0.0,
"name" : "field26", "name" : "field26",
"stepValue" : 1.0 "stepValue" : 2.0
}, },
"getPSLayoutPos" : { "getPSLayoutPos" : {
"colMD" : 24, "colMD" : 24,
...@@ -733,8 +735,11 @@ ...@@ -733,8 +735,11 @@
"stepvalue" : "2" "stepvalue" : "2"
}, },
"editorType" : "MOBSTEPPER", "editorType" : "MOBSTEPPER",
"maxValue" : 30.0,
"minValue" : -10.0,
"name" : "field11", "name" : "field11",
"stepValue" : 1.0 "precision" : 2,
"stepValue" : 2.0
}, },
"getPSLayoutPos" : { "getPSLayoutPos" : {
"colMD" : 24, "colMD" : 24,
...@@ -766,7 +771,7 @@ ...@@ -766,7 +771,7 @@
"texts" : "['Extremely bad', 'Disappointed', 'Fair', 'Satisfied', 'Surprise']" "texts" : "['Extremely bad', 'Disappointed', 'Fair', 'Satisfied', 'Surprise']"
}, },
"editorType" : "MOBRATING", "editorType" : "MOBRATING",
"maxValue" : 5.0, "maxValue" : 10.0,
"minValue" : 0.0, "minValue" : 0.0,
"name" : "field39", "name" : "field39",
"stepValue" : 1.0 "stepValue" : 1.0
...@@ -1361,7 +1366,8 @@ ...@@ -1361,7 +1366,8 @@
"name" : "formitem30" "name" : "formitem30"
}, { }, {
"name" : "formitem31" "name" : "formitem31"
} ] } ],
"valueSeparator" : "/"
}, },
"getPSLayoutPos" : { "getPSLayoutPos" : {
"colMD" : 24, "colMD" : 24,
......
...@@ -535,6 +535,34 @@ ...@@ -535,6 +535,34 @@
"logicName" : "数值4", "logicName" : "数值4",
"name" : "NUMBER4", "name" : "NUMBER4",
"stdDataType" : 9 "stdDataType" : 9
}, {
"getAllPSAppDEFUIModes" : [ {
"codeName" : "MobileDefault",
"name" : "[ORDER][排序属性]移动端默认",
"getPSDEFFormItem" : {
"codeName" : "MobileDefault",
"editorType" : "MOBTEXT",
"name" : "[ORDER][排序属性]移动端默认",
"uIMode" : "MOBILEDEFAULT",
"mobileMode" : true
},
"type" : "MOBILEDEFAULT",
"mobileMode" : true
}, {
"codeName" : "Default",
"name" : "[ORDER][排序属性]",
"getPSDEFFormItem" : {
"codeName" : "Default",
"editorType" : "TEXTBOX",
"name" : "[ORDER][排序属性]",
"uIMode" : "DEFAULT"
},
"type" : "DEFAULT"
} ],
"codeName" : "Order",
"logicName" : "排序属性",
"name" : "ORDER",
"stdDataType" : 9
}, { }, {
"getAllPSAppDEFUIModes" : [ { "getAllPSAppDEFUIModes" : [ {
"codeName" : "MobileDefault", "codeName" : "MobileDefault",
...@@ -1890,6 +1918,17 @@ ...@@ -1890,6 +1918,17 @@
"sourceType" : "DEFIELD", "sourceType" : "DEFIELD",
"stdDataType" : 9, "stdDataType" : 9,
"type" : "SIMPLE" "type" : "SIMPLE"
}, {
"codeName" : "Order",
"logicName" : "排序属性",
"name" : "Order",
"getPSAppDEField" : {
"name" : "ORDER",
"codeName" : "Order"
},
"sourceType" : "DEFIELD",
"stdDataType" : 9,
"type" : "SIMPLE"
}, { }, {
"codeName" : "Amount", "codeName" : "Amount",
"logicName" : "金额", "logicName" : "金额",
......
...@@ -803,8 +803,10 @@ ...@@ -803,8 +803,10 @@
"showstops" : "true" "showstops" : "true"
}, },
"editorType" : "MOBSLIDER", "editorType" : "MOBSLIDER",
"maxValue" : 200.0,
"minValue" : 0.0,
"name" : "field26", "name" : "field26",
"stepValue" : 1.0 "stepValue" : 2.0
}, },
"getPSLayoutPos" : { "getPSLayoutPos" : {
"colMD" : 24, "colMD" : 24,
...@@ -836,8 +838,11 @@ ...@@ -836,8 +838,11 @@
"stepvalue" : "2" "stepvalue" : "2"
}, },
"editorType" : "MOBSTEPPER", "editorType" : "MOBSTEPPER",
"maxValue" : 30.0,
"minValue" : -10.0,
"name" : "field11", "name" : "field11",
"stepValue" : 1.0 "precision" : 2,
"stepValue" : 2.0
}, },
"getPSLayoutPos" : { "getPSLayoutPos" : {
"colMD" : 24, "colMD" : 24,
...@@ -869,7 +874,7 @@ ...@@ -869,7 +874,7 @@
"texts" : "['Extremely bad', 'Disappointed', 'Fair', 'Satisfied', 'Surprise']" "texts" : "['Extremely bad', 'Disappointed', 'Fair', 'Satisfied', 'Surprise']"
}, },
"editorType" : "MOBRATING", "editorType" : "MOBRATING",
"maxValue" : 5.0, "maxValue" : 10.0,
"minValue" : 0.0, "minValue" : 0.0,
"name" : "field39", "name" : "field39",
"stepValue" : 1.0 "stepValue" : 1.0
...@@ -1464,7 +1469,8 @@ ...@@ -1464,7 +1469,8 @@
"name" : "formitem30" "name" : "formitem30"
}, { }, {
"name" : "formitem31" "name" : "formitem31"
} ] } ],
"valueSeparator" : "/"
}, },
"getPSLayoutPos" : { "getPSLayoutPos" : {
"colMD" : 24, "colMD" : 24,
......
...@@ -13366,8 +13366,10 @@ ...@@ -13366,8 +13366,10 @@
"showstops" : "true" "showstops" : "true"
}, },
"editorType" : "MOBSLIDER", "editorType" : "MOBSLIDER",
"maxValue" : 200.0,
"minValue" : 0.0,
"name" : "field26", "name" : "field26",
"stepValue" : 1.0 "stepValue" : 2.0
}, },
"getPSLayoutPos" : { "getPSLayoutPos" : {
"colMD" : 24, "colMD" : 24,
...@@ -13399,8 +13401,11 @@ ...@@ -13399,8 +13401,11 @@
"stepvalue" : "2" "stepvalue" : "2"
}, },
"editorType" : "MOBSTEPPER", "editorType" : "MOBSTEPPER",
"maxValue" : 30.0,
"minValue" : -10.0,
"name" : "field11", "name" : "field11",
"stepValue" : 1.0 "precision" : 2,
"stepValue" : 2.0
}, },
"getPSLayoutPos" : { "getPSLayoutPos" : {
"colMD" : 24, "colMD" : 24,
...@@ -13432,7 +13437,7 @@ ...@@ -13432,7 +13437,7 @@
"texts" : "['Extremely bad', 'Disappointed', 'Fair', 'Satisfied', 'Surprise']" "texts" : "['Extremely bad', 'Disappointed', 'Fair', 'Satisfied', 'Surprise']"
}, },
"editorType" : "MOBRATING", "editorType" : "MOBRATING",
"maxValue" : 5.0, "maxValue" : 10.0,
"minValue" : 0.0, "minValue" : 0.0,
"name" : "field39", "name" : "field39",
"stepValue" : 1.0 "stepValue" : 1.0
...@@ -14027,7 +14032,8 @@ ...@@ -14027,7 +14032,8 @@
"name" : "formitem30" "name" : "formitem30"
}, { }, {
"name" : "formitem31" "name" : "formitem31"
} ] } ],
"valueSeparator" : "/"
}, },
"getPSLayoutPos" : { "getPSLayoutPos" : {
"colMD" : 24, "colMD" : 24,
...@@ -16248,6 +16254,34 @@ ...@@ -16248,6 +16254,34 @@
"logicName" : "数值4", "logicName" : "数值4",
"name" : "NUMBER4", "name" : "NUMBER4",
"stdDataType" : 9 "stdDataType" : 9
}, {
"getAllPSAppDEFUIModes" : [ {
"codeName" : "MobileDefault",
"name" : "[ORDER][排序属性]移动端默认",
"getPSDEFFormItem" : {
"codeName" : "MobileDefault",
"editorType" : "MOBTEXT",
"name" : "[ORDER][排序属性]移动端默认",
"uIMode" : "MOBILEDEFAULT",
"mobileMode" : true
},
"type" : "MOBILEDEFAULT",
"mobileMode" : true
}, {
"codeName" : "Default",
"name" : "[ORDER][排序属性]",
"getPSDEFFormItem" : {
"codeName" : "Default",
"editorType" : "TEXTBOX",
"name" : "[ORDER][排序属性]",
"uIMode" : "DEFAULT"
},
"type" : "DEFAULT"
} ],
"codeName" : "Order",
"logicName" : "排序属性",
"name" : "ORDER",
"stdDataType" : 9
}, { }, {
"getAllPSAppDEFUIModes" : [ { "getAllPSAppDEFUIModes" : [ {
"codeName" : "MobileDefault", "codeName" : "MobileDefault",
...@@ -17603,6 +17637,17 @@ ...@@ -17603,6 +17637,17 @@
"sourceType" : "DEFIELD", "sourceType" : "DEFIELD",
"stdDataType" : 9, "stdDataType" : 9,
"type" : "SIMPLE" "type" : "SIMPLE"
}, {
"codeName" : "Order",
"logicName" : "排序属性",
"name" : "Order",
"getPSAppDEField" : {
"name" : "ORDER",
"codeName" : "Order"
},
"sourceType" : "DEFIELD",
"stdDataType" : 9,
"type" : "SIMPLE"
}, { }, {
"codeName" : "Amount", "codeName" : "Amount",
"logicName" : "金额", "logicName" : "金额",
...@@ -535,6 +535,34 @@ ...@@ -535,6 +535,34 @@
"logicName" : "数值4", "logicName" : "数值4",
"name" : "NUMBER4", "name" : "NUMBER4",
"stdDataType" : 9 "stdDataType" : 9
}, {
"getAllPSAppDEFUIModes" : [ {
"codeName" : "MobileDefault",
"name" : "[ORDER][排序属性]移动端默认",
"getPSDEFFormItem" : {
"codeName" : "MobileDefault",
"editorType" : "MOBTEXT",
"name" : "[ORDER][排序属性]移动端默认",
"uIMode" : "MOBILEDEFAULT",
"mobileMode" : true
},
"type" : "MOBILEDEFAULT",
"mobileMode" : true
}, {
"codeName" : "Default",
"name" : "[ORDER][排序属性]",
"getPSDEFFormItem" : {
"codeName" : "Default",
"editorType" : "TEXTBOX",
"name" : "[ORDER][排序属性]",
"uIMode" : "DEFAULT"
},
"type" : "DEFAULT"
} ],
"codeName" : "Order",
"logicName" : "排序属性",
"name" : "ORDER",
"stdDataType" : 9
}, { }, {
"getAllPSAppDEFUIModes" : [ { "getAllPSAppDEFUIModes" : [ {
"codeName" : "MobileDefault", "codeName" : "MobileDefault",
...@@ -1890,6 +1918,17 @@ ...@@ -1890,6 +1918,17 @@
"sourceType" : "DEFIELD", "sourceType" : "DEFIELD",
"stdDataType" : 9, "stdDataType" : 9,
"type" : "SIMPLE" "type" : "SIMPLE"
}, {
"codeName" : "Order",
"logicName" : "排序属性",
"name" : "Order",
"getPSAppDEField" : {
"name" : "ORDER",
"codeName" : "Order"
},
"sourceType" : "DEFIELD",
"stdDataType" : 9,
"type" : "SIMPLE"
}, { }, {
"codeName" : "Amount", "codeName" : "Amount",
"logicName" : "金额", "logicName" : "金额",
......
...@@ -1309,16 +1309,16 @@ ...@@ -1309,16 +1309,16 @@
"codeName" : "VMGroup2", "codeName" : "VMGroup2",
"name" : "视图消息组2", "name" : "视图消息组2",
"getPSAppViewMsgGroupDetails" : [ { "getPSAppViewMsgGroupDetails" : [ {
"name" : "视图消息2", "name" : "视图消息",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg3" "id" : "ViewMsg2"
} }
}, { }, {
"name" : "视图消息", "name" : "视图消息2",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg2" "id" : "ViewMsg3"
} }
} ] } ]
}, { }, {
......
...@@ -1108,8 +1108,11 @@ ...@@ -1108,8 +1108,11 @@
"stepvalue" : "2" "stepvalue" : "2"
}, },
"editorType" : "STEPPER", "editorType" : "STEPPER",
"maxValue" : 30.0,
"minValue" : -10.0,
"name" : "formitem3", "name" : "formitem3",
"stepValue" : 1.0 "precision" : 2,
"stepValue" : 2.0
}, },
"getPSLayoutPos" : { "getPSLayoutPos" : {
"colMD" : 24, "colMD" : 24,
...@@ -1137,7 +1140,7 @@ ...@@ -1137,7 +1140,7 @@
"texts" : "['Extremely bad', 'Disappointed', 'Fair', 'Satisfied', 'Surprise']" "texts" : "['Extremely bad', 'Disappointed', 'Fair', 'Satisfied', 'Surprise']"
}, },
"editorType" : "RATING", "editorType" : "RATING",
"maxValue" : 5.0, "maxValue" : 10.0,
"minValue" : 0.0, "minValue" : 0.0,
"name" : "formitem4", "name" : "formitem4",
"stepValue" : 1.0 "stepValue" : 1.0
...@@ -1168,8 +1171,10 @@ ...@@ -1168,8 +1171,10 @@
"showstops" : "true" "showstops" : "true"
}, },
"editorType" : "SLIDER", "editorType" : "SLIDER",
"maxValue" : 200.0,
"minValue" : 0.0,
"name" : "formitem5", "name" : "formitem5",
"stepValue" : 1.0 "stepValue" : 2.0
}, },
"getPSLayoutPos" : { "getPSLayoutPos" : {
"colMD" : 24, "colMD" : 24,
...@@ -2836,7 +2841,8 @@ ...@@ -2836,7 +2841,8 @@
"name" : "formitem9" "name" : "formitem9"
}, { }, {
"name" : "formitem10" "name" : "formitem10"
} ] } ],
"valueSeparator" : "/"
}, },
"getPSLayoutPos" : { "getPSLayoutPos" : {
"colMD" : 24, "colMD" : 24,
......
...@@ -535,6 +535,34 @@ ...@@ -535,6 +535,34 @@
"logicName" : "数值4", "logicName" : "数值4",
"name" : "NUMBER4", "name" : "NUMBER4",
"stdDataType" : 9 "stdDataType" : 9
}, {
"getAllPSAppDEFUIModes" : [ {
"codeName" : "MobileDefault",
"name" : "[ORDER][排序属性]移动端默认",
"getPSDEFFormItem" : {
"codeName" : "MobileDefault",
"editorType" : "MOBTEXT",
"name" : "[ORDER][排序属性]移动端默认",
"uIMode" : "MOBILEDEFAULT",
"mobileMode" : true
},
"type" : "MOBILEDEFAULT",
"mobileMode" : true
}, {
"codeName" : "Default",
"name" : "[ORDER][排序属性]",
"getPSDEFFormItem" : {
"codeName" : "Default",
"editorType" : "TEXTBOX",
"name" : "[ORDER][排序属性]",
"uIMode" : "DEFAULT"
},
"type" : "DEFAULT"
} ],
"codeName" : "Order",
"logicName" : "排序属性",
"name" : "ORDER",
"stdDataType" : 9
}, { }, {
"getAllPSAppDEFUIModes" : [ { "getAllPSAppDEFUIModes" : [ {
"codeName" : "MobileDefault", "codeName" : "MobileDefault",
...@@ -1890,6 +1918,17 @@ ...@@ -1890,6 +1918,17 @@
"sourceType" : "DEFIELD", "sourceType" : "DEFIELD",
"stdDataType" : 9, "stdDataType" : 9,
"type" : "SIMPLE" "type" : "SIMPLE"
}, {
"codeName" : "Order",
"logicName" : "排序属性",
"name" : "Order",
"getPSAppDEField" : {
"name" : "ORDER",
"codeName" : "Order"
},
"sourceType" : "DEFIELD",
"stdDataType" : 9,
"type" : "SIMPLE"
}, { }, {
"codeName" : "Amount", "codeName" : "Amount",
"logicName" : "金额", "logicName" : "金额",
......
...@@ -21,11 +21,94 @@ ...@@ -21,11 +21,94 @@
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json" "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
}, },
"getPSChartCoordinateSystems" : [ {
"eChartsType" : "cartesian2d",
"index" : 0,
"name" : "[bar_0]直角坐标系[0]",
"getPSChartGrid" : {
"index" : 0,
"name" : "[bar_0]直角坐标系[0]",
"getPSChartCoordinateSystem" : {
"modelref" : true,
"id" : "0"
},
"type" : "grid",
"id" : "0"
},
"type" : "XY",
"id" : "0"
} ],
"getPSChartDataSetGroups" : [ {
"index" : 0,
"name" : "DEFAULT",
"getPSAppDEDataSet" : {
"modelref" : true,
"id" : "FetchDefault"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
},
"id" : "0"
} ],
"getPSChartDataSets" : [ {
"index" : 0,
"name" : "bar_0-DEFAULT",
"getPSChartDataSetFields" : [ {
"index" : 0,
"name" : "AMOUNT",
"groupField" : true,
"id" : "0"
}, {
"index" : 1,
"name" : "TYPE",
"groupField" : true,
"id" : "1"
} ],
"id" : "0"
} ],
"getPSChartGrids" : [ {
"index" : 0,
"name" : "[bar_0]直角坐标系[0]",
"getPSChartCoordinateSystem" : {
"modelref" : true,
"id" : "0"
},
"type" : "grid",
"id" : "0"
} ],
"getPSDEChartLegend" : { "getPSDEChartLegend" : {
"index" : 0, "index" : 0,
"showLegend" : true, "showLegend" : true,
"id" : "0" "id" : "0"
}, },
"getPSDEChartSerieses" : [ {
"catalogField" : "AMOUNT",
"eChartsType" : "bar",
"index" : 0,
"name" : "bar_0",
"getPSChartCoordinateSystem" : {
"modelref" : true,
"id" : "0"
},
"getPSChartDataSet" : {
"modelref" : true,
"id" : "0"
},
"getPSChartSeriesEncode" : {
"index" : 0,
"itemId" : "TYPE",
"itemName" : "TYPE",
"name" : "坐标系编码",
"type" : "XY",
"id" : "0"
},
"seriesField" : "TYPE",
"seriesLayoutBy" : "column",
"seriesType" : "bar",
"enableChartDataSet" : true,
"stack" : false
} ],
"getPSDEChartTitle" : { "getPSDEChartTitle" : {
"index" : 0, "index" : 0,
"title" : "图表测试_图表", "title" : "图表测试_图表",
...@@ -34,5 +117,8 @@ ...@@ -34,5 +117,8 @@
}, },
"readOnly" : true, "readOnly" : true,
"modelid" : "A7BC24A3-ACD6-42A6-B8DA-626D9A74CED2", "modelid" : "A7BC24A3-ACD6-42A6-B8DA-626D9A74CED2",
"modeltype" : "PSDECHART" "modeltype" : "PSDECHART",
"getUserParam" : {
"EC.color" : "[\"#5470c6\",\"#91cc75\",\"#fac858\",\"#ee6666\",\"#73c0de\",\"#3ba272\",\"#fc8452\",\"#9a60b4\",\"#ea7ccc\",\"#5470c6\",\"#91cc75\"]"
}
} }
\ No newline at end of file
...@@ -193,8 +193,8 @@ ...@@ -193,8 +193,8 @@
"logicName" : "看板卡片", "logicName" : "看板卡片",
"minorSortDir" : "ASC", "minorSortDir" : "ASC",
"getMinorSortPSAppDEField" : { "getMinorSortPSAppDEField" : {
"name" : "TESTNAME", "name" : "ORDER",
"codeName" : "TESTName" "codeName" : "Order"
}, },
"getPSAppDataEntity" : { "getPSAppDataEntity" : {
"modelref" : true, "modelref" : true,
......
...@@ -496,8 +496,8 @@ ...@@ -496,8 +496,8 @@
"logicName" : "看板卡片", "logicName" : "看板卡片",
"minorSortDir" : "ASC", "minorSortDir" : "ASC",
"getMinorSortPSAppDEField" : { "getMinorSortPSAppDEField" : {
"name" : "TESTNAME", "name" : "ORDER",
"codeName" : "TESTName" "codeName" : "Order"
}, },
"getPSAppDataEntity" : { "getPSAppDataEntity" : {
"modelref" : true, "modelref" : true,
......
...@@ -126,6 +126,62 @@ ...@@ -126,6 +126,62 @@
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json" "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
}, },
"getPSChartCoordinateSystems" : [ {
"eChartsType" : "cartesian2d",
"index" : 0,
"name" : "[bar_0]直角坐标系[0]",
"getPSChartGrid" : {
"index" : 0,
"name" : "[bar_0]直角坐标系[0]",
"getPSChartCoordinateSystem" : {
"modelref" : true,
"id" : "0"
},
"type" : "grid",
"id" : "0"
},
"type" : "XY",
"id" : "0"
} ],
"getPSChartDataSetGroups" : [ {
"index" : 0,
"name" : "DEFAULT",
"getPSAppDEDataSet" : {
"modelref" : true,
"id" : "FetchDefault"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
},
"id" : "0"
} ],
"getPSChartDataSets" : [ {
"index" : 0,
"name" : "bar_0-DEFAULT",
"getPSChartDataSetFields" : [ {
"index" : 0,
"name" : "AMOUNT",
"groupField" : true,
"id" : "0"
}, {
"index" : 1,
"name" : "TYPE",
"groupField" : true,
"id" : "1"
} ],
"id" : "0"
} ],
"getPSChartGrids" : [ {
"index" : 0,
"name" : "[bar_0]直角坐标系[0]",
"getPSChartCoordinateSystem" : {
"modelref" : true,
"id" : "0"
},
"type" : "grid",
"id" : "0"
} ],
"getPSControlHandler" : { "getPSControlHandler" : {
"getPSHandlerActions" : [ { "getPSHandlerActions" : [ {
"actionName" : "Get", "actionName" : "Get",
...@@ -205,6 +261,33 @@ ...@@ -205,6 +261,33 @@
"showLegend" : true, "showLegend" : true,
"id" : "0" "id" : "0"
}, },
"getPSDEChartSerieses" : [ {
"catalogField" : "AMOUNT",
"eChartsType" : "bar",
"index" : 0,
"name" : "bar_0",
"getPSChartCoordinateSystem" : {
"modelref" : true,
"id" : "0"
},
"getPSChartDataSet" : {
"modelref" : true,
"id" : "0"
},
"getPSChartSeriesEncode" : {
"index" : 0,
"itemId" : "TYPE",
"itemName" : "TYPE",
"name" : "坐标系编码",
"type" : "XY",
"id" : "0"
},
"seriesField" : "TYPE",
"seriesLayoutBy" : "column",
"seriesType" : "bar",
"enableChartDataSet" : true,
"stack" : false
} ],
"getPSDEChartTitle" : { "getPSDEChartTitle" : {
"index" : 0, "index" : 0,
"title" : "图表测试_图表", "title" : "图表测试_图表",
...@@ -214,7 +297,10 @@ ...@@ -214,7 +297,10 @@
"readOnly" : true, "readOnly" : true,
"name" : "chart", "name" : "chart",
"modelid" : "A7BC24A3-ACD6-42A6-B8DA-626D9A74CED2", "modelid" : "A7BC24A3-ACD6-42A6-B8DA-626D9A74CED2",
"modeltype" : "PSDECHART" "modeltype" : "PSDECHART",
"getUserParam" : {
"EC.color" : "[\"#5470c6\",\"#91cc75\",\"#fac858\",\"#ee6666\",\"#73c0de\",\"#3ba272\",\"#fc8452\",\"#9a60b4\",\"#ea7ccc\",\"#5470c6\",\"#91cc75\"]"
}
}, { }, {
"caption" : "测试实体", "caption" : "测试实体",
"codeName" : "TestChartViewcaptionbar", "codeName" : "TestChartViewcaptionbar",
......
...@@ -1803,8 +1803,11 @@ ...@@ -1803,8 +1803,11 @@
"stepvalue" : "2" "stepvalue" : "2"
}, },
"editorType" : "STEPPER", "editorType" : "STEPPER",
"maxValue" : 30.0,
"minValue" : -10.0,
"name" : "formitem3", "name" : "formitem3",
"stepValue" : 1.0 "precision" : 2,
"stepValue" : 2.0
}, },
"getPSLayoutPos" : { "getPSLayoutPos" : {
"colMD" : 24, "colMD" : 24,
...@@ -1832,7 +1835,7 @@ ...@@ -1832,7 +1835,7 @@
"texts" : "['Extremely bad', 'Disappointed', 'Fair', 'Satisfied', 'Surprise']" "texts" : "['Extremely bad', 'Disappointed', 'Fair', 'Satisfied', 'Surprise']"
}, },
"editorType" : "RATING", "editorType" : "RATING",
"maxValue" : 5.0, "maxValue" : 10.0,
"minValue" : 0.0, "minValue" : 0.0,
"name" : "formitem4", "name" : "formitem4",
"stepValue" : 1.0 "stepValue" : 1.0
...@@ -1863,8 +1866,10 @@ ...@@ -1863,8 +1866,10 @@
"showstops" : "true" "showstops" : "true"
}, },
"editorType" : "SLIDER", "editorType" : "SLIDER",
"maxValue" : 200.0,
"minValue" : 0.0,
"name" : "formitem5", "name" : "formitem5",
"stepValue" : 1.0 "stepValue" : 2.0
}, },
"getPSLayoutPos" : { "getPSLayoutPos" : {
"colMD" : 24, "colMD" : 24,
...@@ -3531,7 +3536,8 @@ ...@@ -3531,7 +3536,8 @@
"name" : "formitem9" "name" : "formitem9"
}, { }, {
"name" : "formitem10" "name" : "formitem10"
} ] } ],
"valueSeparator" : "/"
}, },
"getPSLayoutPos" : { "getPSLayoutPos" : {
"colMD" : 24, "colMD" : 24,
......
...@@ -3246,16 +3246,16 @@ ...@@ -3246,16 +3246,16 @@
"codeName" : "VMGroup2", "codeName" : "VMGroup2",
"name" : "视图消息组2", "name" : "视图消息组2",
"getPSAppViewMsgGroupDetails" : [ { "getPSAppViewMsgGroupDetails" : [ {
"name" : "视图消息2", "name" : "视图消息",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg3" "id" : "ViewMsg2"
} }
}, { }, {
"name" : "视图消息", "name" : "视图消息2",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg2" "id" : "ViewMsg3"
} }
} ] } ]
} ], } ],
...@@ -29257,6 +29257,34 @@ ...@@ -29257,6 +29257,34 @@
"logicName" : "数值4", "logicName" : "数值4",
"name" : "NUMBER4", "name" : "NUMBER4",
"stdDataType" : 9 "stdDataType" : 9
}, {
"getAllPSAppDEFUIModes" : [ {
"codeName" : "MobileDefault",
"name" : "[ORDER][排序属性]移动端默认",
"getPSDEFFormItem" : {
"codeName" : "MobileDefault",
"editorType" : "MOBTEXT",
"name" : "[ORDER][排序属性]移动端默认",
"uIMode" : "MOBILEDEFAULT",
"mobileMode" : true
},
"type" : "MOBILEDEFAULT",
"mobileMode" : true
}, {
"codeName" : "Default",
"name" : "[ORDER][排序属性]",
"getPSDEFFormItem" : {
"codeName" : "Default",
"editorType" : "TEXTBOX",
"name" : "[ORDER][排序属性]",
"uIMode" : "DEFAULT"
},
"type" : "DEFAULT"
} ],
"codeName" : "Order",
"logicName" : "排序属性",
"name" : "ORDER",
"stdDataType" : 9
}, { }, {
"getAllPSAppDEFUIModes" : [ { "getAllPSAppDEFUIModes" : [ {
"codeName" : "MobileDefault", "codeName" : "MobileDefault",
...@@ -30612,6 +30640,17 @@ ...@@ -30612,6 +30640,17 @@
"sourceType" : "DEFIELD", "sourceType" : "DEFIELD",
"stdDataType" : 9, "stdDataType" : 9,
"type" : "SIMPLE" "type" : "SIMPLE"
}, {
"codeName" : "Order",
"logicName" : "排序属性",
"name" : "Order",
"getPSAppDEField" : {
"name" : "ORDER",
"codeName" : "Order"
},
"sourceType" : "DEFIELD",
"stdDataType" : 9,
"type" : "SIMPLE"
}, { }, {
"codeName" : "Amount", "codeName" : "Amount",
"logicName" : "金额", "logicName" : "金额",
...@@ -2347,6 +2347,12 @@ ...@@ -2347,6 +2347,12 @@
"name" : "NUMBER4", "name" : "NUMBER4",
"stdDataType" : 9, "stdDataType" : 9,
"nullable" : true "nullable" : true
}, {
"codeName" : "ORDER",
"logicName" : "排序属性",
"name" : "ORDER",
"stdDataType" : 9,
"nullable" : true
}, { }, {
"codeName" : "TESTID", "codeName" : "TESTID",
"length" : 100, "length" : 100,
......
...@@ -3005,6 +3005,18 @@ ...@@ -3005,6 +3005,18 @@
"enableModify" : true, "enableModify" : true,
"keyField" : false, "keyField" : false,
"majorField" : false "majorField" : false
}, {
"codeName" : "Order",
"codeName2" : "Order",
"logicName" : "排序属性",
"name" : "ORDER",
"orderValue" : 340,
"stdDataType" : 9,
"allowEmpty" : true,
"enableCreate" : true,
"enableModify" : true,
"keyField" : false,
"majorField" : false
}, { }, {
"codeName" : "CreateDate", "codeName" : "CreateDate",
"codeName2" : "CreateDate", "codeName2" : "CreateDate",
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<profiles> <profiles>
<profile> <profile>
<id>trainsys</id> <id>runtime</id>
<build> <build>
<resources> <resources>
<resource> <resource>
......
...@@ -10,6 +10,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \ ...@@ -10,6 +10,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \ sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Duser.timezone=$TZ -Djava.security.egd=file:/dev/./urandom -jar /trainsys-provider.jar 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 ADD trainsys-provider.jar /trainsys-provider.jar
...@@ -22,32 +22,7 @@ spec: ...@@ -22,32 +22,7 @@ spec:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
imagePullPolicy: Always imagePullPolicy: Always
ports: ports:
- containerPort: 50000 - containerPort: 8081
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"
--- ---
apiVersion: v1 apiVersion: v1
...@@ -60,9 +35,9 @@ spec: ...@@ -60,9 +35,9 @@ spec:
type: NodePort type: NodePort
ports: ports:
- name: http - name: http
port: 50000 port: 8081
targetPort: 50000 targetPort: 8081
nodePort: 50000 nodePort: 8081
protocol: TCP protocol: TCP
selector: selector:
app: trainsys-provider app: trainsys-provider
......
...@@ -3,23 +3,9 @@ services: ...@@ -3,23 +3,9 @@ services:
trainsys-provider: trainsys-provider:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
ports: ports:
- "50000:50000" - "8081:8081"
networks: networks:
- agent_network - 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: deploy:
resources: resources:
limits: limits:
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册