Browse Source

fix bug:调整代码,接口请求参数处理

lijie 3 years ago
parent
commit
66fc724e1a

+ 3 - 5
src/main/java/com/persagy/proxy/calculation/controller/AdmRelCalController.java

@@ -28,9 +28,7 @@ import java.util.Map;
 public class AdmRelCalController {
 
     private final AdmRelCalService admRelCalService;
-    @Value("${middleware.group.code}")
-    private String groupCode;
-    
+
     /***
      * Description: 添加关系(图类型关系为ArchSubset)
      * @param objectTypeStr : 参与计算的业务空间(为空表示所有业务空间类型),以英文逗号隔开 HeatingZone,CleanZone,
@@ -48,7 +46,7 @@ public class AdmRelCalController {
     public AdmResponse archSubsetCalcRelation(@RequestParam(value = "objectTypes",required = false) String objectTypeStr,
                                               @RequestParam(value = "relationType",required = false) String relationTypeStr,
                                               HttpServletRequest request) {
-        admRelCalService.calcRelation(AdmContextUtil.toDmpContext(),CollUtil.newArrayList(getAdmRelationTypeEnum(request)),null);
+        admRelCalService.calcRelation(AdmContextUtil.toDmpContext(),CollUtil.newArrayList(getAdmRelationTypeEnum(request)),objectTypeStr);
         return AdmResponse.success(new ArrayList<>());
     }
 
@@ -74,7 +72,7 @@ public class AdmRelCalController {
     public AdmResponse mechInArchCalcRelation(@RequestParam(value = "objectTypes",required = false) String objectTypeStr,
                                               @RequestParam(value = "relationType",required = false) String relationTypeStr,
                                               HttpServletRequest request) {
-        admRelCalService.calcRelation(AdmContextUtil.toDmpContext(), CollUtil.newArrayList(getAdmRelationTypeEnum(request)),null);
+        admRelCalService.calcRelation(AdmContextUtil.toDmpContext(), CollUtil.newArrayList(getAdmRelationTypeEnum(request)),objectTypeStr);
         return AdmResponse.success(new ArrayList<>());
     }
 

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

@@ -137,7 +137,7 @@ public class AdmSpaceInfoController {
 		admQueryCriteriaFl.setFilters(" id = '"+request.getFloorId()+"' ");
 		AdmResponse responseFl = floorService.doQuery(AdmContextUtil.toDmpContext(), admQueryCriteriaFl, AdmFloor.class);
 		if(CollUtil.isEmpty(responseFl.getContent())){
-			return AdmResponse.failure("flooId 为空");
+			return AdmResponse.failure("floorId 为空");
 		}
 		AdmFloor floor = (AdmFloor) responseFl.getContent().get(0);