Browse Source

Merge remote-tracking branch 'origin/develop' into develop

lijie 3 years ago
parent
commit
2ebe9aa260

+ 8 - 1
src/main/java/com/persagy/proxy/report/controller/AdmReportEquipController.java

@@ -87,6 +87,7 @@ public class AdmReportEquipController {
         cascade.add(cascadeSys);
         request.setCascade(cascade);
         AdmResponse admResponse = equipmentService.query(request);
+        Boolean showComponentFlag = false;
         List<AdmEquipment> equipmentList = (List<AdmEquipment>) admResponse.getContent();
         if(CollUtil.isNotEmpty(equipmentList)){
             equipmentList.stream().forEach(equip -> {
@@ -111,11 +112,14 @@ public class AdmReportEquipController {
             AdmEquipment admEquipment = equipmentList.get(0);
             QueryCriteria defineCriteria = new QueryCriteria();
             ObjectNode criteria = JsonNodeFactory.instance.objectNode();
-            criteria.put("code", admEquipment.getClassCode());
+            criteria.put("equipmentCode", admEquipment.getClassCode());
             defineCriteria.setCriteria(criteria);
             AdmResponse defRes = dictService.doQueryObjectType(AdmContextUtil.toDmpContext(), defineCriteria, AdmObjectType.class);
             if (CollUtil.isNotEmpty(defRes.getContent())) {
                 List<AdmObjectType> componentCategory = (List<AdmObjectType>) defRes.getContent();
+                if(CollUtil.isNotEmpty(componentCategory)){
+                    showComponentFlag = true;
+                }
                 admEquipment.setComponentCategory(componentCategory);
                 equipmentList.set(0, admEquipment);
             }
@@ -124,6 +128,9 @@ public class AdmReportEquipController {
         }
         AdmResponse response = AdmResponse.success(equipmentList, request);
         response.setTotal(admResponse.getTotal());
+        if(showComponentFlag){
+            response.setMessage("1");
+        }
         return response;
     }
 

+ 1 - 0
src/main/java/com/persagy/proxy/report/controller/AdmSpaceInfoController.java

@@ -221,6 +221,7 @@ public class AdmSpaceInfoController {
 		request.setName(AdmEquipment.OBJ_TYPE);
 		// 设置关系条件
 		request.resetRelationCond(true, graphCode, "Eq2Sp", type, spaceId, false);
+		request.setPageSize(100000);
 		responseEq = equipmentService.query(request);
 
 		if(isCalPoint && CollUtil.isNotEmpty(responseEq.getContent()) && null != responseSpace && CollUtil.isNotEmpty(responseSpace.getContent())){