修改获取实时和历史变量数据

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

@@ -53,9 +53,9 @@ public class BaseRestController {
     protected String businessFiledData;
 
 
-    @Value("${dc_client.interfaces.variableHistoryDataList}")
+    @Value("${dc_client.interfaces.variableCodeHistoryList}")
     protected String variableHistoryDataList;
-    @Value("${dc_client.interfaces.variableRealTimeDataList}")
+    @Value("${dc_client.interfaces.variableAllDataList}")
     protected String variableRealTimeDataList;
     @Value("${dc_client.interfaces.filedValue}")
     protected String filedValue;
@@ -67,8 +67,8 @@ public class BaseRestController {
     @Value("${dc_client.interfaces.variableHistoryStatus}")
     protected String variableHistoryStatus;
 
-    @Value("${dc_client.interfaces.historyCurve}")
-    protected String historyCurve;
+//    @Value("${dc_client.interfaces.historyCurve}")
+//    protected String historyCurve;
 
 
 

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

@@ -86,11 +86,11 @@ public class VariableController extends BaseRestController{
         });
     }
 
-    @PostMapping("/real-time")
-    @ApiOperation("获取变量实时数据")
+    @PostMapping("/all/data")
+    @ApiOperation("获取变量全部数据（按时间段）")
     @ApiImplicitParam(name = "appId", value = "租户id", required = true,dataTypeClass = String.class)
