bi接口

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

@@ -119,7 +119,7 @@ public class VariableController extends BaseRestController{
     @GetMapping("/history")
     @ApiOperation("获取变量历史数据")
     @ApiImplicitParam(name = "appId", value = "租户id", required = true,dataTypeClass = String.class)
-    public R< List<Map<String, Object>> > getVariableHistoryDataList(HttpServletRequest request,@PathVariable String appId,
+    public R<List<Map<String,List<Map<String,Object>>>>> getVariableHistoryDataList(HttpServletRequest request,@PathVariable String appId,
         VariableHistoryDataDTO variableDTO) {
         return call(() -> {
             CurrentUser currentUser = getCurrentUser(request);

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

@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Map;
+
 
 /**
  * slm-bi
@@ -16,12 +18,12 @@ import lombok.Data;
 public class VariableHistoryDataDTO {
     @ApiModelProperty(value = "所属设备", required = true)
     private String deviceId;
-    @ApiModelProperty(value = "统计类型,代表(合计值(sum)，平均值(avg)，最大值(max)，最小值(min) 中位数(middle),原值 original)", required = true)
+    @ApiModelProperty(value = "(x轴为变量时，统计类型必填)统计类型,代表(合计值(sum)，平均值(avg)，最大值(max)，最小值(min) 中位数(middle),原值 original)", required = true)
     private String statisticsType;
-    @ApiModelProperty(value = "变量id", required = true)
-    private String variableId;
-    @ApiModelProperty(value = "变量Code", required = true)
-    private String variableCode;
+//    @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)
@@ -31,4 +33,7 @@ public class VariableHistoryDataDTO {
     private String x;
     @ApiModelProperty(value = "统计维度如果是时间,请填时间格式如(yyyy-MM-dd HH:mm:ss)，非时间为空", required = true)
     private String format;
+
+    @ApiModelProperty(value = "key 为变量id value 为变量名称", required = true)
+    Map<String,String> variables;
 }

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

@@ -56,7 +56,7 @@ public interface VariableService {
      * @param currentUser
      * @return
      */
-    List<Map<String, Object>> getVariableHistoryDataList(@NonNull String uri,
+    List<Map<String,List<Map<String,Object>>>> getVariableHistoryDataList(@NonNull String uri,
         VariableHistoryDataDTO variableDTO,CurrentUser currentUser);
 
     /**

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

@@ -145,7 +145,7 @@ public class VariableServiceImpl implements VariableService {
     }
 
     @Override
-    public  List<Map<String, Object>>  getVariableHistoryDataList(@NonNull String uri,
+    public  List<Map<String,List<Map<String,Object>>>>  getVariableHistoryDataList(@NonNull String uri,
         VariableHistoryDataDTO variableDTO,CurrentUser user) {
         if(StringUtils.isBlank(uri)){
             throw new SysException("请传入uri");
@@ -153,15 +153,30 @@ public class VariableServiceImpl implements VariableService {
         if(StringUtils.isBlank(variableDTO.getDeviceId())){
             throw new SysException("请传入设备id");
         }
-        if(StringUtils.isBlank(variableDTO.getVariableCode())){
-            throw new SysException("请传入变量code");
+        if(CollectionUtils.isEmpty(variableDTO.getVariables())){
+            throw new SysException("请传入变量");
+        }else{
+            if(variableDTO.getVariables().values().stream().anyMatch(StringUtils::isBlank)) {
+                throw new SysException("变量名字不能为空");
             }
+        }
+
         if(StringUtils.isBlank(variableDTO.getEndTime())){
             throw new SysException("请传入结束时间");
         }
         if(StringUtils.isBlank(variableDTO.getStartTime())){
             throw new SysException("请传入开始时间");
         }
+
+
+        if(StringUtils.isBlank(variableDTO.getX())){
+            throw new SysException("请传入统计维度");
+        }
+        if("time".equals(variableDTO.getX())){
+            if(StringUtils.isBlank(variableDTO.getFormat())) {
+                throw new SysException("统计维度为时间，请填入时间格式");
+            }
+        }else{
             if(StringUtils.isBlank(variableDTO.getStatisticsType())){
                 throw new SysException("请传入统计类型");
             }else{
@@ -174,19 +189,11 @@ public class VariableServiceImpl implements VariableService {
                     throw new SysException("没有对应匹配的统计类型");
                 }
             }
-
-        if(StringUtils.isBlank(variableDTO.getX())){
-            throw new SysException("请传入统计维度");
-        }
-        if("time".equals(variableDTO.getX())){
-            if(StringUtils.isBlank(variableDTO.getFormat())) {
-                throw new SysException("统计维度为时间，请填入时间格式");
-            }
         }
         Map<String, String> uriVariables =SlmConstants.gson.fromJson(SlmConstants.gson.toJson(variableDTO),new TypeToken<Map<String,String>>(){}.getType());
         uriVariables.put("appId",user.getAppId());
 
-        R<List<Map<String, Object>>> result = RestTemplateUtils.get(uri, new TypeToken<R<List<Map<String, Object>>>>() {}.getType(), uriVariables);
+        R<List<Map<String,List<Map<String,Object>>>>> result = RestTemplateUtils.get(uri, new TypeToken<R<List<Map<String,List<Map<String,Object>>>>>>() {}.getType(), uriVariables);
         return result.detach();
     }