Commit 3a8e8bb0 authored by linruibiao's avatar linruibiao

接口编写

parent 6d328439
......@@ -67,6 +67,10 @@ public class BaseRestController {
@Value("${dc_client.interfaces.variableHistoryStatus}")
protected String variableHistoryStatus;
@Value("${dc_client.interfaces.historyCurve}")
protected String historyCurve;
@ModelAttribute
......
......@@ -129,6 +129,18 @@ 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("/send")
@ApiOperation("下发")
@ApiImplicitParam(name = "appId", value = "租户id", required = true,dataTypeClass = String.class)
......
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 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;
}
......@@ -87,4 +87,12 @@ public interface VariableService {
* @return
*/
Map<String,Object> historyStatus(String uri, String deviceId, String variableCode, String startTime, String endTime, CurrentUser currentUser);
/**
* 获取历史双曲线
* @param variableDTO
* @param currentUser
* @return
*/
List<Map<String, Object>> getVariableHistoryCurve(VariableHistoryCurveDataDTO variableDTO, CurrentUser currentUser,String uri);
}
......@@ -320,6 +320,30 @@ 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();
}
private R<Map<String,String>> setDeptAndRole(CurrentUser user,String uri){
Map<String,String> uriVariables =Maps.newHashMap();
uriVariables.put("appId",user.getAppId());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment