查看详情1

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/ItemResDetailFormDTO.java

@@ -0,0 +1,30 @@
+package com.epmet.dataaggre.dto.epmettduck.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Description 问卷-数据分析-查看详情
+ * @Author yinzuomei
+ * @Date 2021/9/22 1:29 下午
+ */
+@Data
+public class ItemResDetailFormDTO extends ProjectKeyCommonDTO{
+
+    @NotBlank(message = "formItemId不能为空",groups = AddUserInternalGroup.class)
+    private String formItemId;
+    /**
+     * 表单项类型
+     */
+    @NotBlank(message = "type不能为空",groups = AddUserInternalGroup.class)
+    private String type;
+
+
+    /**
+     * 09.22目前产品没要求分页
+     */
+    private Integer pageNo;
+    private Integer pageSize;
+}
+

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/ProjectKeyCommonDTO.java

@@ -2,6 +2,7 @@ package com.epmet.dataaggre.dto.epmettduck.form;
 
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**
@@ -11,10 +12,12 @@ import java.io.Serializable;
  */
 @Data
 public class ProjectKeyCommonDTO implements Serializable {
-
+    public interface AddUserInternalGroup {
+    }
     /**
      * 问卷id, 对应pr_user_project.key
      */
+    @NotBlank(message = "projectKey不能为空",groups = AddUserInternalGroup.class)
     private String projectKey;
 }
 

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java

@@ -5,10 +5,7 @@ import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dataaggre.dto.epmettduck.PrPublishRangeDTO;
-import com.epmet.dataaggre.dto.epmettduck.form.ProjectKeyCommonDTO;
+import com.epmet.dataaggre.dto.epmettduck.form.*;
-import com.epmet.dataaggre.dto.epmettduck.form.TDuckDetailFormDTO;
-import com.epmet.dataaggre.dto.epmettduck.form.TDuckHeaderInfoFormDTO;
-import com.epmet.dataaggre.dto.epmettduck.form.TDuckListFormDTO;
 import com.epmet.dataaggre.dto.epmettduck.result.AnalysisReportResDTO;
 import com.epmet.dataaggre.dto.epmettduck.result.GetRangeResultDTO;
 import com.epmet.dataaggre.dto.epmettduck.result.ProjectProfileResultDTO;
@@ -17,6 +14,7 @@ import com.epmet.dataaggre.entity.epmettduck.PrUserProjectEntity;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectItemEntity;
 import com.epmet.dataaggre.service.epmettduck.PrUserProjectItemService;
 import com.epmet.dataaggre.service.epmettduck.PrUserProjectService;
+import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -73,6 +71,7 @@ public class EpmetTDuckController {
      */
     @PostMapping("analysisreport")
     public Result<List<AnalysisReportResDTO>> queryAnalysisReport(@RequestBody ProjectKeyCommonDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO,ProjectKeyCommonDTO.AddUserInternalGroup.class);
         return new Result<List<AnalysisReportResDTO>>().ok(prUserProjectService.queryAnalysisReport(formDTO.getProjectKey()));
     }
 
@@ -113,4 +112,18 @@ public class EpmetTDuckController {
         return new Result<GetRangeResultDTO>().ok(prUserProjectService.getRange(formDTO.getProjectKey()));
     }
 
+    /**
+     * 查看详情
+     *
+     * @param formDTO
+     * @return  com.epmet.commons.tools.utils.Result
+     * @author yinzuomei
+     * @date 2021/9/22 1:37 下午
+     */
+    @PostMapping("itemresdetail")
+    public Result queryItemResDetail(@RequestBody ItemResDetailFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO,ProjectKeyCommonDTO.AddUserInternalGroup.class);
+        //todo
+        return null;
+    }
 }