填写结果公开

tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectController.java

@@ -163,7 +163,6 @@ public class UserProjectController {
      * @param key
      * @return
      */
-    @Login
     @GetMapping("/user/project/{key}")
     public Result queryProjectByKey(@PathVariable @NotBlank String key) {
         return Result.success(projectService.getByKey(key));
@@ -274,7 +273,6 @@ public class UserProjectController {
      * @param key
      * @return
      */
-    @Login
     @GetMapping("/user/project/item/list")
     public Result queryProjectItem(@RequestParam @NotBlank String key) {
         List<UserProjectItemEntity> itemEntityList = projectItemService.listByProjectKey(key);

tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectResultController.java

@@ -138,6 +138,22 @@ public class UserProjectResultController {
         return Result.success(projectResultService.listByQueryConditions(request));
     }
 
+
+    /**
+     * 查询公开结果
+     *
+     * @param request
+     * @return
+     */
+    @GetMapping("/public/page")
+    public Result queryProjectPublicResults(QueryProjectResultRequest request) {
+        UserProjectSettingEntity settingEntity = userProjectSettingService.getByProjectKey(request.getProjectKey());
+        if (!settingEntity.getPublicResult()) {
+            return Result.success();
+        }
+        return Result.success(projectResultService.listByQueryConditions(request));
+    }
+
     private void sendWriteResultNotify(UserProjectSettingEntity settingEntity, UserProjectResultEntity entity) {
         if (ObjectUtil.isNull(settingEntity)) {
             return;

tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectItemEntity.java

@@ -47,6 +47,12 @@ public class UserProjectItemEntity extends BaseEntity<UserProjectItemEntity> {
      */
     private String label;
 
+
+    /**
+     * 展示类型组件
+     */
+    @TableField("is_display_type")
+    private Boolean displayType;
     /**
      * 是否显示标签
      */
@@ -57,6 +63,11 @@ public class UserProjectItemEntity extends BaseEntity<UserProjectItemEntity> {
      */
     @TableField(typeHandler = JacksonTypeHandler.class)
     private ItemDefaultValueStruct defaultValue;
+
+    /**
+     * 是否能输入值
+     */
+    private Boolean canInputValue;
     /**
      * 是否必填
      */

tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectSettingEntity.java

@@ -39,6 +39,12 @@ public class UserProjectSettingEntity extends BaseEntity<UserProjectSettingEntit
      * 提交跳转连接
      */
     private String submitJumpUrl;
+
+    /**
+     * 公开提交结果
+     */
+    @TableField("is_public_result")
+    private Boolean publicResult;
     /**
      * 只在微信填写
      */

tduck-project/src/main/java/com/tduck/cloud/project/entity/struct/InputExpandStruct.java

@@ -24,4 +24,13 @@ public class InputExpandStruct {
      */
     private Long maxlength;
 
+    /**
+     * 前置图标
+     */
+    private String prefixIcon;
+
+    /**
+     * 显示可输入字数
+     */
+    private Boolean showWordLimit;
 }

tduck-project/src/main/java/com/tduck/cloud/project/request/OperateProjectItemRequest.java

@@ -38,6 +38,10 @@ public class OperateProjectItemRequest {
     private String label;
 
 
+    /**
+     * 是否有输入值
+     */
+    private Boolean displayType;
     /***
      * 是否显示标签
      */

tduck-project/src/main/java/com/tduck/cloud/project/service/UserProjectSettingService.java

@@ -23,4 +23,12 @@ public interface UserProjectSettingService extends IService<UserProjectSettingEn
      */
     Result getUserProjectSettingStatus(String projectKey, String requestIp);
 
+
+    /**
+     * 查询
+     *
+     * @param projectKey
+     * @return
+     */
+    UserProjectSettingEntity getByProjectKey(String projectKey);
 }

tduck-project/src/main/java/com/tduck/cloud/project/service/impl/UserProjectResultServiceImpl.java

@@ -2,6 +2,7 @@ package com.tduck.cloud.project.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -54,7 +55,7 @@ public class UserProjectResultServiceImpl extends ServiceImpl<UserProjectResultM
     @Override
     public void saveProjectResult(UserProjectResultEntity entity) {
         String projectKey = entity.getProjectKey();
-        entity.setSerialNumber(redisUtils.incr(PROJECT_RESULT_NUMBER, CommonConstants.ConstantNumber.ONE));
+        entity.setSerialNumber(redisUtils.incr(StrUtil.format(PROJECT_RESULT_NUMBER,projectKey), CommonConstants.ConstantNumber.ONE));
         entity.setSubmitAddress(AddressUtils.getRealAddressByIP(entity.getSubmitRequestIp()));
         this.save(entity);
 

tduck-project/src/main/java/com/tduck/cloud/project/service/impl/UserProjectSettingServiceImpl.java

@@ -85,4 +85,10 @@ public class UserProjectSettingServiceImpl extends ServiceImpl<UserProjectSettin
         }
         return Result.success(setting);
     }
+
+    @Override
+    public UserProjectSettingEntity getByProjectKey(String projectKey) {
+        return this
+                .getOne(Wrappers.<UserProjectSettingEntity>lambdaQuery().eq(UserProjectSettingEntity::getProjectKey, projectKey));
+    }
 }