修改获取业务数据接口返回

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

@@ -52,7 +52,7 @@ public class BusinessConfigController extends BaseRestController{
     @PostMapping("/filed")
     @ApiOperation("根据配置字段获取业务数据")
     @ApiImplicitParam(name = "appId", value = "租户id", required = true,dataTypeClass = String.class)
-    public R<List<Map<String, Object>>> getBusinessData(HttpServletRequest request, @PathVariable String appId,@RequestBody BusinessDTO dto) {
+    public R<Map<String,List<Object>>> getBusinessData(HttpServletRequest request, @PathVariable String appId,@RequestBody BusinessDTO dto) {
         return  call(()->{
             CurrentUser currentUser = getCurrentUser(request);
             return businessConfigService.getBusinessData(dto,dcClientHost+businessFiledData,currentUser);

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

@@ -116,7 +116,7 @@ public class VariableController extends BaseRestController{
         });
     }
 
-    @PostMapping("/variableCode/history")
+    @PostMapping("/variable-code/history")
     @ApiOperation("以变量为X轴获取变量历史数据")
     @ApiImplicitParam(name = "appId", value = "租户id", required = true,dataTypeClass = String.class)
     public R<Map<String,Object>> listVariableHistoryDataListByCode(HttpServletRequest request,@PathVariable String appId,

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

@@ -37,7 +37,7 @@ public interface BusinessConfigService extends IService<BusinessConfig> {
      * @param user
      * @return
      */
-    List<Map<String, Object>> getBusinessData(BusinessDTO dto,String uri, CurrentUser user);
+    Map<String,List<Object>> getBusinessData(BusinessDTO dto,String uri, CurrentUser user);
 
     /**
      * 根据字段以及表名查询对应的字段

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

@@ -78,7 +78,7 @@ public class BusinessConfigServiceImpl extends ServiceImpl<BusinessConfigMapper,
 
     @Override
     @Transactional(readOnly = true)
-    public List<Map<String, Object>> getBusinessData(BusinessDTO dto,String uri, CurrentUser user) {
+    public Map<String,List<Object>> getBusinessData(BusinessDTO dto,String uri, CurrentUser user) {
         if(StringUtils.isBlank(dto.getTable())){
             throw new SysException("请传入对应的表名");
         }
@@ -109,7 +109,7 @@ public class BusinessConfigServiceImpl extends ServiceImpl<BusinessConfigMapper,
 
         Map<String, String> uriVariables = Maps.newHashMap();
         uriVariables.put("appId", user.getAppId());
-        R<List<Map<String, Object>>> result = RestTemplateUtils.post(uri, null,dto, new TypeToken<R<List<Map<String, Object>>>>() {}.getType(), uriVariables);
+        R<Map<String,List<Object>>> result = RestTemplateUtils.post(uri, null,dto, new TypeToken<R<Map<String,List<Object>>>>() {}.getType(), uriVariables);
         return result.detach();
     }
 

src/main/resources/application.yml

@@ -60,7 +60,7 @@ 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}
-    variableCodeHistoryList: /{appId}/variables/variableCode/history
+    variableCodeHistoryList: /{appId}/variables/variable-code/history
     variableAllDataList: /{appId}/variables/all/data
     realTimeVariableDataList: /{appId}/variables/real-time/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}