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

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

@@ -86,11 +86,11 @@ public class VariableController extends BaseRestController{
         });
     }
 
-    @GetMapping("/real-time")
+    @PostMapping("/real-time")
     @ApiOperation("获取变量实时数据")
     @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,
-        VariableRealTimeDTO variableDTO) {
+        @RequestBody VariableRealTimeDTO variableDTO) {
         return call(() -> {
             CurrentUser currentUser = getCurrentUser(request);
             return variableService.getVariableRealTimeDataList(dcClientHost + variableRealTimeDataList,
@@ -116,11 +116,11 @@ public class VariableController extends BaseRestController{
         });
     }
 
-    @GetMapping("/history")
+    @PostMapping("/history")
     @ApiOperation("获取变量历史数据")
     @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,
-        VariableHistoryDataDTO variableDTO) {
+        @RequestBody VariableHistoryDataDTO variableDTO) {
         return call(() -> {
             CurrentUser currentUser = getCurrentUser(request);
             return variableService.getVariableHistoryDataList(dcClientHost + variableHistoryDataList,

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

@@ -142,9 +142,10 @@ public class VariableServiceImpl implements VariableService {
         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 =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.get(uri, new TypeToken< R<List<Map<String,List<Map<String,Object>>>>>>() {}.getType(), uriVariables);
+        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);
         return result.detach();
     }
 
@@ -194,10 +195,11 @@ 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();
         uriVariables.put("appId",user.getAppId());
 
-        R<List<Map<String,List<Map<String,Object>>>>> result = RestTemplateUtils.get(uri, new TypeToken<R<List<Map<String,List<Map<String,Object>>>>>>() {}.getType(), uriVariables);
+        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);
         return result.detach();
     }
 

src/main/resources/application.yml

@@ -58,8 +58,10 @@ dc_client:
     deviceList : /{appId}/variables/device?token={token}&equipment_info_id={equipment_info_id}&q_name={q_name}&search_code={search_code}&warranty_status={warranty_status}&page_num={page_num}&page_size={page_size}
     deptsRoles : /{appId}/users/depts-roles
     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?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
     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