Przeglądaj źródła

调整接口返回参数

wangchenghong 4 lat temu
rodzic
commit
9c723a8cd4

+ 11 - 5
src/main/java/com/persagy/apm/energy/report/monthly/outline/controller/ReportOutlineController.java

@@ -9,11 +9,11 @@ import com.persagy.apm.energy.report.monthly.outline.model.ConvertReportOutlineT
 import com.persagy.apm.energy.report.monthly.outline.model.ReportOutline;
 import com.persagy.apm.energy.report.monthly.outline.model.dto.AddReportOutlineDTO;
 import com.persagy.apm.energy.report.monthly.outline.model.dto.PageQueryReportOutlineDTO;
-import com.persagy.apm.energy.report.monthly.outline.model.dto.QueryReportOutlineDTO;
+import com.persagy.apm.energy.report.monthly.outline.model.vo.ResponseReportBelongItemVO;
 import com.persagy.apm.energy.report.monthly.outline.model.vo.ResponseReportOutlineListItemVO;
+import com.persagy.apm.energy.report.monthly.outline.model.vo.ResponseReportTypeVO;
 import com.persagy.apm.energy.report.monthly.outline.service.IReportOutlineService;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import org.assertj.core.util.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,7 +24,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
-import java.util.List;
 
 /**
  * 报告概要控制层
@@ -102,14 +101,21 @@ public class ReportOutlineController {
 
     @ApiOperation(value = "查询用户可选项目范围")
     @PostMapping("/queryAvailableProjects")
-    public CommonResult<PageList<ResponseReportOutlineListItemVO>> queryAvailableProjects() {
+    public CommonResult<PageList<ResponseReportBelongItemVO>> queryAvailableProjects() {
         // TODO: 2021/5/17 查询用户可选项目范围
         return ResultHelper.multi(Lists.newArrayList());
     }
 
     @ApiOperation(value = "查询用户可选分区范围")
     @PostMapping("/queryAvailableAreas")
-    public CommonResult<PageList<ResponseReportOutlineListItemVO>> queryAvailableAreas() {
+    public CommonResult<PageList<ResponseReportBelongItemVO>> queryAvailableAreas() {
+        // TODO: 2021/5/17 查询用户可选分区范围
+        return ResultHelper.multi(Lists.newArrayList());
+    }
+
+    @ApiOperation(value = "查询用户可选报告类型")
+    @PostMapping("/queryReportType")
+    public CommonResult<PageList<ResponseReportTypeVO>> queryReportType() {
         // TODO: 2021/5/17 查询用户可选分区范围
         return ResultHelper.multi(Lists.newArrayList());
     }

+ 31 - 0
src/main/java/com/persagy/apm/energy/report/monthly/outline/model/vo/ResponseReportBelongItemVO.java

@@ -0,0 +1,31 @@
+package com.persagy.apm.energy.report.monthly.outline.model.vo;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author lixing
+ * @version V1.0 2021-05-17 11:09:38
+ */
+@Data
+@ApiModel(value = "报告所属范围")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class ResponseReportBelongItemVO {
+    @ApiModelProperty("id")
+    private String id;
+
+    @ApiModelProperty("名称")
+    private String name;
+
+    @ApiModelProperty("是否可选 0-不可选 1-可选")
+    private Integer selected;
+
+    @ApiModelProperty("子级")
+    private List<ResponseReportBelongItemVO> childs;
+
+}

+ 7 - 1
src/main/java/com/persagy/apm/energy/report/monthly/outline/model/vo/ResponseReportOutlineListItemVO.java

@@ -25,9 +25,15 @@ public class ResponseReportOutlineListItemVO {
     @ApiModelProperty("报告日期")
     private Date date;
 
-    @ApiModelProperty("报告所属")
+    @ApiModelProperty("报告所属类型")
     private String belong;
 
+    @ApiModelProperty("报告所属对象id")
+    private String objectId;
+
+    @ApiModelProperty("报告所属对象名称")
+    private String objectName;
+
     @ApiModelProperty("报告类型")
     private String type;
 

+ 27 - 0
src/main/java/com/persagy/apm/energy/report/monthly/outline/model/vo/ResponseReportTypeVO.java

@@ -0,0 +1,27 @@
+package com.persagy.apm.energy.report.monthly.outline.model.vo;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author lixing
+ * @version V1.0 2021-05-17 11:09:38
+ */
+@Data
+@ApiModel(value = "报告类型对象")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class ResponseReportTypeVO {
+    @ApiModelProperty("报告类型id")
+    private String id;
+
+    @ApiModelProperty("报告类型名称")
+    private String name;
+
+    @ApiModelProperty("报告所属")
+    private Integer belong;
+
+}