Commit 73350370 authored by 梁光意's avatar 梁光意

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

parent 0feb3e1e
...@@ -89,7 +89,7 @@ public class VariableController extends BaseRestController{ ...@@ -89,7 +89,7 @@ public class VariableController extends BaseRestController{
@PostMapping("/real-time") @PostMapping("/real-time")
@ApiOperation("获取变量实时数据") @ApiOperation("获取变量实时数据")
@ApiImplicitParam(name = "appId", value = "租户id", required = true,dataTypeClass = String.class) @ApiImplicitParam(name = "appId", value = "租户id", required = true,dataTypeClass = String.class)
public R<List<Map<String,List<Map<String,Object>>>>> getVariableRealTimeDataList(HttpServletRequest request,@PathVariable String appId, public R<Map<String,List<Map<String,Object>>>> getVariableRealTimeDataList(HttpServletRequest request,@PathVariable String appId,
@RequestBody VariableRealTimeDTO variableDTO) { @RequestBody VariableRealTimeDTO variableDTO) {
return call(() -> { return call(() -> {
CurrentUser currentUser = getCurrentUser(request); CurrentUser currentUser = getCurrentUser(request);
......
...@@ -47,7 +47,7 @@ public interface VariableService { ...@@ -47,7 +47,7 @@ public interface VariableService {
* @param user * @param user
* @return * @return
*/ */
List<Map<String,List<Map<String,Object>>>> getVariableRealTimeDataList(@NonNull String uri,VariableRealTimeDTO variableDTO,CurrentUser user); Map<String,List<Map<String,Object>>> getVariableRealTimeDataList(@NonNull String uri,VariableRealTimeDTO variableDTO,CurrentUser user);
/** /**
* 获取历史数据 * 获取历史数据
......
...@@ -119,7 +119,7 @@ public class VariableServiceImpl implements VariableService { ...@@ -119,7 +119,7 @@ public class VariableServiceImpl implements VariableService {
} }
@Override @Override
public List<Map<String,List<Map<String,Object>>>> getVariableRealTimeDataList(@NonNull String uri,VariableRealTimeDTO variableDTO,CurrentUser user) { public Map<String,List<Map<String,Object>>> getVariableRealTimeDataList(@NonNull String uri,VariableRealTimeDTO variableDTO,CurrentUser user) {
if(StringUtils.isBlank(uri)){ if(StringUtils.isBlank(uri)){
throw new SysException("请传入uri"); throw new SysException("请传入uri");
} }
...@@ -151,7 +151,7 @@ public class VariableServiceImpl implements VariableService { ...@@ -151,7 +151,7 @@ public class VariableServiceImpl implements VariableService {
// Map<String, String> uriVariables =SlmConstants.gson.fromJson(SlmConstants.gson.toJson(variableDTO),new TypeToken<Map<String,String>>(){}.getType()); // Map<String, String> uriVariables =SlmConstants.gson.fromJson(SlmConstants.gson.toJson(variableDTO),new TypeToken<Map<String,String>>(){}.getType());
Map<String, String> uriVariables = Maps.newHashMap(); Map<String, String> uriVariables = Maps.newHashMap();
uriVariables.put("appId",user.getAppId()); 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,List<Map<String,Object>>>> result = RestTemplateUtils.post(uri,variableDTO,new TypeToken< R<Map<String,List<Map<String,Object>>>>>() {}.getType(), uriVariables);
return result.detach(); return result.detach();
} }
......
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