-    public R<Map<String,List<Map<String,Object>>>> getVariableRealTimeDataList(HttpServletRequest request,@PathVariable String appId,
-        @RequestBody VariableRealTimeDTO variableDTO) {
+    public R<Map<String,List<Object>>> getVariableRealTimeDataList(HttpServletRequest request,@PathVariable String appId,
+        @RequestBody VariableAllDataDTO variableDTO) {
         return call(() -> {
             CurrentUser currentUser = getCurrentUser(request);
             return variableService.getVariableRealTimeDataList(dcClientHost + variableRealTimeDataList,
@@ -116,10 +116,10 @@ public class VariableController extends BaseRestController{
         });
     }
 
-    @PostMapping("/history")
-    @ApiOperation("获取变量历史数据")
+    @PostMapping("/variableCode/history")
+    @ApiOperation("以变量为X轴获取变量历史数据")
     @ApiImplicitParam(name = "appId", value = "租户id", required = true,dataTypeClass = String.class)
-    public R<List<Map<String,List<Map<String,Object>>>>> getVariableHistoryDataList(HttpServletRequest request,@PathVariable String appId,
+    public R<Map<String,Object>> getVariableHistoryDataList(HttpServletRequest request,@PathVariable String appId,
         @RequestBody VariableHistoryDataDTO variableDTO) {
         return call(() -> {
             CurrentUser currentUser = getCurrentUser(request);
@@ -130,16 +130,16 @@ public class VariableController extends BaseRestController{
     }
 
 
-    @GetMapping("/history-curve")
-    @ApiOperation("获取变量历史曲线数据")
-    @ApiImplicitParam(name = "appId", value = "租户id", required = true,dataTypeClass = String.class)
-    public R<List<Map<String, Object>>> getVariableHistoryCurve(HttpServletRequest request,@PathVariable String appId,
-        VariableHistoryCurveDataDTO variableDTO) {
-        return call(() -> {
-            CurrentUser currentUser = getCurrentUser(request);
-            return variableService.getVariableHistoryCurve(variableDTO,currentUser,dcClientHost+historyCurve);
-        });
-    }
+//    @PostMapping("/history-curve")
+//    @ApiOperation("获取变量历史曲线数据")
+//    @ApiImplicitParam(name = "appId", value = "租户id", required = true,dataTypeClass = String.class)
+//    public R<Map<String,List<Map<String,Object>>>> getVariableHistoryCurve(HttpServletRequest request,@PathVariable String appId,
+//        @RequestBody VariableHistoryCurveDataDTO variableDTO) {
+//        return call(() -> {
+//            CurrentUser currentUser = getCurrentUser(request);
+//            return variableService.getVariableHistoryCurve(variableDTO,currentUser,dcClientHost+historyCurve);
+//        });
+//    }
 
     @PostMapping("/send")
     @ApiOperation("下发")

src/main/java/com/syc/slm/slmbi/dto/VariableRealTimeDTO.java → src/main/java/com/syc/slm/slmbi/dto/VariableAllDataDTO.java

@@ -15,22 +15,14 @@ import java.util.Map;
  **/
 @ApiModel("变量DTO")
 @Data
-public class VariableRealTimeDTO {
-//    @ApiModelProperty(value = "所属设备", required = true)
-//    private String deviceId;
-//    @ApiModelProperty(value = "变量id", required = true)
-//    private String variableId;
-//    @ApiModelProperty(value = "变量Code", required = true)
-//    private String variableCode;
+public class VariableAllDataDTO {
+
     @ApiModelProperty(value = "开始时间(时间戳)",required = true)
     private String startTime;
     @ApiModelProperty(value = "结束时间(时间戳)", required = true)
     private String endTime;
-    @ApiModelProperty(value = "(如果x轴为变量直接填yyyy-MM-dd HH:mm:ss）请填时间格式如(yyyy-MM-dd HH:mm:ss)", required = true)
-    private String format;
 
     @ApiModelProperty(value = "变量信息", required = true)
     private List<VariableSearchDTO> variableSearchList;
-    @ApiModelProperty(value = "统计维度，如果是时间填time,如果是变量填variableCode", required = true)
-    private String x;
+
 }

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

@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * slm-bi
  * 历史曲线DTO
@@ -13,16 +15,11 @@ import lombok.Data;
 @ApiModel("变量DTO")
 @Data
 public class VariableHistoryCurveDataDTO {
-    @ApiModelProperty(value = "所属设备", required = true)
-    private String deviceId;
-    @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;
-    @ApiModelProperty(value = "请填时间格式如(yyyy-MM-dd HH:mm:ss)", required = true)
-    private String format;
+
+    @ApiModelProperty(value = "变量信息", required = true)
+    private List<VariableSearchDTO> variableSearchList;
 }

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

@@ -16,26 +16,13 @@ import java.util.List;
 @ApiModel("变量DTO")
 @Data
 public class VariableHistoryDataDTO {
-//    @ApiModelProperty(value = "所属设备", required = true)
-//    private String deviceId;
+
     @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 = "开始时间(时间戳)",required = true)
     private String startTime;
     @ApiModelProperty(value = "结束时间(时间戳)", required = true)
     private String endTime;
-
-    @ApiModelProperty(value = "统计维度，如果是时间填time,如果是变量填variableCode", required = true)
-    private String x;
-    @ApiModelProperty(value = "统计维度如果是时间,请填时间格式如(yyyy-MM-dd HH:mm:ss)，非时间为空", required = true)
-    private String format;
-
-//    @ApiModelProperty(value = "key 为变量id value 为变量名称", required = true)
-//    private Map<String,String> variables;
     @ApiModelProperty(value = "变量信息", required = true)
     private List<VariableSearchDTO> variableSearchList;
 }

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

@@ -38,9 +38,22 @@ public enum StatisticsType {
     /**
      * 原值
      */
-    ORIGINAL("original");
+    ORIGINAL("original"),
+
+    /**
+     * 计数
+     */
+    COUNT("count"),
+
+    /***
+     * 去重计数
+     */
+    DUPLICATE_COUNT("duplicate_count");
+
     public String value;
 
+
+
     StatisticsType(String v) {
         value = v;
     }

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

@@ -47,7 +47,7 @@ public interface VariableService {
      * @param user
      * @return
      */
-    Map<String,List<Map<String,Object>>> getVariableRealTimeDataList(@NonNull String uri,VariableRealTimeDTO variableDTO,CurrentUser user);
+    Map<String,List<Object>> getVariableRealTimeDataList(@NonNull String uri, VariableAllDataDTO variableDTO,CurrentUser user);
 
     /**
      * 获取历史数据
@@ -56,7 +56,7 @@ public interface VariableService {
      * @param currentUser
      * @return
      */
-    List<Map<String,List<Map<String,Object>>>> getVariableHistoryDataList(@NonNull String uri,
+    Map<String,Object> getVariableHistoryDataList(@NonNull String uri,
         VariableHistoryDataDTO variableDTO,CurrentUser currentUser);
 
     /**
@@ -94,5 +94,5 @@ public interface VariableService {
      * @param currentUser
      * @return
      */
-    List<Map<String, Object>> getVariableHistoryCurve(VariableHistoryCurveDataDTO variableDTO, CurrentUser currentUser,String uri);
+     // Map<String,List<Map<String,Object>>> getVariableHistoryCurve(VariableHistoryCurveDataDTO variableDTO, CurrentUser currentUser,String uri);
 }

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

@@ -23,7 +23,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -119,13 +118,11 @@ public class VariableServiceImpl implements VariableService {
     }
 
     @Override
-    public Map<String,List<Map<String,Object>>> getVariableRealTimeDataList(@NonNull String uri,VariableRealTimeDTO variableDTO,CurrentUser user) {
+    public Map<String,List<Object>> getVariableRealTimeDataList(@NonNull String uri,
+        VariableAllDataDTO variableDTO,CurrentUser user) {
         if(StringUtils.isBlank(uri)){
             throw new SysException("请传入uri");
         }
-//        if(StringUtils.isBlank(variableDTO.getDeviceId())){
-//            throw new SysException("请传入设备id");
-//        }
         if(CollectionUtils.isEmpty(variableDTO.getVariableSearchList())){
             throw new SysException("请传入变量");
         }else{
@@ -145,32 +142,19 @@ public class VariableServiceImpl implements VariableService {
         if(StringUtils.isBlank(variableDTO.getStartTime())){
             throw new SysException("请传入开始时间");
         }
-        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());
         Map<String, String> uriVariables = Maps.newHashMap();
         uriVariables.put("appId",user.getAppId());
-        R<Map<String,List<Map<String,Object>>>> result = RestTemplateUtils.post(uri,variableDTO,new TypeToken< R<Map<String,List<Map<String,Object>>>>>() {}.getType(), uriVariables);
+        R<Map<String,List<Object>>> result = RestTemplateUtils.post(uri,variableDTO,new TypeToken<R<Map<String,List<Object>>>>() {}.getType(), uriVariables);
         return result.detach();
     }
 
     @Override
-    public  List<Map<String,List<Map<String,Object>>>>  getVariableHistoryDataList(@NonNull String uri,
+    public  Map<String,Object>  getVariableHistoryDataList(@NonNull String uri,
         VariableHistoryDataDTO variableDTO,CurrentUser user) {
         if(StringUtils.isBlank(uri)){
             throw new SysException("请传入uri");
         }
-        /*if(StringUtils.isBlank(variableDTO.getDeviceId())){
-            throw new SysException("请传入设备id");
-        }
-        if(CollectionUtils.isEmpty(variableDTO.getVariables())){
-            throw new SysException("请传入变量");
-        }else{
-            if(variableDTO.getVariables().values().stream().anyMatch(StringUtils::isBlank)) {
-                throw new SysException("变量名字不能为空");
-            }
-        }*/
         if(CollectionUtils.isEmpty(variableDTO.getVariableSearchList())){
             throw new SysException("请传入变量");
         }else{
@@ -192,15 +176,6 @@ 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("统计维度为时间，请填入时间格式");
-            }
-        }else{
         if(StringUtils.isBlank(variableDTO.getStatisticsType())){
                 throw new SysException("请传入统计类型");
         }else{
@@ -209,16 +184,17 @@ public class VariableServiceImpl implements VariableService {
                         !StatisticsType.MAX.value.equals(variableDTO.getStatisticsType()) &&
                         !StatisticsType.MIN.value.equals(variableDTO.getStatisticsType()) &&
                         !StatisticsType.MIDDLE.value.equals(variableDTO.getStatisticsType()) &&
-                        !StatisticsType.ORIGINAL.value.equals(variableDTO.getStatisticsType())){
+                        !StatisticsType.ORIGINAL.value.equals(variableDTO.getStatisticsType()) &&
+                        !StatisticsType.COUNT.value.equals(variableDTO.getStatisticsType()) &&
+                        !StatisticsType.DUPLICATE_COUNT.value.equals(variableDTO.getStatisticsType())){
                 throw new SysException("没有对应匹配的统计类型");
             }
         }
-        }
        // Map<String, String> uriVariables =SlmConstants.gson.fromJson(SlmConstants.gson.toJson(variableDTO),new TypeToken<Map<String,String>>(){}.getType());
         Map<String, String> uriVariables = Maps.newHashMap();
         uriVariables.put("appId",user.getAppId());
 
-        R<List<Map<String,List<Map<String,Object>>>>> result = RestTemplateUtils.post(uri,variableDTO,new TypeToken<R<List<Map<String,List<Map<String,Object>>>>>>() {}.getType(), uriVariables);
+        R<Map<String,Object>> result = RestTemplateUtils.post(uri,variableDTO,new TypeToken<R<Map<String,Object>>>() {}.getType(), uriVariables);
         return result.detach();
     }
 
@@ -351,29 +327,36 @@ public class VariableServiceImpl implements VariableService {
         return  result.detach();
     }
 
-    @Override
-    public List<Map<String, Object>> getVariableHistoryCurve(VariableHistoryCurveDataDTO variableDTO,
-        CurrentUser user,String uri) {
-        if(StringUtils.isBlank(variableDTO.getDeviceId())){
-            throw new SysException("请传入设备id");
-        }
-        if(StringUtils.isBlank(variableDTO.getVariableCode())){
-            throw new SysException("请传入变量code");
-        }
-        if(StringUtils.isBlank(variableDTO.getEndTime())){
-            throw new SysException("请传入结束时间");
-        }
-        if(StringUtils.isBlank(variableDTO.getStartTime())){
-            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);
-        return result.detach();
-    }
+//    @Override
+//    public Map<String,List<Map<String,Object>>> getVariableHistoryCurve(VariableHistoryCurveDataDTO variableDTO, CurrentUser user,String uri) {
+//        if(CollectionUtils.isEmpty(variableDTO.getVariableSearchList())){
+//            throw new SysException("请传入变量");
+//        }else{
+//            if(variableDTO.getVariableSearchList().stream().anyMatch(x -> StringUtils.isBlank(x.getDeviceId()))){
+//                throw new SysException("设备ID不能为空");
+//            }
+//            if(variableDTO.getVariableSearchList().stream().anyMatch(x -> StringUtils.isBlank(x.getVariableId()))){
+//                throw new SysException("变量ID不能为空");
+//            }
+//            if(variableDTO.getVariableSearchList().stream().anyMatch(x -> StringUtils.isBlank(x.getVariableName()))){
+//                throw new SysException("变量名称不能为空");
+//            }
+//        }
+//        if(StringUtils.isBlank(variableDTO.getEndTime())){
+//            throw new SysException("请传入结束时间");
+//        }
+//        if(StringUtils.isBlank(variableDTO.getStartTime())){
+//            throw new SysException("请传入开始时间");
+//        }
+//
+//
+//        //Map<String, String> uriVariables =SlmConstants.gson.fromJson(SlmConstants.gson.toJson(variableDTO),new TypeToken<Map<String,String>>(){}.getType());
+//        Map<String, String> uriVariables = Maps.newHashMap();
+//        uriVariables.put("appId",user.getAppId());
+//
+//        R<Map<String,List<Map<String,Object>>>> result = RestTemplateUtils.post(uri,variableDTO,new TypeToken<R<Map<String,List<Map<String,Object>>>>>() {}.getType(), uriVariables);
+//        return result.detach();
+//    }
 
     private  R<Map<String,String>> setDeptAndRole(CurrentUser user,String uri){
         Map<String,String> uriVariables =Maps.newHashMap();

src/main/resources/application.yml

@@ -60,11 +60,12 @@ dc_client:
     businessFiledData : /{appId}/business/filed
     # variableHistoryDataList: /{appId}/variables/history?deviceId={deviceId}&endTime={endTime}&startTime={startTime}&statisticsType={statisticsType}&variableCode={variableCode}&variableId={variableId}&x={x}&format={format}
     # variableRealTimeDataList: /{appId}/variables/real-time?deviceId={deviceId}&endTime={endTime}&startTime={startTime}&variableCode={variableCode}&variableId={variableId}&format={format}
-    variableHistoryDataList: /{appId}/variables/history
-    variableRealTimeDataList: /{appId}/variables/real-time
+    variableCodeHistoryList: /{appId}/variables/variableCode/history
+    variableAllDataList: /{appId}/variables/all/data
     filedValue : /{appId}/business/{tableName}/{filed}/filed-value?current={current}&size={size}&name={name}       #/{appId}/business/{tableName}/{filed}/filed-value?current={current}&size={size}&name={name}
     send : /{appId}/variables/monitor/device/commands
     variableStatus : /{appId}/variables/{deviceId}/{variableCode}/status
     variableHistoryStatus : /{appId}/variables/{deviceId}/{variableCode}/history-status?startTime={startTime}&endTime={endTime}
-    historyCurve : /{appId}/variables/history-curve?deviceId={deviceId}&endTime={endTime}&startTime={startTime}&variableCode={variableCode}&variableId={variableId}&format={format}
+    # historyCurve : /{appId}/variables/history-curve?deviceId={deviceId}&endTime={endTime}&startTime={startTime}&variableCode={variableCode}&variableId={variableId}&format={format}
+    # historyCurve : /{appId}/variables/history-curve
     permissionCodeUrl : /{appId}/bi/permission/code
\ No newline at end of file