[app-platform] 修复模板相关逻辑

Author: lizhichao51

app-builder/jane/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/converters/impl/AppVersionToTemplateConverter.java

@@ -50,6 +50,12 @@ public AppTemplate convert(Object appVersion) {
                         .configId(s.getData().getConfigId())
                         .flowGraphId(s.getData().getFlowGraphId())
                         .createBy(s.getData().getCreateBy())
+                        .createAt(s.getData().getCreateAt())
+                        .updateBy(s.getData().getUpdateBy())
+                        .updateAt(s.getData().getUpdateAt())
+                        .config(s.getConfig())
+                        .flowGraph(s.getFlowGraph())
+                        .formProperties(s.getFormProperties())
                         .build())
                 .orElse(null);
     }

app-builder/jane/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/domains/appversion/AppVersion.java

@@ -709,6 +709,7 @@ public void cloneVersion(AppBuilderAppCreateDto dto, String version, String type
         this.data.setIsActive(false);
         this.data.setStatus(AppStatus.DRAFT.getName());
         this.data.setVersion(version);
+        this.data.setState(AppState.INACTIVE.getName());
         this.getFormProperties().forEach(p -> p.setAppId(newAppId));
 
         if (Objects.nonNull(dto)) {
@@ -771,10 +772,7 @@ public TemplateInfoDto publishTemplate(TemplateAppCreateDto createDto, Operation
         this.data.setAppId(newAppID);
 
         // 只保留模板相关的属性.
-        this.attributes = this.attributes.entrySet()
-                .stream()
-                .filter(e -> TEMPLATE_DEFAULT_ATTRIBUTE_KEYS.contains(e.getKey()))
-                .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+        this.attributes.keySet().retainAll(TEMPLATE_DEFAULT_ATTRIBUTE_KEYS);
 
         // 创建参数设置.
         if (createDto != null) {
@@ -806,6 +804,7 @@ public TemplateInfoDto publishTemplate(TemplateAppCreateDto createDto, Operation
         graph.setUpdateAt(now);
 
         AppTemplate template = this.converterFactory.convert(this, AppTemplate.class);
+        this.templateFactory.setRepositories(template);
         this.templateFactory.save(template);
         String icon = this.getIcon();
         if (StringUtils.isNotBlank(icon)) {

app-builder/jane/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/domains/appversion/AppVersionFactory.java

@@ -146,6 +146,7 @@ public AppVersion create(AppBuilderAppPo data, AppVersionRepository appVersionRe
                 .maxUserContextLen(this.maxUserContextLen)
                 .knowledgeCenterService(this.knowledgeCenterService)
                 .resourcePath(this.resourcePath)
+                .formPropertyRepository(this.formPropertyRepository)
                 .build());
     }
 }

app-builder/jane/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/domains/appversion/service/impl/AppVersionServiceImpl.java

@@ -237,6 +237,7 @@ public AppVersion createByTemplate(AppTemplate template, OperationContext contex
         AppVersion appVersion = this.appVersionFactory.create(new AppBuilderAppPo(), this.repository);
         appVersion.getData().setConfigId(template.getConfigId());
         appVersion.getData().setFlowGraphId(template.getFlowGraphId());
+        appVersion.getData().setId(template.getId());
         appVersion.cloneVersion(TemplateUtils.toAppCreateDTO(template), DEFAULT_APP_VERSION, AppTypeEnum.APP.name(),
                 context);
         this.save(appVersion);

app-builder/jane/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/util/TemplateUtils.java

@@ -124,7 +124,7 @@ public static AppBuilderAppCreateDto toAppCreateDTO(AppTemplate template) {
                 .icon(icon)
                 .greeting(greeting)
                 .appType(appTemplate.getAppType())
-                .type(appTemplate.getType())
+                .type(AppTypeEnum.APP.code())
                 .storeId(storeId)
                 .appBuiltType(appTemplate.getAppBuiltType())
                 .appCategory(appTemplate.getAppCategory())