|
@@ -152,24 +152,7 @@ public class AdmShaftController {
|
|
|
@PostMapping("/query")
|
|
|
public AdmResponse query(@RequestBody AdmQueryCriteria request) throws Exception {
|
|
|
request.setName(AdmShaft.OBJ_TYPE);
|
|
|
- QueryCriteria queryCriteria = AdmQueryCriteriaHelper.toDmpCriteria(request);
|
|
|
- ObjectNode criteria = queryCriteria.getCriteria();
|
|
|
- //查询参数特殊处理 处理成中台可以识别的条件
|
|
|
- if(!JSONUtil.isNull(criteria)){
|
|
|
- Map<String, Object> criteriaMap = objectMapper.convertValue(criteria, Map.class);
|
|
|
- if(CollUtil.isNotEmpty(criteriaMap)){
|
|
|
- ObjectNode criteriaNew = JsonNodeFactory.instance.objectNode();
|
|
|
- criteriaMap.keySet().stream().forEach(key -> {
|
|
|
- if(key.startsWith("infos.")){
|
|
|
- criteriaNew.put(key.substring(6), criteriaMap.get(key).toString());
|
|
|
- }else{
|
|
|
- criteriaNew.put(key, criteriaMap.get(key).toString());
|
|
|
- }
|
|
|
- });
|
|
|
- queryCriteria.setCriteria(criteriaNew);
|
|
|
- }
|
|
|
- }
|
|
|
- return service.doQuery(AdmContextUtil.toDmpContext(), queryCriteria, AdmShaft.class);
|
|
|
+ return service.doQuery(AdmContextUtil.toDmpContext(), request, AdmShaft.class);
|
|
|
}
|
|
|
|
|
|
/**
|