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

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

@@ -89,13 +89,13 @@ public class VariableController extends BaseRestController{
     @PostMapping("/all/data")
     @ApiOperation("获取变量全部数据（按时间段）")
     @ApiImplicitParam(name = "appId", value = "租户id", required = true,dataTypeClass = String.class)
-    public R<Map<String,List<Object>>> getVariableRealTimeDataList(HttpServletRequest request,@PathVariable String appId,
+    public R<Map<String,List<Object>>> listVariableAllDataListByTimeInterval(HttpServletRequest request,@PathVariable String appId,
         @RequestBody VariableAllDataDTO variableDTO) {
         return call(() -> {
             CurrentUser currentUser = getCurrentUser(request);
-            return variableService.getVariableRealTimeDataList(dcClientHost + variableRealTimeDataList,
-                                                              variableDTO,
-                                                              currentUser);
+            return variableService.listVariableAllDataListByTimeInterval(dcClientHost + variableRealTimeDataList,
+                                                                         variableDTO,
+                                                                         currentUser);
         });
     }
 
@@ -119,13 +119,13 @@ public class VariableController extends BaseRestController{
     @PostMapping("/variableCode/history")
     @ApiOperation("以变量为X轴获取变量历史数据")
     @ApiImplicitParam(name = "appId", value = "租户id", required = true,dataTypeClass = String.class)
-    public R<Map<String,Object>> getVariableHistoryDataList(HttpServletRequest request,@PathVariable String appId,
+    public R<Map<String,Object>> listVariableHistoryDataListByCode(HttpServletRequest request,@PathVariable String appId,
         @RequestBody VariableHistoryDataDTO variableDTO) {
         return call(() -> {
             CurrentUser currentUser = getCurrentUser(request);
-            return variableService.getVariableHistoryDataList(dcClientHost + variableHistoryDataList,
-                                                              variableDTO,
-                                                              currentUser);
+            return variableService.listVariableHistoryDataListByCode(dcClientHost + variableHistoryDataList,
+                                                                     variableDTO,
+                                                                     currentUser);
         });
     }
 

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

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

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

@@ -118,7 +118,7 @@ public class VariableServiceImpl implements VariableService {
     }
 
     @Override
-    public Map<String,List<Object>> getVariableRealTimeDataList(@NonNull String uri,
+    public Map<String,List<Object>> listVariableAllDataListByTimeInterval(@NonNull String uri,
         VariableAllDataDTO variableDTO,CurrentUser user) {
         if(StringUtils.isBlank(uri)){
             throw new SysException("请传入uri");
@@ -150,7 +150,7 @@ public class VariableServiceImpl implements VariableService {
     }
 
     @Override
-    public  Map<String,Object>  getVariableHistoryDataList(@NonNull String uri,
+    public  Map<String,Object> listVariableHistoryDataListByCode(@NonNull String uri,
         VariableHistoryDataDTO variableDTO,CurrentUser user) {
         if(StringUtils.isBlank(uri)){
             throw new SysException("请传入uri");