Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
yecl
wecube
Commits
099f918c
Commit
099f918c
authored
4 years ago
by
gavin2lee
Browse files
Options
Download
Email Patches
Plain Diff
#2169 format codes
parent
be3a7beb
master
2109_support_taskman
2222_deployment_confirmation
2230_plugin_invocation_confirm_token
2233_workflow_context_parameters_refactor
2289_workflow_interf_enhance
2313_add_timestamp_to_node_log
2317_fix_bug_of_faulted_proc_inst
2321_fix_itsm_reported_defects
2321_fix_itsm_reported_issues
dependabot/maven/platform-auth-client/org.bouncycastle-bcprov-ext-jdk15on-1.67
dependabot/maven/platform-auth-client/org.bouncycastle-bcprov-jdk15on-1.67
dependabot/maven/platform-auth-server/commons-io-commons-io-2.7
dependabot/maven/platform-auth-server/org.bouncycastle-bcprov-jdk15on-1.67
dependabot/maven/platform-core/com.google.guava-guava-29.0-jre
dependabot/maven/platform-core/commons-io-commons-io-2.7
dependabot/maven/platform-workflow/commons-io-commons-io-2.7
dev
dev_fix
dev_test
flow_exec_bug
master_UBA
mixed
remove_node_sass
revert-2184-upgrade_work_orch
timed_execution
web_monitor_demo
workflow_report
v3.2.2
v3.2.1
v3.2.0
v3.1.0
v3.0.1
v3.0.0
v2.9.2
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
platform-core/src/main/java/com/webank/wecube/platform/core/service/plugin/PluginPackageDataModelService.java
+29
-23
...rm/core/service/plugin/PluginPackageDataModelService.java
with
29 additions
and
23 deletions
+29
-23
platform-core/src/main/java/com/webank/wecube/platform/core/service/plugin/PluginPackageDataModelService.java
+
29
-
23
View file @
099f918c
...
...
@@ -161,6 +161,11 @@ public class PluginPackageDataModelService {
return
resultDto
;
}
/**
*
* @param packageName
* @return
*/
public
PluginPackageDataModel
tryFetchLatestAvailableDataModelEntity
(
String
packageName
)
{
PluginPackageDataModel
latestDataModelEntity
=
pluginPackageDataModelMapper
.
selectLatestDataModelByPackageName
(
packageName
);
...
...
@@ -178,28 +183,7 @@ public class PluginPackageDataModelService {
}
}
private
PluginPackageDataModel
tryCalculateDynamicLatestAvailableDataModelEntity
(
PluginPackageDataModel
dataModelEntity
)
{
List
<
PluginPackageDataModel
>
dataModelEntities
=
pluginPackageDataModelMapper
.
selectDataModelsByPackageName
(
dataModelEntity
.
getPackageName
());
PluginPackageDataModel
targetDataMode
=
null
;
for
(
PluginPackageDataModel
dataModel
:
dataModelEntities
)
{
List
<
PluginPackageEntities
>
pluginPackageEntities
=
pluginPackageEntitiesMapper
.
selectAllByDataModel
(
dataModel
.
getId
());
if
(
pluginPackageEntities
!=
null
&&
!
pluginPackageEntities
.
isEmpty
())
{
targetDataMode
=
dataModel
;
break
;
}
}
if
(
targetDataMode
==
null
)
{
targetDataMode
=
dataModelEntity
;
}
return
targetDataMode
;
}
/**
*
...
...
@@ -536,7 +520,6 @@ public class PluginPackageDataModelService {
}
}
// TODO
calOverviewDynamicEntityDtoRelationShips
(
dataModelEntityDtos
,
pluginPackageEntities
,
totalIdAndEntityDtoMap
,
totalIdAndEntityMap
);
...
...
@@ -996,5 +979,28 @@ public class PluginPackageDataModelService {
return
dynamicPluginPackageEntities
;
}
private
PluginPackageDataModel
tryCalculateDynamicLatestAvailableDataModelEntity
(
PluginPackageDataModel
dataModelEntity
)
{
List
<
PluginPackageDataModel
>
dataModelEntities
=
pluginPackageDataModelMapper
.
selectDataModelsByPackageName
(
dataModelEntity
.
getPackageName
());
PluginPackageDataModel
targetDataMode
=
null
;
for
(
PluginPackageDataModel
dataModel
:
dataModelEntities
)
{
List
<
PluginPackageEntities
>
pluginPackageEntities
=
pluginPackageEntitiesMapper
.
selectAllByDataModel
(
dataModel
.
getId
());
if
(
pluginPackageEntities
!=
null
&&
!
pluginPackageEntities
.
isEmpty
())
{
targetDataMode
=
dataModel
;
break
;
}
}
if
(
targetDataMode
==
null
)
{
targetDataMode
=
dataModelEntity
;
}
return
targetDataMode
;
}
}
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help