接口编写

src/main/java/com/syc/slm/slmbi/controller/VariableController.java

@@ -83,7 +83,7 @@ public class VariableController extends BaseRestController{
     @ApiOperation("获取变量实时数据")
     @ApiImplicitParam(name = "appId", value = "租户id", required = true,dataTypeClass = String.class)
     public R<Map<String, List<Map<String, RealTimeVariableVo>>>> getVariableRealTimeDataList(@PathVariable String appId,
-        RealTimeVariableDTO variableDTO) {
+        VariableDataDTO variableDTO) {
         return call(()->(variableService.getVariableRealTimeDataList(variableDTO)));
     }
 
@@ -104,8 +104,7 @@ public class VariableController extends BaseRestController{
     @GetMapping("/history")
     @ApiOperation("获取变量历史数据")
     @ApiImplicitParam(name = "appId", value = "租户id", required = true,dataTypeClass = String.class)
-    public R<Map<String, List<Map<String, HistoryVariableVo>>>> getVariableHistoryDataList(@PathVariable String appId,
-        HistoryVariableDTO variableDTO) {
+    public R<Map<String, List<Map<String, HistoryVariableVo>>>> getVariableHistoryDataList(@PathVariable String appId,VariableDataDTO variableDTO) {
         return call(()->(variableService.getVariableHistoryDataList(variableDTO)));
     }
 }

src/main/java/com/syc/slm/slmbi/dto/HistoryVariableDTO.java

-package com.syc.slm.slmbi.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * slm-bi
- * 历史变量数据查询DTO
- * @author : lin
- * @date : 2021-03-30 15:21
- **/
-@Data
-@ApiModel(value = "历史变量数据查询DTO")
-@EqualsAndHashCode(callSuper=false)
-public class HistoryVariableDTO {
-    @ApiModelProperty(value = "所属设备", required = true)
-    private String deviceId;
-    @ApiModelProperty(value = "统计类型,代表(合计值 1，平均值 2，最大值 3，最小值 4)", required = true)
-    private Integer statisticsType;
-    @ApiModelProperty(value = "变量集合ids", required = true)
-    private List<String> variableIds;
-    @ApiModelProperty(value = "开始时间",required = true)
-    private Date startTime;
-    @ApiModelProperty(value = "结束时间", required = true)
-    private Date endTime;
-    @ApiModelProperty(value = "以变量为维度是1 , 以时间为维度是2", required = true)
-    private Integer dimension;
-}

src/main/java/com/syc/slm/slmbi/dto/RealTimeVariableDTO.java

-package com.syc.slm.slmbi.dto;
-
-import com.syc.slm.slmbi.enums.StatisticsType;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * slm-bi
- * 实时变量DTO
- * @author : lin
- * @date : 2021-03-30 15:05
- **/
-@ApiModel("实时变量DTO")
-@Data
-public class RealTimeVariableDTO {
-    @ApiModelProperty(value = "所属设备", required = true)
-    private String deviceId;
-    @ApiModelProperty(value = "时间格式", required = true)
-    private String format;
-    @ApiModelProperty(value = "时间间隔,代表(天，时，分，秒)", required = true)
-    private Integer interval;
-    @ApiModelProperty(value = "统计类型,代表(合计值，平均值，最大值，最小值)", required = true)
-    private StatisticsType statisticsType;
-    @ApiModelProperty(value = "变量集合ids", required = true)
-    private List<String> variableIds;
-    @ApiModelProperty(value = "以变量为维度是1 , 以时间为维度是2", required = true)
-    private Integer dimension;  //FIXME 考虑用枚举
-}

src/main/java/com/syc/slm/slmbi/dto/VariableDataDTO.java

+package com.syc.slm.slmbi.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * slm-bi
+ * 实时变量DTO
+ * @author : lin
+ * @date : 2021-03-30 15:05
+ **/
+@ApiModel("变量DTO")
+@Data
+public class VariableDataDTO {
+    @ApiModelProperty(value = "所属设备", required = true)
+    private String deviceId;
+    @ApiModelProperty(value = "统计类型,代表(合计值(sum)，平均值(avg)，最大值(max)，最小值(min) 中位数(middle))", required = true)
+    private String statisticsType;
+    @ApiModelProperty(value = "变量id", required = true)
+    private String variableId;
+    @ApiModelProperty(value = "变量Code", required = true)
+    private String variableCode;
+    @ApiModelProperty(value = "开始时间(时间戳)",required = true)
+    private String startTime;
+    @ApiModelProperty(value = "结束时间(时间戳)", required = true)
+    private String endTime;
+}

src/main/java/com/syc/slm/slmbi/enums/StatisticsType.java

@@ -8,19 +8,33 @@ package com.syc.slm.slmbi.enums;
  */
 public enum StatisticsType {
 
-    // 合计值
-    SUM,
+    /**
+     * 合计值
+     */
+    SUM("sum"),
 
-    // 平均值
-    AVG,
+    /**
+     * 平均值
+     */
+    AVG("avg"),
 
-    // 最大值
-    MAX,
+    /**
+     * 最大值
+     */
+    MAX("max"),
 
-    // 最小值
-    MIN;
+    /**
+     *  最小值
+     */
+    MIN("min"),
 
-    public static void main(String[] args) {
-        System.out.println(StatisticsType.MAX.name());
+    /**
+     * 中位数
+     */
+    MIDDLE("middle");
+  private String value;
+    StatisticsType(String v){
+        value=v;
     }
+
 }

src/main/java/com/syc/slm/slmbi/service/VariableService.java

 package com.syc.slm.slmbi.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.syc.slm.slmbi.dto.HistoryVariableDTO;
 import com.syc.slm.slmbi.dto.QueryPageDTO;
-import com.syc.slm.slmbi.dto.RealTimeVariableDTO;
+import com.syc.slm.slmbi.dto.VariableDataDTO;
 import com.syc.slm.slmbi.dto.VariableDTO;
 import com.syc.slm.slmbi.vo.*;
 
@@ -46,12 +45,12 @@ public interface VariableService {
      * @param variableDTO
      * @return
      */
-    Map<String, List<Map<String, RealTimeVariableVo>>> getVariableRealTimeDataList(RealTimeVariableDTO variableDTO);
+    Map<String, List<Map<String, RealTimeVariableVo>>> getVariableRealTimeDataList(VariableDataDTO variableDTO);
 
     /**
      * 获取历史数据
      * @param variableDTO
      * @return
      */
-    Map<String, List<Map<String, HistoryVariableVo>>> getVariableHistoryDataList(HistoryVariableDTO variableDTO);
+    Map<String, List<Map<String, HistoryVariableVo>>> getVariableHistoryDataList(VariableDataDTO variableDTO);
 }

src/main/java/com/syc/slm/slmbi/service/impl/VariableServiceImpl.java

@@ -9,9 +9,8 @@ import com.google.gson.reflect.TypeToken;
 import com.syc.slm.common.core.constant.SlmConstants;
 import com.syc.slm.common.core.util.R;
 import com.syc.slm.common.core.util.RestTemplateUtils;
-import com.syc.slm.slmbi.dto.HistoryVariableDTO;
 import com.syc.slm.slmbi.dto.QueryPageDTO;
-import com.syc.slm.slmbi.dto.RealTimeVariableDTO;
+import com.syc.slm.slmbi.dto.VariableDataDTO;
 import com.syc.slm.slmbi.dto.VariableDTO;
 import com.syc.slm.slmbi.service.VariableService;
 import com.syc.slm.slmbi.vo.*;
@@ -116,13 +115,13 @@ public class VariableServiceImpl implements VariableService {
     }
 
     @Override
-    public Map<String, List<Map<String, RealTimeVariableVo>>> getVariableRealTimeDataList(RealTimeVariableDTO variableDTO) {
+    public Map<String, List<Map<String, RealTimeVariableVo>>> getVariableRealTimeDataList(VariableDataDTO variableDTO) {
 
         return null;
     }
 
     @Override
-    public Map<String, List<Map<String, HistoryVariableVo>>> getVariableHistoryDataList(HistoryVariableDTO variableDTO) {
+    public Map<String, List<Map<String, HistoryVariableVo>>> getVariableHistoryDataList(VariableDataDTO variableDTO) {
         return null;
     }
 }