简柏林 / thingskit · Commits

Commit 91bb1ed504af2c413863c9b95c4d5d1bf3c3563f

Authored by YevhenBondarenko
1 parent dfb82bf2

refactored findEntityTimeseriesAndAttributesKeysByQuery

Inline Side-by-side
Showing 2 changed files with 2 additions and 2 deletions
@@ -84,7 +84,7 @@ public class EntityQueryController extends BaseController { @@ -84,7 +84,7 @@ public class EntityQueryController extends BaseController {
84 } 84 }
85 85
86 @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')") 86 @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
87 - @RequestMapping(value = "/entitiesQuery/find/keys/timeseries", method = RequestMethod.POST) 87 + @RequestMapping(value = "/entitiesQuery/find/keys", method = RequestMethod.POST)
88 @ResponseBody 88 @ResponseBody
89 public DeferredResult<ResponseEntity> findEntityTimeseriesAndAttributesKeysByQuery(@RequestBody EntityDataQuery query, 89 public DeferredResult<ResponseEntity> findEntityTimeseriesAndAttributesKeysByQuery(@RequestBody EntityDataQuery query,
90 @RequestParam("timeseries") boolean isTimeseries, 90 @RequestParam("timeseries") boolean isTimeseries,
@@ -203,7 +203,7 @@ public class DefaultEntityQueryService implements EntityQueryService { @@ -203,7 +203,7 @@ public class DefaultEntityQueryService implements EntityQueryService {
203 203
204 private void replyWithResponse(DeferredResult<ResponseEntity> response, Set<EntityType> types, List<String> timeseriesKeys, List<String> attributesKeys) { 204 private void replyWithResponse(DeferredResult<ResponseEntity> response, Set<EntityType> types, List<String> timeseriesKeys, List<String> attributesKeys) {
205 ObjectNode json = JacksonUtil.newObjectNode(); 205 ObjectNode json = JacksonUtil.newObjectNode();
206 - addItemsToArrayNode(json.putArray("types"), types); 206 + addItemsToArrayNode(json.putArray("entityTypes"), types);
207 addItemsToArrayNode(json.putArray("timeseriesKeys"), timeseriesKeys); 207 addItemsToArrayNode(json.putArray("timeseriesKeys"), timeseriesKeys);
208 addItemsToArrayNode(json.putArray("attributesKeys"), attributesKeys); 208 addItemsToArrayNode(json.putArray("attributesKeys"), attributesKeys);
209 response.setResult(new ResponseEntity(json, HttpStatus.OK)); 209 response.setResult(new ResponseEntity(json, HttpStatus.OK));