From 4677c10bcd63c2b51fa80c92880b385c2d781d22 Mon Sep 17 00:00:00 2001
From: wangqing <smalljop@foxmail.com>
Date: Wed, 9 Jun 2021 18:53:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cloud/api/web/controller/UserProjectResultController.java | 4 ++--
 tduck-api/src/main/resources/application.yml                  | 2 +-
 .../tduck/cloud/project/entity/enums/ProjectItemTypeEnum.java | 2 +-
 .../cloud/project/request/QueryProjectResultRequest.java      | 2 +-
 .../project/service/impl/UserProjectResultServiceImpl.java    | 1 +
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectResultController.java b/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectResultController.java
index ec01880..bbfb245 100644
--- a/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectResultController.java
+++ b/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectResultController.java
@@ -77,8 +77,8 @@ public class UserProjectResultController {
      * @param request
      * @return
      */
-    @PostMapping("/create")
     @NoRepeatSubmit
+    @PostMapping("/create")
     public Result createProjectResult(@RequestBody UserProjectResultEntity entity, HttpServletRequest request) {
         Result<UserProjectSettingEntity> userProjectSettingStatus = userProjectSettingService.getUserProjectSettingStatus(entity.getProjectKey(), HttpUtils.getIpAddr(request));
         if (StrUtil.isNotBlank(userProjectSettingStatus.getMsg())) {
@@ -132,7 +132,7 @@ public class UserProjectResultController {
      * @param request
      * @return
      */
-//    @Login
+    @Login
     @GetMapping("/download/file")
     public Result downloadProjectResultFile(QueryProjectResultRequest request) {
         return projectResultService.downloadProjectResultFile(request);
diff --git a/tduck-api/src/main/resources/application.yml b/tduck-api/src/main/resources/application.yml
index 130d330..5a4db19 100644
--- a/tduck-api/src/main/resources/application.yml
+++ b/tduck-api/src/main/resources/application.yml
@@ -16,7 +16,7 @@ spring:
       max-request-size: 100MB
 
 server:
-  port: 8978
+  port: 8999
   servlet:
     context-path: /tduck-api
 
diff --git a/tduck-project/src/main/java/com/tduck/cloud/project/entity/enums/ProjectItemTypeEnum.java b/tduck-project/src/main/java/com/tduck/cloud/project/entity/enums/ProjectItemTypeEnum.java
index d579c1f..c8db747 100644
--- a/tduck-project/src/main/java/com/tduck/cloud/project/entity/enums/ProjectItemTypeEnum.java
+++ b/tduck-project/src/main/java/com/tduck/cloud/project/entity/enums/ProjectItemTypeEnum.java
@@ -35,7 +35,7 @@ public enum ProjectItemTypeEnum {
     UPLOAD("UPLOAD", "文件上传组件", UploadExpandStruct.class),
     IMAGE("IMAGE", "图片展示", ImageExpandStruct.class),
     IMAGE_SELECT("IMAGE_SELECT", "图片选择", ImageSelectExpandStruct.class),
-    IMAGE_CAROUSEL("IMAGE_CAROUSEL", "图片选择", ImageCarouselExpandStruct.class),
+    IMAGE_CAROUSEL("IMAGE_CAROUSEL", "图片轮播", ImageCarouselExpandStruct.class),
     DESC_TEXT("DESC_TEXT", "文字描述", DescTextExpandStruct.class),
     SIGN_PAD("SIGN_PAD", "手写签名", SignPadExpandStruct.class),
     PAGINATION("PAGINATION", "分页", PaginationExpandStruct.class),
diff --git a/tduck-project/src/main/java/com/tduck/cloud/project/request/QueryProjectResultRequest.java b/tduck-project/src/main/java/com/tduck/cloud/project/request/QueryProjectResultRequest.java
index f4d747f..a32e533 100644
--- a/tduck-project/src/main/java/com/tduck/cloud/project/request/QueryProjectResultRequest.java
+++ b/tduck-project/src/main/java/com/tduck/cloud/project/request/QueryProjectResultRequest.java
@@ -37,7 +37,7 @@ public class QueryProjectResultRequest extends PageRequest {
     /**
      * 动态字段
      */
-    private Map<String, Object> expand;
+    private Map<String, Object> extParams;
 
 
 }
diff --git a/tduck-project/src/main/java/com/tduck/cloud/project/service/impl/UserProjectResultServiceImpl.java b/tduck-project/src/main/java/com/tduck/cloud/project/service/impl/UserProjectResultServiceImpl.java
index b7a1737..b238db0 100644
--- a/tduck-project/src/main/java/com/tduck/cloud/project/service/impl/UserProjectResultServiceImpl.java
+++ b/tduck-project/src/main/java/com/tduck/cloud/project/service/impl/UserProjectResultServiceImpl.java
@@ -77,6 +77,7 @@ public class UserProjectResultServiceImpl extends ServiceImpl<UserProjectResultM
                 .eq(UserProjectResultEntity::getProjectKey, request.getProjectKey())
                 .le(ObjectUtil.isNotNull(request.getEndDateTime()), UserProjectResultEntity::getCreateTime, request.getEndDateTime())
                 .ge(ObjectUtil.isNotNull(request.getBeginDateTime()), UserProjectResultEntity::getCreateTime, request.getBeginDateTime())
+
                 .orderByDesc(BaseEntity::getCreateTime));
     }