提交 7651c510 编写于 作者: ibizdev's avatar ibizdev

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

上级 f7597407
......@@ -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>
......
......@@ -268,6 +268,53 @@
"type" : "DTOS"
},
"defaultMode" : true
}, {
"getAllPSDEDataQueryCodes" : [ {
"modelref" : true,
"path" : "PSMODULES/Test/PSDATAENTITIES/WORKITEM/PSDEDATAQUERIES/TOPQUERY/PSDEDQCODES/MYSQL5.json"
} ],
"codeName" : "TOPQUERY",
"logicName" : "顶层查询",
"name" : "TOPQUERY",
"getPSDEDQMain" : {
"getJoinPSDataEntity" : {
"modelref" : true,
"path" : "PSMODULES/Test/PSDATAENTITIES/WORKITEM.json"
},
"joinType" : "MAIN",
"name" : "WORKITEM",
"getPSDEDQGroupCondition" : {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "连接条件",
"getPSDEDQConditions" : [ {
"condOp" : "ISNULL",
"condType" : "SINGLE",
"fieldName" : "PWORKITEMID",
"name" : "(PWORKITEMID) 值为空(Nil)",
"getPSDEField" : {
"name" : "PWORKITEMID",
"codeName" : "Pworkitemid"
}
} ]
}
},
"getPSDEDataQueryInput" : {
"name" : "TOPQUERYInput",
"getPSDEFilterDTO" : {
"modelref" : true,
"id" : "WORKITEMFilterDTO"
},
"type" : "DTO"
},
"getPSDEDataQueryReturn" : {
"name" : "TOPQUERYResult",
"getPSDEMethodDTO" : {
"modelref" : true,
"id" : "WORKITEMDTO"
},
"type" : "DTOS"
}
}, {
"getAllPSDEDataQueryCodes" : [ {
"modelref" : true,
......@@ -333,6 +380,32 @@
"defaultMode" : true,
"enableBackend" : true,
"enableFront" : true
}, {
"codeName" : "TOPQUERY",
"logicName" : "顶层查询",
"name" : "TOPQUERY",
"getPSDEDataQueries" : [ {
"modelref" : true,
"id" : "TOPQUERY"
} ],
"getPSDEDataSetInput" : {
"name" : "TOPQUERYInput",
"getPSDEFilterDTO" : {
"modelref" : true,
"id" : "WORKITEMFilterDTO"
},
"type" : "DTO"
},
"getPSDEDataSetReturn" : {
"name" : "TOPQUERYResult",
"getPSDEMethodDTO" : {
"modelref" : true,
"id" : "WORKITEMDTO"
},
"type" : "PAGE"
},
"enableBackend" : true,
"enableFront" : true
} ],
"getAllPSDEFields" : [ {
"getAllPSDEFDTColumns" : [ {
......@@ -1774,6 +1847,12 @@
"name" : "工作项实体数据多项选择视图",
"realModelSubType" : "DEMPICKUPVIEW",
"realModelType" : "PSDEVIEWBASE"
}, {
"codeName" : "Usr12114819GanttView",
"logicName" : "工作项规划界面",
"name" : "工作项规划界面",
"realModelSubType" : "DEGANTTVIEW",
"realModelType" : "PSDEVIEWBASE"
}, {
"codeName" : "PickupGridView",
"logicName" : "工作项实体选择表格视图(部件视图)",
......
{
"dBType" : "MYSQL5",
"name" : "MySQL5",
"getPSDEDataQueryCodeConds" : [ {
"condType" : "CUSTOM",
"customCond" : "( t1.`PWORKITEMID` IS NULL )",
"name" : "查询条件"
} ],
"getPSDEDataQueryCodeExps" : [ {
"expression" : "t1.`BEGIN`",
"name" : "BEGIN"
}, {
"expression" : "t1.`BH`",
"name" : "BH"
}, {
"expression" : "t1.`CREATEDATE`",
"name" : "CREATEDATE"
}, {
"expression" : "t1.`CREATEMAN`",
"name" : "CREATEMAN"
}, {
"expression" : "t1.`END`",
"name" : "END"
}, {
"expression" : "t1.`FOLLOWER`",
"name" : "FOLLOWER"
}, {
"expression" : "t1.`HEAD`",
"name" : "HEAD"
}, {
"expression" : "t1.`PWORKITEMID`",
"name" : "PWORKITEMID"
}, {
"expression" : "t1.`TYPE`",
"name" : "TYPE"
}, {
"expression" : "t1.`UPDATEDATE`",
"name" : "UPDATEDATE"
}, {
"expression" : "t1.`UPDATEMAN`",
"name" : "UPDATEMAN"
}, {
"expression" : "t1.`WORKITEMID`",
"name" : "WORKITEMID"
}, {
"expression" : "t1.`WORKITEMNAME`",
"name" : "WORKITEMNAME"
} ],
"queryCode" : "SELECT\nt1.`BEGIN`,\nt1.`BH`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`END`,\nt1.`FOLLOWER`,\nt1.`HEAD`,\nt1.`PWORKITEMID`,\nt1.`TYPE`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`,\nt1.`WORKITEMID`,\nt1.`WORKITEMNAME`\nFROM `T_WORKITEM` t1 \n",
"id" : "PSMODULES/Test/PSDATAENTITIES/WORKITEM/PSDEDATAQUERIES/TOPQUERY/PSDEDQCODES/MYSQL5.json"
}
\ No newline at end of file
......@@ -321,6 +321,42 @@
"requestParamType" : "ENTITY",
"requestPath" : "/fetchdefault",
"builtinMethod" : false
}, {
"codeName" : "FetchTOPQUERY",
"methodType" : "FETCH",
"name" : "FetchTOPQUERY",
"getPSAppDEMethodInput" : {
"name" : "输入对象",
"getPSAppDEMethodDTO" : {
"modelref" : true,
"id" : "WORKITEMFilterDTO"
},
"type" : "DTO"
},
"getPSAppDEMethodReturn" : {
"name" : "返回对象",
"getPSAppDEMethodDTO" : {
"modelref" : true,
"id" : "WORKITEMDTO"
},
"type" : "PAGE"
},
"getPSDEDataSet" : {
"modelref" : true,
"id" : "TOPQUERY"
},
"getPSDEOPPriv" : {
"modelref" : true,
"id" : "READ"
},
"getPSDEServiceAPIMethod" : {
"modelref" : true,
"id" : "FetchTOPQUERY"
},
"requestMethod" : "POST",
"requestParamType" : "ENTITY",
"requestPath" : "/fetchtopquery",
"builtinMethod" : false
} ],
"getAllPSAppDEFields" : [ {
"getAllPSAppDEFUIModes" : [ {
......@@ -1374,6 +1410,42 @@
"requestParamType" : "ENTITY",
"requestPath" : "/fetchdefault",
"builtinMethod" : false
}, {
"codeName" : "FetchTOPQUERY",
"methodType" : "FETCH",
"name" : "FetchTOPQUERY",
"getPSAppDEMethodInput" : {
"name" : "输入对象",
"getPSAppDEMethodDTO" : {
"modelref" : true,
"id" : "WORKITEMFilterDTO"
},
"type" : "DTO"
},
"getPSAppDEMethodReturn" : {
"name" : "返回对象",
"getPSAppDEMethodDTO" : {
"modelref" : true,
"id" : "WORKITEMDTO"
},
"type" : "PAGE"
},
"getPSDEDataSet" : {
"modelref" : true,
"id" : "TOPQUERY"
},
"getPSDEOPPriv" : {
"modelref" : true,
"id" : "READ"
},
"getPSDEServiceAPIMethod" : {
"modelref" : true,
"id" : "FetchTOPQUERY"
},
"requestMethod" : "POST",
"requestParamType" : "ENTITY",
"requestPath" : "/fetchtopquery",
"builtinMethod" : false
}, {
"codeName" : "FilterCreate",
"methodType" : "FILTERACTION",
......@@ -1435,6 +1507,10 @@
"builtinMethod" : false
} ],
"getAllPSAppViews" : [ {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/WORKITEMUsr12114819GanttView.json",
"viewType" : "DEGANTTVIEW"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/WORKITEMGridView.json",
"viewType" : "DEGRIDVIEW"
......
{
"beginDataItemName" : "begin",
"codeName" : "Usr12114819GanttView_Gantt",
"controlType" : "GANTT",
"dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM/PSGANTTS/Usr12114819GanttView_Gantt.json",
"endDataItemName" : "end",
"finishDataItemName" : "finish",
"logicName" : "工作项规划界面_甘特部件",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
},
"getPSDETreeNodes" : [ {
"counterMode" : 0,
"name" : "默认根节点",
"nodeType" : "ROOT",
"nodeValue" : "root",
"text" : "默认根节点",
"treeNodeType" : "STATIC",
"hasPSDETreeNodeRSs" : false,
"appendPNodeId" : false,
"disableSelect" : false,
"enableCheck" : false,
"enableEditData" : false,
"enableNewData" : false,
"enableQuickCreate" : false,
"enableQuickSearch" : false,
"enableRemoveData" : false,
"enableViewData" : false,
"expandFirstOnly" : false,
"expanded" : false,
"rootNode" : true,
"selectFirstOnly" : false,
"selected" : false,
"id" : "ROOT"
} ],
"prevDataItemName" : "prev",
"sNDataItemName" : "sn",
"totalDataItemName" : "total",
"treeGridMode" : 2,
"enableRootSelect" : false,
"outputIconDefault" : true,
"rootVisible" : false,
"modelid" : "297EAFB5-8C01-489D-9923-9EE8DFEA3F7C",
"modeltype" : "PSDEGANTT"
}
\ No newline at end of file
{
"accUserMode" : 2,
"getCapPSLanguageRes" : {
"defaultContent" : "工作项",
"lanResTag" : "DE.LNAME.WORKITEM",
"lanResType" : "DE.LNAME",
"name" : "实体逻辑名称(DE.LNAME.*)[WORKITEM]",
"refFlag" : true
},
"caption" : "工作项规划界面",
"codeName" : "WORKITEMUsr12114819GanttView",
"dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDEVIEWS/WORKITEMUsr12114819GanttView.json",
"mDCtrlActiveMode" : 2,
"name" : "WORKITEMUsr12114819GanttView",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
},
"getPSAppModule" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPMODULES/Test.json"
},
"getPSControls" : [ {
"beginDataItemName" : "begin",
"codeName" : "Usr12114819GanttView_Gantt",
"controlType" : "GANTT",
"dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM/PSGANTTS/Usr12114819GanttView_Gantt.json",
"endDataItemName" : "end",
"finishDataItemName" : "finish",
"logicName" : "工作项规划界面_甘特部件",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
},
"getPSControlHandler" : {
"enableDEFieldPrivilege" : false,
"id" : "gantt"
},
"getPSControlParam" : {
"autoLoad" : true,
"showBusyIndicator" : true,
"id" : "GANTT"
},
"getPSDETreeNodes" : [ {
"counterMode" : 0,
"name" : "默认根节点",
"nodeType" : "ROOT",
"nodeValue" : "root",
"text" : "默认根节点",
"treeNodeType" : "STATIC",
"hasPSDETreeNodeRSs" : false,
"appendPNodeId" : false,
"disableSelect" : false,
"enableCheck" : false,
"enableEditData" : false,
"enableNewData" : false,
"enableQuickCreate" : false,
"enableQuickSearch" : false,
"enableRemoveData" : false,
"enableViewData" : false,
"expandFirstOnly" : false,
"expanded" : false,
"rootNode" : true,
"selectFirstOnly" : false,
"selected" : false,
"id" : "ROOT"
} ],
"prevDataItemName" : "prev",
"sNDataItemName" : "sn",
"totalDataItemName" : "total",
"treeGridMode" : 2,
"enableRootSelect" : false,
"outputIconDefault" : true,
"rootVisible" : false,
"name" : "gantt",
"modelid" : "297EAFB5-8C01-489D-9923-9EE8DFEA3F7C",
"modeltype" : "PSDEGANTT"
}, {
"controlType" : "SEARCHBAR",
"name" : "searchbar",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
},
"getPSControlParam" : {
"id" : "searchbar"
},
"quickGroupCount" : -1,
"quickSearchMode" : 0,
"quickSearchWidth" : 0,
"enableFilter" : false,
"enableGroup" : false,
"enableQuickSearch" : false,
"mobileSearchBar" : false
}, {
"getCapPSLanguageRes" : {
"defaultContent" : "工作项",
"lanResTag" : "DE.LNAME.WORKITEM",
"lanResType" : "DE.LNAME",
"name" : "实体逻辑名称(DE.LNAME.*)[WORKITEM]",
"refFlag" : true
},
"caption" : "工作项规划界面",
"codeName" : "Usr12114819GanttViewcaptionbar",
"controlType" : "CAPTIONBAR",
"name" : "captionbar",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
},
"getPSControlParam" : { }
} ],
"getPSDEViewCodeName" : "Usr12114819GanttView",
"getPSDEViewId" : "B84CF9A0-BE22-4F16-8F36-52C655DD1C52",
"getPSViewLayoutPanel" : {
"codeName" : "Layoutpanel",
"controlStyle" : "APPDEGANTTVIEW",
"controlType" : "VIEWLAYOUTPANEL",
"name" : "layoutpanel",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
},
"getPSControlParam" : { },
"layoutBodyOnly" : true,
"layoutPanel" : true,
"useDefaultLayout" : true
},
"refFlag" : false,
"title" : "工作项规划界面",
"viewStyle" : "DEFAULT",
"viewType" : "DEGANTTVIEW",
"xDataControlName" : "gantt",
"enableDP" : true,
"enableFilter" : true,
"enableSearch" : true,
"modelid" : "4efa9ce63b8aaf76b43f49d8fecd24a2",
"modeltype" : "PSAPPDEVIEW"
}
\ No newline at end of file
......@@ -12875,6 +12875,12 @@
"viewType" : "DECALENDAREXPVIEW",
"resource" : "Book",
"view" : "CalendarExpView"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/WORKITEMUsr12114819GanttView.json",
"viewType" : "DEGANTTVIEW",
"resource" : "WORKITEM",
"view" : "Usr12114819GanttView"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTGridView.json",
......@@ -1037,6 +1037,39 @@
"tempDataMode" : 0,
"uniqueTag" : "WORKITEM__FETCH__DEFAULT",
"enableTestMethod" : false
}, {
"actionType" : "FETCH",
"codeName" : "FetchTOPQUERY",
"dataAccessAction" : "READ",
"methodType" : "FETCH",
"name" : "FetchTOPQUERY",
"getPSDEDataSet" : {
"modelref" : true,
"id" : "TOPQUERY"
},
"getPSDEServiceAPIMethodInput" : {
"name" : "输入对象",
"getPSDEMethodDTO" : {
"modelref" : true,
"id" : "WORKITEMFilterDTO"
},
"type" : "DTO"
},
"getPSDEServiceAPIMethodReturn" : {
"name" : "返回对象",
"getPSDEMethodDTO" : {
"modelref" : true,
"id" : "WORKITEMDTO"
},
"type" : "PAGE"
},
"parentKeyMode" : "DEFAULT",
"requestMethod" : "POST",
"requestParamType" : "ENTITY",
"requestPath" : "/fetchtopquery",
"tempDataMode" : 0,
"uniqueTag" : "WORKITEM__FETCH__TOPQUERY",
"enableTestMethod" : false
}, {
"actionType" : "SELECT",
"codeName" : "Select",
......@@ -14594,6 +14627,35 @@
"requestParamType" : "ENTITY",
"requestPath" : "/fetchdefault",
"uniqueTag" : "WORKITEM__FETCH__DEFAULT"
}, {
"codeName" : "FetchTOPQUERY",
"dataAccessAction" : "READ",
"methodType" : "FETCH",
"name" : "FetchTOPQUERY",
"getPSDEDataSet" : {
"modelref" : true,
"id" : "TOPQUERY"
},
"getPSDEServiceAPIMethodInput" : {
"name" : "输入对象",
"getPSDEMethodDTO" : {
"modelref" : true,
"id" : "WORKITEMFilterDTO"
},
"type" : "DTO"
},
"getPSDEServiceAPIMethodReturn" : {
"name" : "返回对象",
"getPSDEMethodDTO" : {
"modelref" : true,
"id" : "WORKITEMDTO"
},
"type" : "PAGE"
},
"requestMethod" : "POST",
"requestParamType" : "ENTITY",
"requestPath" : "/fetchtopquery",
"uniqueTag" : "WORKITEM__FETCH__TOPQUERY"
}, {
"codeName" : "Select",
"dataAccessAction" : "READ",
......
......@@ -33,7 +33,7 @@
<profiles>
<profile>
<id>trainsys</id>
<id>runtime</id>
<build>
<resources>
<resource>
......
......@@ -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
......@@ -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
......
......@@ -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:
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册