|
@@ -1,13 +1,12 @@
|
|
|
package com.persagy.proxy.adm.controller;
|
|
|
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
-import cn.hutool.core.util.StrUtil;
|
|
|
import com.persagy.dmp.common.exception.BusinessException;
|
|
|
-import com.persagy.proxy.adm.constant.AdmCommonConstant;
|
|
|
import com.persagy.proxy.adm.constant.AdmRelationTypeEnum;
|
|
|
import com.persagy.proxy.adm.constant.BusinessErrorRwdCode;
|
|
|
import com.persagy.proxy.adm.request.AdmResponse;
|
|
|
import com.persagy.proxy.adm.service.AdmRelCalService;
|
|
|
+import com.persagy.proxy.adm.utils.AdmContextUtil;
|
|
|
import com.persagy.proxy.common.entity.InstanceUrlParam;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
@@ -47,18 +46,9 @@ public class AdmRelCalController {
|
|
|
* Update By lijie 2021/8/31 12:10
|
|
|
*/
|
|
|
@PostMapping(value = {"bd2sp","fl2sp","sh2bd"})
|
|
|
- public AdmResponse archSubsetCalcRelation(@RequestParam("projectId") String projectId,
|
|
|
- @RequestParam("groupCode") String groupCode,
|
|
|
- @RequestParam("appId") String appId,
|
|
|
- @RequestParam("userId") String userId,
|
|
|
- @RequestParam("objectTypes") String objectTypeStr,
|
|
|
- @RequestParam("relationType") String relationTypeStr,
|
|
|
- HttpServletRequest request) throws Exception {
|
|
|
- // 组装上下文条件
|
|
|
- InstanceUrlParam context = new InstanceUrlParam(StrUtil.isNotBlank(groupCode)?groupCode:this.groupCode,
|
|
|
- null, projectId, StrUtil.isNotBlank(appId)?appId:AdmCommonConstant.APP_ID,
|
|
|
- StrUtil.isNotBlank(userId)?userId:AdmCommonConstant.USER_ID);
|
|
|
- admRelCalService.calcRelation(context,CollUtil.newArrayList(getAdmRelationTypeEnum(request)),null);
|
|
|
+ public AdmResponse archSubsetCalcRelation(@RequestParam("objectTypes") String objectTypeStr,
|
|
|
+ @RequestParam("relationType") String relationTypeStr, HttpServletRequest request) {
|
|
|
+ admRelCalService.calcRelation(AdmContextUtil.toDmpContext(),CollUtil.newArrayList(getAdmRelationTypeEnum(request)),null);
|
|
|
return AdmResponse.success(new ArrayList<>());
|
|
|
}
|
|
|
|
|
@@ -81,18 +71,9 @@ public class AdmRelCalController {
|
|
|
* Update By lijie 2021/8/31 12:10
|
|
|
*/
|
|
|
@PostMapping(value = {"eq2bd","eq2fl","eq2sh","eq2sp_in","sy2bd","sy2fl","sy2sh","sy2sp"})
|
|
|
- public AdmResponse mechInArchCalcRelation(@RequestParam("projectId") String projectId,
|
|
|
- @RequestParam("groupCode") String groupCode,
|
|
|
- @RequestParam("appId") String appId,
|
|
|
- @RequestParam("userId") String userId,
|
|
|
- @RequestParam("objectTypes") String objectTypeStr,
|
|
|
- @RequestParam("relationType") String relationTypeStr,
|
|
|
- HttpServletRequest request) throws Exception {
|
|
|
- // 组装上下文条件
|
|
|
- InstanceUrlParam context = new InstanceUrlParam(StrUtil.isNotBlank(groupCode)?groupCode:this.groupCode,
|
|
|
- null, projectId, StrUtil.isNotBlank(appId)?appId:AdmCommonConstant.APP_ID,
|
|
|
- StrUtil.isNotBlank(userId)?userId:AdmCommonConstant.USER_ID);
|
|
|
- admRelCalService.calcRelation(context, CollUtil.newArrayList(getAdmRelationTypeEnum(request)),null);
|
|
|
+ public AdmResponse mechInArchCalcRelation(@RequestParam("objectTypes") String objectTypeStr,
|
|
|
+ @RequestParam("relationType") String relationTypeStr, HttpServletRequest request) {
|
|
|
+ admRelCalService.calcRelation(AdmContextUtil.toDmpContext(), CollUtil.newArrayList(getAdmRelationTypeEnum(request)),null);
|
|
|
return AdmResponse.success(new ArrayList<>());
|
|
|
}
|
|
|
|
|
@@ -111,17 +92,11 @@ public class AdmRelCalController {
|
|
|
* Update By lijie 2021/8/31 12:10
|
|
|
*/
|
|
|
@PostMapping(value = {"pe2bd","pe2fl","pe2sh","pe2sp"})
|
|
|
- public AdmResponse propertyInArchCalcRelation(@RequestParam("projectId") String projectId,
|
|
|
- @RequestParam("groupCode") String groupCode,
|
|
|
- @RequestParam("appId") String appId,
|
|
|
- @RequestParam("userId") String userId,
|
|
|
- @RequestParam("objectTypes") String objectTypeStr,
|
|
|
- @RequestParam("relationType") String relationTypeStr) throws Exception {
|
|
|
+ public AdmResponse propertyInArchCalcRelation(@RequestParam("objectTypes") String objectTypeStr,
|
|
|
+ @RequestParam("relationType") String relationTypeStr) {
|
|
|
// 资产暂时未引入,直接返回成功
|
|
|
// 组装上下文条件
|
|
|
- InstanceUrlParam context = new InstanceUrlParam(StrUtil.isNotBlank(groupCode)?groupCode:this.groupCode,
|
|
|
- null, projectId, StrUtil.isNotBlank(appId)?appId:AdmCommonConstant.APP_ID,
|
|
|
- StrUtil.isNotBlank(userId)?userId:AdmCommonConstant.USER_ID);
|
|
|
+ InstanceUrlParam context = AdmContextUtil.toDmpContext();
|
|
|
// admRelCalService.calcRelation(context,relType,objectTypeStr,relationTypeStr);
|
|
|
return AdmResponse.success(new ArrayList<>());
|
|
|
}
|
|
@@ -137,17 +112,11 @@ public class AdmRelCalController {
|
|
|
* Update By lijie 2021/8/31 12:10
|
|
|
*/
|
|
|
@PostMapping(value = {"eq2sp_for"})
|
|
|
- public AdmResponse mechForArchCalcRelation(@RequestParam("projectId") String projectId,
|
|
|
- @RequestParam("groupCode") String groupCode,
|
|
|
- @RequestParam("appId") String appId,
|
|
|
- @RequestParam("userId") String userId,
|
|
|
- @RequestParam("objectTypes") String objectTypeStr,
|
|
|
- @RequestParam("relationType") String relationTypeStr) throws Exception {
|
|
|
+ public AdmResponse mechForArchCalcRelation(@RequestParam("objectTypes") String objectTypeStr,
|
|
|
+ @RequestParam("relationType") String relationTypeStr) {
|
|
|
// 资产暂时未引入,直接返回成功
|
|
|
// 组装上下文条件
|
|
|
- InstanceUrlParam context = new InstanceUrlParam(StrUtil.isNotBlank(groupCode)?groupCode:this.groupCode,
|
|
|
- null, projectId, StrUtil.isNotBlank(appId)?appId:AdmCommonConstant.APP_ID,
|
|
|
- StrUtil.isNotBlank(userId)?userId:AdmCommonConstant.USER_ID);
|
|
|
+ InstanceUrlParam context = AdmContextUtil.toDmpContext();
|
|
|
// admRelCalService.calcRelation(context,relType,objectTypeStr,relationTypeStr);
|
|
|
return AdmResponse.success(new ArrayList<>());
|
|
|
}
|
|
@@ -156,10 +125,6 @@ public class AdmRelCalController {
|
|
|
* @param buildingId : 建筑id
|
|
|
* @param objectType : 对象分类
|
|
|
* @param type : 对象类型
|
|
|
- * @param projectId : 项目id
|
|
|
- * @param groupCode : 集团编码
|
|
|
- * @param appId : APP的id
|
|
|
- * @param userId : 账号id
|
|
|
* sp2sp:空间服务于空间
|
|
|
* @return : com.persagy.proxy.adm.request.AdmCreateResponse
|
|
|
* @author : lijie
|
|
@@ -169,17 +134,8 @@ public class AdmRelCalController {
|
|
|
@PostMapping(value = {"sp2sp"})
|
|
|
public AdmResponse archForArchCalcRelation( @RequestParam("buildingId") String buildingId,
|
|
|
@RequestParam("objectType") String objectType,
|
|
|
- @RequestParam("type") String type,
|
|
|
- @RequestParam("projectId") String projectId,
|
|
|
- @RequestParam("groupCode") String groupCode,
|
|
|
- @RequestParam("appId") String appId,
|
|
|
- @RequestParam("userId") String userId) throws Exception {
|
|
|
- // 资产暂时未引入,直接返回成功
|
|
|
- // 组装上下文条件
|
|
|
- InstanceUrlParam context = new InstanceUrlParam(StrUtil.isNotBlank(groupCode)?groupCode:this.groupCode,
|
|
|
- null, projectId, StrUtil.isNotBlank(appId)?appId:AdmCommonConstant.APP_ID,
|
|
|
- StrUtil.isNotBlank(userId)?userId:AdmCommonConstant.USER_ID);
|
|
|
- admRelCalService.calcRelationForArchForArchSpToSp(context,buildingId,objectType,type,AdmRelationTypeEnum.SP2SP_ARCHFORARCH);
|
|
|
+ @RequestParam("type") String type) {
|
|
|
+ admRelCalService.calcRelationForArchForArchSpToSp(AdmContextUtil.toDmpContext(),buildingId,objectType,type,AdmRelationTypeEnum.SP2SP_ARCHFORARCH);
|
|
|
return AdmResponse.success(new ArrayList<>());
|
|
|
}
|
|
|
/***
|
|
@@ -191,16 +147,8 @@ public class AdmRelCalController {
|
|
|
* Update By lijie 2021/8/31 12:10
|
|
|
*/
|
|
|
@PostMapping(value = {"eq2sp_SensorRelationship_ss2sp"})
|
|
|
- public AdmResponse sensorRelationshipCalcRelation(@RequestParam("projectId") String projectId,
|
|
|
- @RequestParam("groupCode") String groupCode,
|
|
|
- @RequestParam("appId") String appId,
|
|
|
- @RequestParam("userId") String userId) throws Exception {
|
|
|
- // 资产暂时未引入,直接返回成功
|
|
|
- // 组装上下文条件
|
|
|
- InstanceUrlParam context = new InstanceUrlParam(StrUtil.isNotBlank(groupCode)?groupCode:this.groupCode,
|
|
|
- null, projectId, StrUtil.isNotBlank(appId)?appId:AdmCommonConstant.APP_ID,
|
|
|
- StrUtil.isNotBlank(userId)?userId:AdmCommonConstant.USER_ID);
|
|
|
- admRelCalService.calcRelation(context,CollUtil.newArrayList(AdmRelationTypeEnum.EQ2SP_SENSORRELATIONSHIP_SS2SP),"AirConditioningZone");
|
|
|
+ public AdmResponse sensorRelationshipCalcRelation() {
|
|
|
+ admRelCalService.calcRelation(AdmContextUtil.toDmpContext(),CollUtil.newArrayList(AdmRelationTypeEnum.EQ2SP_SENSORRELATIONSHIP_SS2SP),"AirConditioningZone");
|
|
|
return AdmResponse.success(new ArrayList<>());
|
|
|
}
|
|
|
/***
|
|
@@ -212,16 +160,8 @@ public class AdmRelCalController {
|
|
|
* Update By lijie 2021/8/31 12:10
|
|
|
*/
|
|
|
@PostMapping(value = {"sp2sp_ConvectionNetwork_1"})
|
|
|
- public AdmResponse convectionNetworkCalcRelation(@RequestParam("projectId") String projectId,
|
|
|
- @RequestParam("groupCode") String groupCode,
|
|
|
- @RequestParam("appId") String appId,
|
|
|
- @RequestParam("userId") String userId) throws Exception {
|
|
|
- // 资产暂时未引入,直接返回成功
|
|
|
- // 组装上下文条件
|
|
|
- InstanceUrlParam context = new InstanceUrlParam(StrUtil.isNotBlank(groupCode)?groupCode:this.groupCode,
|
|
|
- null, projectId, StrUtil.isNotBlank(appId)?appId:AdmCommonConstant.APP_ID,
|
|
|
- StrUtil.isNotBlank(userId)?userId:AdmCommonConstant.USER_ID);
|
|
|
- admRelCalService.calcRelation(context,CollUtil.newArrayList(AdmRelationTypeEnum.SP2SP_CONVECTIONNETWORK_1),null);
|
|
|
+ public AdmResponse convectionNetworkCalcRelation() {
|
|
|
+ admRelCalService.calcRelation(AdmContextUtil.toDmpContext(),CollUtil.newArrayList(AdmRelationTypeEnum.SP2SP_CONVECTIONNETWORK_1),null);
|
|
|
return AdmResponse.success(new ArrayList<>());
|
|
|
}
|
|
|
/***
|
|
@@ -233,16 +173,8 @@ public class AdmRelCalController {
|
|
|
* Update By lijie 2021/8/31 12:10
|
|
|
*/
|
|
|
@PostMapping(value = {"sp2sp_RadiationNetwork_1"})
|
|
|
- public AdmResponse radiationNetworkCalcRelation(@RequestParam("projectId") String projectId,
|
|
|
- @RequestParam("groupCode") String groupCode,
|
|
|
- @RequestParam("appId") String appId,
|
|
|
- @RequestParam("userId") String userId) throws Exception {
|
|
|
- // 资产暂时未引入,直接返回成功
|
|
|
- // 组装上下文条件
|
|
|
- InstanceUrlParam context = new InstanceUrlParam(StrUtil.isNotBlank(groupCode)?groupCode:this.groupCode,
|
|
|
- null, projectId, StrUtil.isNotBlank(appId)?appId:AdmCommonConstant.APP_ID,
|
|
|
- StrUtil.isNotBlank(userId)?userId:AdmCommonConstant.USER_ID);
|
|
|
- admRelCalService.calcRelation(context,CollUtil.newArrayList(AdmRelationTypeEnum.SP2SP_RADIATIONNETWORK_1),null);
|
|
|
+ public AdmResponse radiationNetworkCalcRelation() {
|
|
|
+ admRelCalService.calcRelation(AdmContextUtil.toDmpContext(),CollUtil.newArrayList(AdmRelationTypeEnum.SP2SP_RADIATIONNETWORK_1),null);
|
|
|
return AdmResponse.success(new ArrayList<>());
|
|
|
}
|
|
|
/***
|
|
@@ -254,16 +186,8 @@ public class AdmRelCalController {
|
|
|
* Update By lijie 2021/8/31 12:10
|
|
|
*/
|
|
|
@PostMapping(value = {"sp2sp_SpaceNeighborhood_5"})
|
|
|
- public AdmResponse spaceNeighborhoodCalcRelation(@RequestParam("projectId") String projectId,
|
|
|
- @RequestParam("groupCode") String groupCode,
|
|
|
- @RequestParam("appId") String appId,
|
|
|
- @RequestParam("userId") String userId) throws Exception {
|
|
|
- // 资产暂时未引入,直接返回成功
|
|
|
- // 组装上下文条件
|
|
|
- InstanceUrlParam context = new InstanceUrlParam(StrUtil.isNotBlank(groupCode)?groupCode:this.groupCode,
|
|
|
- null, projectId, StrUtil.isNotBlank(appId)?appId:AdmCommonConstant.APP_ID,
|
|
|
- StrUtil.isNotBlank(userId)?userId:AdmCommonConstant.USER_ID);
|
|
|
- admRelCalService.calcRelation(context,CollUtil.newArrayList(AdmRelationTypeEnum.SP2SP_SPACENEIGHBORHOOD_5),null);
|
|
|
+ public AdmResponse spaceNeighborhoodCalcRelation() {
|
|
|
+ admRelCalService.calcRelation(AdmContextUtil.toDmpContext(),CollUtil.newArrayList(AdmRelationTypeEnum.SP2SP_SPACENEIGHBORHOOD_5),null);
|
|
|
return AdmResponse.success(new ArrayList<>());
|
|
|
}
|
|
|
/***
|
|
@@ -275,22 +199,14 @@ public class AdmRelCalController {
|
|
|
* Update By lijie 2021/8/31 12:10
|
|
|
*/
|
|
|
@PostMapping(value = {"syeq2bd"})
|
|
|
- public AdmResponse syeq2bdCalcRelation(@RequestParam("projectId") String projectId,
|
|
|
- @RequestParam("groupCode") String groupCode,
|
|
|
- @RequestParam("appId") String appId,
|
|
|
- @RequestParam("userId") String userId) throws Exception {
|
|
|
- // 资产暂时未引入,直接返回成功
|
|
|
- // 组装上下文条件
|
|
|
- InstanceUrlParam context = new InstanceUrlParam(StrUtil.isNotBlank(groupCode)?groupCode:this.groupCode,
|
|
|
- null, projectId, StrUtil.isNotBlank(appId)?appId:AdmCommonConstant.APP_ID,
|
|
|
- StrUtil.isNotBlank(userId)?userId:AdmCommonConstant.USER_ID);
|
|
|
+ public AdmResponse syeq2bdCalcRelation() {
|
|
|
Map<String, AdmRelationTypeEnum> relationTypeMap = AdmRelationTypeEnum.getRelationTypeMap();
|
|
|
if (!relationTypeMap.containsKey("eq2bd") || !relationTypeMap.containsKey("sy2bd")){
|
|
|
throw new BusinessException(BusinessErrorRwdCode.A7201.getCode(),BusinessErrorRwdCode.A7201.getDesc());
|
|
|
}
|
|
|
ArrayList<AdmRelationTypeEnum> admRelationTypeEnums =
|
|
|
CollUtil.newArrayList(relationTypeMap.get("eq2bd"), relationTypeMap.get("sy2bd"));
|
|
|
- admRelCalService.calcRelation(context,admRelationTypeEnums,null);
|
|
|
+ admRelCalService.calcRelation(AdmContextUtil.toDmpContext(),admRelationTypeEnums,null);
|
|
|
return AdmResponse.success(new ArrayList<>());
|
|
|
}
|
|
|
/***
|
|
@@ -302,16 +218,8 @@ public class AdmRelCalController {
|
|
|
* Update By lijie 2021/8/31 12:10
|
|
|
*/
|
|
|
@PostMapping(value = {"sp2sp_TrafficNetwork_1"})
|
|
|
- public AdmResponse trafficNetworkCalcRelation(@RequestParam("projectId") String projectId,
|
|
|
- @RequestParam("groupCode") String groupCode,
|
|
|
- @RequestParam("appId") String appId,
|
|
|
- @RequestParam("userId") String userId) throws Exception {
|
|
|
- // 资产暂时未引入,直接返回成功
|
|
|
- // 组装上下文条件
|
|
|
- InstanceUrlParam context = new InstanceUrlParam(StrUtil.isNotBlank(groupCode)?groupCode:this.groupCode,
|
|
|
- null, projectId, StrUtil.isNotBlank(appId)?appId:AdmCommonConstant.APP_ID,
|
|
|
- StrUtil.isNotBlank(userId)?userId:AdmCommonConstant.USER_ID);
|
|
|
- admRelCalService.calcRelation(context,CollUtil.newArrayList(AdmRelationTypeEnum.SP2SP_TRAFFICNETWORK_1),null);
|
|
|
+ public AdmResponse trafficNetworkCalcRelation() {
|
|
|
+ admRelCalService.calcRelation(AdmContextUtil.toDmpContext(),CollUtil.newArrayList(AdmRelationTypeEnum.SP2SP_TRAFFICNETWORK_1),null);
|
|
|
return AdmResponse.success(new ArrayList<>());
|
|
|
}
|
|
|
/***
|
|
@@ -324,17 +232,8 @@ public class AdmRelCalController {
|
|
|
* Update By lijie 2021/8/31 12:10
|
|
|
*/
|
|
|
@PostMapping(value = {"fl2fl","sh2sh"})
|
|
|
- public AdmResponse throughRelationshipCalcRelation(@RequestParam("projectId") String projectId,
|
|
|
- @RequestParam("groupCode") String groupCode,
|
|
|
- @RequestParam("appId") String appId,
|
|
|
- @RequestParam("userId") String userId,
|
|
|
- HttpServletRequest request) throws Exception {
|
|
|
- // 资产暂时未引入,直接返回成功
|
|
|
- // 组装上下文条件
|
|
|
- InstanceUrlParam context = new InstanceUrlParam(StrUtil.isNotBlank(groupCode)?groupCode:this.groupCode,
|
|
|
- null, projectId, StrUtil.isNotBlank(appId)?appId:AdmCommonConstant.APP_ID,
|
|
|
- StrUtil.isNotBlank(userId)?userId:AdmCommonConstant.USER_ID);
|
|
|
- admRelCalService.calcRelation(context,CollUtil.newArrayList(getAdmRelationTypeEnum(request)),null);
|
|
|
+ public AdmResponse throughRelationshipCalcRelation(HttpServletRequest request) {
|
|
|
+ admRelCalService.calcRelation(AdmContextUtil.toDmpContext(),CollUtil.newArrayList(getAdmRelationTypeEnum(request)),null);
|
|
|
return AdmResponse.success(new ArrayList<>());
|
|
|
}
|
|
|
|
|
@@ -352,12 +251,11 @@ public class AdmRelCalController {
|
|
|
*/
|
|
|
@PostMapping(value = {"sign"})
|
|
|
public AdmResponse changeSign( @PathVariable("relType") String relType,
|
|
|
- @QueryParam("projectId") String projectId,
|
|
|
@QueryParam("objectTypes") String objectTypeStr,
|
|
|
- @QueryParam("relationType") String relationTypeStr) throws Exception {
|
|
|
+ @QueryParam("relationType") String relationTypeStr) {
|
|
|
// 资产暂时未引入,直接返回成功
|
|
|
// 组装上下文条件
|
|
|
- InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, AdmCommonConstant.APP_ID);
|
|
|
+ InstanceUrlParam context = AdmContextUtil.toDmpContext();
|
|
|
// admRelCalService.calcRelation(context,relType,objectTypeStr,relationTypeStr);
|
|
|
return AdmResponse.success(new ArrayList<>());
|
|
|
}
|
|
@@ -392,6 +290,4 @@ public class AdmRelCalController {
|
|
|
return requestURI.substring(requestURI.lastIndexOf("/")+1);
|
|
|
}
|
|
|
|
|
|
-
|
|
|
-
|
|
|
}
|