From 7ee0eb63f0d1f7dd876247483a0d00fa6bcc0d5a Mon Sep 17 00:00:00 2001
From: wangqing <smalljop@foxmail.com>
Date: Wed, 16 Jun 2021 18:33:16 +0800
Subject: [PATCH] fix

---
 .../controller/ProjectTemplateController.java |  5 ++--
 .../web/controller/UserProjectController.java | 30 ++++++++++++++++---
 tduck-api/src/main/resources/application.yml  |  2 +-
 .../entity/ProjectTemplateItemEntity.java     |  6 ++++
 4 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/ProjectTemplateController.java b/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/ProjectTemplateController.java
index 46f1ef5..1c55529 100644
--- a/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/ProjectTemplateController.java
+++ b/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/ProjectTemplateController.java
@@ -58,6 +58,7 @@ public class ProjectTemplateController {
     }
 
 
+
     /**
      * 分页查询项目分类
      *
@@ -99,7 +100,7 @@ public class ProjectTemplateController {
     }
 
     /**
-     * 项目表单项创建
+     * 项目模板表单项创建
      *
      * @param request
      * @return
@@ -108,7 +109,7 @@ public class ProjectTemplateController {
     public Result createProjectTemplateItem(@RequestBody OperateProjectItemRequest request) {
         ValidatorUtils.validateEntity(request, AddGroup.class);
         //把Map转换成Bean 在转换成Map 去除不在bean字段列表的多字段
-        Object bean = BeanUtil.mapToBean(request.getExpand(), request.getType().getExpandClass(), true);
+        Object bean = BeanUtil.toBeanIgnoreCase(request.getExpand(), request.getType().getExpandClass(), true);
         ProjectTemplateItemEntity entity = new ProjectTemplateItemEntity();
         BeanUtil.copyProperties(request, entity, UserProjectItemEntity.Fields.defaultValue);
         entity.setExpand(BeanUtil.beanToMap(bean));
diff --git a/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectController.java b/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectController.java
index 4b4c70c..488d581 100644
--- a/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectController.java
+++ b/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectController.java
@@ -93,7 +93,7 @@ public class UserProjectController {
      * 从模板创建项目
      */
     @Login
-    @PostMapping("/user/project/template/create/")
+    @PostMapping("/user/project/use-template/create")
     public Result createProjectByTemplate(@RequestBody ProjectTemplateEntity request, @RequestAttribute Long userId) {
         String templateKey = request.getKey();
         ProjectTemplateEntity projectTemplateEntity = projectTemplateService.getByKey(templateKey);
@@ -113,6 +113,30 @@ public class UserProjectController {
     }
 
 
+    /**
+     * 项目另存为为模板
+     *
+     * @param request
+     * @param userId
+     * @return
+     */
+    @Login
+    @PostMapping("/user/project/template/save")
+    public Result saveAsProjectTemplate(@RequestBody UserProjectEntity request, @RequestAttribute Long userId) {
+        UserProjectEntity projectEntity = projectService.getByKey(request.getKey());
+        List<UserProjectItemEntity> itemEntityList = projectItemService.listByProjectKey(request.getKey());
+        ProjectTemplateEntity projectTemplateEntity = new ProjectTemplateEntity();
+        BeanUtil.copyProperties(projectEntity, projectTemplateEntity, UserProjectEntity.Fields.status);
+        projectTemplateEntity.setKey(IdUtil.fastSimpleUUID());
+        projectTemplateEntity.setCategoryId(CommonConstants.ConstantNumber.FOUR.longValue());
+        projectTemplateService.save(projectTemplateEntity);
+        List<ProjectTemplateItemEntity> projectTemplateItemList = JsonUtils.jsonToList(JsonUtils.objToJson(itemEntityList), ProjectTemplateItemEntity.class);
+        projectTemplateItemList.forEach(item -> item.setProjectKey(projectTemplateEntity.getKey()));
+        projectTemplateItemService.saveBatch(projectTemplateItemList);
+        return Result.success(projectTemplateEntity.getKey());
+    }
+
+
     /**
      * 根据条件查询所有项目
      */
@@ -277,7 +301,7 @@ public class UserProjectController {
      */
     private UserProjectItemEntity formatProjectItem(OperateProjectItemRequest request) {
         //把Map转换成Bean 在转换成Map 去除不在bean字段列表的多字段
-        Object bean = BeanUtil.toBeanIgnoreCase(request.getExpand(), request.getType().getExpandClass(),false);
+        Object bean = BeanUtil.toBeanIgnoreCase(request.getExpand(), request.getType().getExpandClass(), false);
         UserProjectItemEntity entity = new UserProjectItemEntity();
         BeanUtil.copyProperties(request, entity, UserProjectItemEntity.Fields.defaultValue);
         entity.setExpand(BeanUtil.beanToMap(bean));
@@ -506,6 +530,4 @@ public class UserProjectController {
     }
 
 
-
-
 }
\ No newline at end of file
diff --git a/tduck-api/src/main/resources/application.yml b/tduck-api/src/main/resources/application.yml
index 5a4db19..6f8cdd2 100644
--- a/tduck-api/src/main/resources/application.yml
+++ b/tduck-api/src/main/resources/application.yml
@@ -48,7 +48,7 @@ platform:
   request:
     trace-log: false
   sign:
-    enable: true
+    enable: false
     secret: 916lWh2WMcbSWiHv
     ignore-urls:
       - /tduck-api/webjars/**
diff --git a/tduck-project/src/main/java/com/tduck/cloud/project/entity/ProjectTemplateItemEntity.java b/tduck-project/src/main/java/com/tduck/cloud/project/entity/ProjectTemplateItemEntity.java
index 7c94d89..291fc67 100644
--- a/tduck-project/src/main/java/com/tduck/cloud/project/entity/ProjectTemplateItemEntity.java
+++ b/tduck-project/src/main/java/com/tduck/cloud/project/entity/ProjectTemplateItemEntity.java
@@ -48,6 +48,12 @@ public class ProjectTemplateItemEntity extends BaseEntity<ProjectTemplateItemEnt
      */
     private Boolean showLabel;
 
+
+    /**
+     * 展示类型组件
+     */
+    @TableField("is_display_type")
+    private Boolean displayType;
     /**
      * 表单项默认值
      */