|
@@ -86,7 +86,7 @@ public class AdmReportEquipController {
|
|
|
cascadeSys.setName("linkSystem");
|
|
|
cascade.add(cascadeSys);
|
|
|
request.setCascade(cascade);
|
|
|
- AdmResponse admResponse = equipmentService.doQuery(AdmContextUtil.toDmpContext(), request, AdmEquipment.class);
|
|
|
+ AdmResponse admResponse = equipmentService.query(request);
|
|
|
List<AdmEquipment> equipmentList = (List<AdmEquipment>) admResponse.getContent();
|
|
|
if(CollUtil.isNotEmpty(equipmentList)){
|
|
|
equipmentList.stream().forEach(equip -> {
|
|
@@ -669,7 +669,7 @@ public class AdmReportEquipController {
|
|
|
filter = filter + ";id in "+arrayNode.toString();
|
|
|
request.setFilters(filter);
|
|
|
|
|
|
- AdmResponse admResponse = equipmentService.doQuery(AdmContextUtil.toDmpContext(), request, AdmEquipment.class);
|
|
|
+ AdmResponse admResponse = equipmentService.query(request);
|
|
|
if(CollUtil.isNotEmpty(admResponse.getContent())){
|
|
|
|
|
|
List<ObjectNode> objectNodeList = (List<ObjectNode>) admResponse.getContent();
|
|
@@ -770,7 +770,7 @@ public class AdmReportEquipController {
|
|
|
admQueryCriteriaObj.setName(AdmEquipment.OBJ_TYPE);
|
|
|
|
|
|
admQueryCriteriaObj.setProjection(Arrays.asList("id", "name", "localId", "localName", "cadId", "bimId", "bimLocation", "infos", "classCode", "equipSerial", "bimFamilyName", "bimFamilySymbol"));
|
|
|
- AdmResponse admResponse = equipmentService.doQuery(AdmContextUtil.toDmpContext(), admQueryCriteriaObj, AdmEquipment.class);
|
|
|
+ AdmResponse admResponse = equipmentService.query(admQueryCriteriaObj);
|
|
|
|
|
|
Map<String, Integer> hashMap = new HashMap<>();
|
|
|
List<AdmEquipment> admEquipmentList = (List<AdmEquipment>) admResponse.getContent();
|
|
@@ -781,7 +781,7 @@ public class AdmReportEquipController {
|
|
|
if (page >= 2) {
|
|
|
for (long i = 2; i <= page; i++) {
|
|
|
admQueryCriteriaObj.setPageNumber(Integer.parseInt(String.valueOf(i)));
|
|
|
- admResponse = equipmentService.doQuery(AdmContextUtil.toDmpContext(), admQueryCriteriaObj, AdmEquipment.class);
|
|
|
+ admResponse = equipmentService.query(admQueryCriteriaObj);
|
|
|
admEquipmentList = (List<AdmEquipment>) admResponse.getContent();
|
|
|
projectEquipment = JsonNodeUtils.toListNode(admEquipmentList, null, null);
|
|
|
calculate(dynamicInfoPointCodes, staticInfoPointCodes, projectEquipment, 0, hashMap);
|
|
@@ -834,7 +834,7 @@ public class AdmReportEquipController {
|
|
|
admQueryCriteriaObj.setName(AdmEquipment.OBJ_TYPE);
|
|
|
|
|
|
admQueryCriteriaObj.setProjection(Arrays.asList("id","name","localId","localName","cadId","bimId","bimLocation","infos","classCode","equipSerial","bimFamilyName","bimFamilySymbol"));
|
|
|
- AdmResponse admResponse = equipmentService.doQuery(AdmContextUtil.toDmpContext(), admQueryCriteriaObj, AdmEquipment.class);
|
|
|
+ AdmResponse admResponse = equipmentService.query(admQueryCriteriaObj);
|
|
|
|
|
|
Map<String,Integer> hashMap = new HashMap<>();
|
|
|
List<AdmEquipment> admEquipmentList = (List<AdmEquipment>) admResponse.getContent();
|
|
@@ -845,7 +845,7 @@ public class AdmReportEquipController {
|
|
|
if(page >= 2){
|
|
|
for(long i = 2; i <= page; i++){
|
|
|
admQueryCriteriaObj.setPageNumber(Integer.parseInt(String.valueOf(i)));
|
|
|
- admResponse = equipmentService.doQuery(AdmContextUtil.toDmpContext(), admQueryCriteriaObj, AdmEquipment.class);
|
|
|
+ admResponse = equipmentService.query(admQueryCriteriaObj);
|
|
|
admEquipmentList = (List<AdmEquipment>) admResponse.getContent();
|
|
|
projectEquipment = JsonNodeUtils.toListNode(admEquipmentList,null,null);
|
|
|
calculate(gatherDynamicInfoCode, gatherStaticInfoCode, projectEquipment,0, hashMap);
|