فهرست منبع

竖井关联的空间查询

yucheng 3 سال پیش
والد
کامیت
135050f94e

+ 1 - 1
src/main/java/com/persagy/proxy/adm/constant/AdmRelationTypeEnum.java

@@ -188,7 +188,7 @@ public enum AdmRelationTypeEnum {
     /**光照连通-空间-空间-【全部关系总览】*/
     SP2SP_RADIATIONNETWORK_1("sp2sp_RadiationNetwork_1","RadiationNetwork","Connect",AdmObjectType.SPACE.getIndex(),AdmObjectType.SPACE.getIndex(),true,true,true,false,true,true,CollUtil.newHashSet("LightingZone")),
     /**竖井下的业务空间-竖井→空间-【竖井台账】*/
-    SH2SP("sh2sp","ShaftandSpace","Sh2Sp",AdmObjectType.SHAFT.getIndex(),AdmObjectType.SPACE.getIndex(),false,false,false,false,false,false),
+    SH2SP("sh2sp","ArchSubset","Sh2Sp",AdmObjectType.SHAFT.getIndex(),AdmObjectType.SPACE.getIndex(),false,false,false,false,false,false),
     /**采暖水旁通-供暖集水器-供暖分水器,液体管道-*/
     EQ2EQ_HEATWATERLOOP_3("eq2eq_HeatWaterLoop_3","HeatWaterLoop","Bypass",AdmObjectType.EQUIPMENT.getIndex(),AdmObjectType.EQUIPMENT.getIndex(),false,true,false,false,false,false),
     /**空调冷却水供水-空调冷却水供水相关设备,沿水流方向-*/

+ 3 - 3
src/main/java/com/persagy/proxy/adm/request/AdmQueryCriteria.java

@@ -47,7 +47,7 @@ public class AdmQueryCriteria {
 
     /**
      * 设置关系条件
-     * @param isFrom
+     * @param isFrom 是否查询from结果
      * @param graphCode
      * @param relCode
      * @param objId
@@ -58,7 +58,7 @@ public class AdmQueryCriteria {
 
     /**
      * 设置关系条件
-     * @param isFrom
+     * @param isFrom 是否查询from结果
      * @param graphCode
      * @param relCode
      * @param objId
@@ -70,7 +70,7 @@ public class AdmQueryCriteria {
 
     /**
      * 设置关系条件
-     * @param isFrom
+     * @param isFrom 是否查询from结果
      * @param graphCode
      * @param relCode
      * @param relValue

+ 13 - 10
src/main/java/com/persagy/proxy/report/controller/ComponentStatisticsController.java

@@ -8,14 +8,16 @@ import com.persagy.proxy.adm.constant.AdmCommonConstant;
 import com.persagy.proxy.adm.constant.AdmObjectType;
 import com.persagy.proxy.adm.constant.AdmRelationTypeEnum;
 import com.persagy.proxy.adm.constant.SpaceTypeEnum;
-import com.persagy.proxy.object.model.AdmEquipment;
 import com.persagy.proxy.adm.request.AdmCountResponse;
 import com.persagy.proxy.adm.request.AdmQueryCriteria;
 import com.persagy.proxy.adm.request.AdmResponse;
-import com.persagy.proxy.object.service.IAdmEquipmentService;
-import com.persagy.proxy.report.service.IRelationReportService;
 import com.persagy.proxy.adm.utils.AdmContextUtil;
 import com.persagy.proxy.common.entity.InstanceUrlParam;
+import com.persagy.proxy.object.model.AdmEquipment;
+import com.persagy.proxy.object.model.AdmShaft;
+import com.persagy.proxy.object.service.IAdmEquipmentService;
+import com.persagy.proxy.object.service.IAdmShaftService;
+import com.persagy.proxy.report.service.IRelationReportService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -40,6 +42,8 @@ public class ComponentStatisticsController {
 
 	@Autowired
 	private IRelationReportService relationReportService;
+	@Autowired
+	private IAdmShaftService shaftService;
 	
 	/**
 	 * 台账中待删除的对象
@@ -149,17 +153,16 @@ public class ComponentStatisticsController {
 	
 	/**
 	 * 竖井-关联业务空间完成度
-	 * @param request
 	 * @return
 	 */
 	@RequestMapping(value = "/shaft2sp-count")
-	public AdmCountResponse shaft2spCount(HttpServletRequest request) {
-		String groupCode = request.getHeader(AdmCommonConstant.GROUP_CODE_HEADER);
-		String projectId = request.getHeader(AdmCommonConstant.PROJECT_ID_HEADER);
-		
-		long count = this.relationReportService.countRelationObject(groupCode, projectId, AdmRelationTypeEnum.SH2SP.getGraphCode(), 
+	public AdmResponse shaft2spCount() {
+		AdmQueryCriteria request = new AdmQueryCriteria();
+		request.setName("shaft");
+		request.setOnlyCount(true);
+		request.resetRelationCond(true, AdmRelationTypeEnum.SH2SP.getGraphCode(),
 				AdmRelationTypeEnum.SH2SP.getRelCode(), null);
-		return AdmCountResponse.success(count);
+		return shaftService.doQuery(AdmContextUtil.toDmpContext(), request, AdmShaft.class);
 	}
 	
 	/**