|
@@ -15,6 +15,7 @@ import com.persagy.dmp.digital.client.DigitalObjectFacade;
|
|
import com.persagy.dmp.digital.client.DigitalRelationFacade;
|
|
import com.persagy.dmp.digital.client.DigitalRelationFacade;
|
|
import com.persagy.dmp.digital.entity.ObjectRelation;
|
|
import com.persagy.dmp.digital.entity.ObjectRelation;
|
|
import com.persagy.proxy.adm.constant.AdmCommonConstant;
|
|
import com.persagy.proxy.adm.constant.AdmCommonConstant;
|
|
|
|
+import com.persagy.proxy.adm.constant.AdmRelationType;
|
|
import com.persagy.proxy.adm.model.AdmRelationObject;
|
|
import com.persagy.proxy.adm.model.AdmRelationObject;
|
|
import com.persagy.proxy.adm.service.IRelationReportService;
|
|
import com.persagy.proxy.adm.service.IRelationReportService;
|
|
import com.persagy.proxy.adm.strategy.QueryRelationObjectContext;
|
|
import com.persagy.proxy.adm.strategy.QueryRelationObjectContext;
|
|
@@ -123,6 +124,9 @@ public class RelationReportService implements IRelationReportService {
|
|
@Override
|
|
@Override
|
|
public List<AdmRelationObject> reportRelationObject(String groupCode, String projectId, String relType, String code, String zoneType) {
|
|
public List<AdmRelationObject> reportRelationObject(String groupCode, String projectId, String relType, String code, String zoneType) {
|
|
groupCode = StrUtil.isBlank(groupCode) ? defaultCode : groupCode;
|
|
groupCode = StrUtil.isBlank(groupCode) ? defaultCode : groupCode;
|
|
|
|
+ if (AdmRelationType.EQ2SP_SENSORRELATIONSHIP_SS2SP.equals(relType)){
|
|
|
|
+ relType = AdmRelationType.EQ2SP;
|
|
|
|
+ }
|
|
log.info("下载报表: groupCode[{}], projectId[{}], relType[{}], code[{}]", groupCode, projectId, relType, code);
|
|
log.info("下载报表: groupCode[{}], projectId[{}], relType[{}], code[{}]", groupCode, projectId, relType, code);
|
|
return this.queryRelationObjectContext.findRelationObject(groupCode, projectId, relType);
|
|
return this.queryRelationObjectContext.findRelationObject(groupCode, projectId, relType);
|
|
}
|
|
}
|