先去除部分代码,防止应用启动报错

dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/service/impl/RelationCaclServiceImpl.java

@@ -24,8 +24,6 @@ import com.persagy.dmp.rwd.digital.service.IObjectRelationService;
 import com.persagy.dmp.rwd.digital.service.RelationCaclService;
 import com.persagy.dmp.rwd.digital.service.RelationCalSignService;
 import com.persagy.dmp.rwd.digital.service.RelationProjectCalService;
-import com.persagy.dmp.rwd.digital.service.strategy.CalculatingRelationService;
-import com.persagy.dmp.rwd.digital.service.strategy.CalculationRelatingContext;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -44,7 +42,6 @@ public class RelationCaclServiceImpl implements RelationCaclService {
     private final IObjectRelationService objectRelationService;
     private final RelationCalSignService relationCalSignService;
     private final RelationProjectCalService relationProjectCalService;
-    private final CalculationRelatingContext calculatingRelationContext;
 
 
     /***
@@ -212,10 +209,10 @@ public class RelationCaclServiceImpl implements RelationCaclService {
      */
     @Override
     public CommonResult<List<ObjectRelation>> calculatingObjRelation(RequestData requestData) {
-        CalculatingRelationService relationService = calculatingRelationContext
-                .getCalculatingRelationService(requestData.getGraphCode(),
-                        requestData.getRelCode(), requestData.getRelValue());
-        relationService.handle(requestData);
+//        CalculatingRelationService relationService = calculatingRelationContext
+//                .getCalculatingRelationService(requestData.getGraphCode(),
+//                        requestData.getRelCode(), requestData.getRelValue());
+//        relationService.handle(requestData);
         return ResultHelper.multi(new ArrayList<>(),0L);
     }
 

dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/service/strategy/BuildingToSpaceCalImpl.java

@@ -1,56 +0,0 @@
-package com.persagy.dmp.rwd.digital.service.strategy;
-
-import cn.hutool.core.collection.CollUtil;
-import com.persagy.dmp.basic.dto.RequestData;
-import com.persagy.dmp.rwd.basic.constant.DigitalRelCode;
-import com.persagy.dmp.rwd.digital.domain.RelChainDTO;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Component;
-
-import java.util.Set;
-
-@Component
-@Relation(graphCode = "ArchSubset",relCode="Bd2Sp")
-@RequiredArgsConstructor
-public class BuildingToSpaceCalImpl implements CalculatingRelationService {
-
-    private final CalculationRelatingContext calculationRelatingContext;
-
-
-    /***
-     * Description: 计算关系逻辑
-     * @param requestData : 请求参数
-     * @return : void
-     * @author : lijie
-     * @date :2021/9/7 16:28
-     * Update By lijie 2021/9/7 16:28
-     */
-    @Override
-    public void handle(RequestData requestData) {
-        // 1.处理依赖关系的计算
-        Set<RelChainDTO> dependentRelChain = gainDependentRelChain();
-        for (RelChainDTO relChain : dependentRelChain) {
-            calculationRelatingContext
-                    .getCalculatingRelationService(relChain.getGraphCode(),relChain.getRelCode(),relChain.getRelValue())
-                    .handle(RequestData.builder()
-                            .graphCode(relChain.getGraphCode())
-                            .relCode(relChain.getRelCode())
-                            .relValue(relChain.getRelValue()).build());
-        }
-        // 2.计算自身关系
-        // 2.1
-
-
-    }
-    /***
-     * Description:
-     * @return : java.util.Set<java.lang.String>
-     * @author : lijie
-     * @date :2021/9/7 16:33
-     * Update By lijie 2021/9/7 16:33
-     */
-    private Set<RelChainDTO> gainDependentRelChain(){
-        return CollUtil.newHashSet();
-    }
-
-}

dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/service/strategy/CalculatingRelationService.java

@@ -1,9 +0,0 @@
-package com.persagy.dmp.rwd.digital.service.strategy;
-
-import com.persagy.dmp.basic.dto.RequestData;
-
-public interface CalculatingRelationService {
-
-    void handle(RequestData requestData);
-
-}

dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/service/strategy/CalculationRelatingContext.java

@@ -1,79 +0,0 @@
-package com.persagy.dmp.rwd.digital.service.strategy;
-
-
-import cn.hutool.core.annotation.AnnotationUtil;
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.util.StrUtil;
-import com.persagy.dmp.common.exception.BusinessException;
-import com.persagy.dmp.common.helper.SpringHelper;
-import com.persagy.dmp.rwd.basic.constant.BusinessErrorRwdCode;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.PostConstruct;
-import java.lang.reflect.AnnotatedElement;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-@Component
-public class CalculationRelatingContext {
-
-    private Map<String,CalculatingRelationService> beanMap;
-
-    /***
-     * Description: 初始化关系计算策略类
-     * @return : void
-     * @author : lijie
-     * @date :2021/9/7 15:53
-     * Update By lijie 2021/9/7 15:53
-     */
-    @PostConstruct
-    private void initCalculatingRelationClass(){
-        beanMap=new HashMap<>();
-        // 初始化策略模式的映射
-        Map<String, CalculatingRelationService> serviceMap =
-                SpringHelper.getBeansOfType(CalculatingRelationService.class);
-        if (MapUtil.isEmpty(serviceMap)){
-            return;
-        }
-        // 将所有标准Relation注解并且图类型编码,边类型编码放入映射
-        Set<Map.Entry<String, CalculatingRelationService>> entries = serviceMap.entrySet();
-        for (Map.Entry<String, CalculatingRelationService> entry : entries) {
-            Relation relation = AnnotationUtil.getAnnotation(entry.getValue().getClass(), Relation.class);
-            if (StrUtil.isBlank(relation.graphCode())
-                    || StrUtil.isBlank(relation.relCode())){
-                continue;
-            }
-            if (StrUtil.isNotBlank(relation.relValue())){
-                beanMap.put(relation.graphCode()+StrUtil.UNDERLINE
-                        +relation.relCode()+StrUtil.UNDERLINE+relation.relValue(),entry.getValue());
-            }else {
-                beanMap.put(relation.graphCode()+StrUtil.UNDERLINE+relation.relCode(),entry.getValue());
-            }
-        }
-    }
-
-    /***
-     * Description:获取关系计算策略处理类
-     * @param graphCode : 图类型编码
-     * @param relCode : 关系编码
-     * @return : com.persagy.dmp.rwd.digital.service.strategy.CalculatingRelationService
-     * @author : lijie
-     * @date :2021/9/7 15:55
-     * Update By lijie 2021/9/7 15:55
-     */
-    public CalculatingRelationService getCalculatingRelationService(String graphCode,String relCode,String relValue){
-        if (StrUtil.isBlank(graphCode)
-                || StrUtil.isBlank(relCode)){
-            throw new BusinessException(BusinessErrorRwdCode.A7307.getCode(),BusinessErrorRwdCode.A7307.getDesc());
-        }
-        String key = graphCode+StrUtil.UNDERLINE+relCode;
-        if (StrUtil.isNotBlank(relValue)){
-            key=key+StrUtil.UNDERLINE+relValue;
-        }
-        if (!beanMap.containsKey(key)){
-            throw new BusinessException(BusinessErrorRwdCode.A7308.getCode(),BusinessErrorRwdCode.A7308.getDesc());
-        }
-        return beanMap.get(key);
-    }
-}

dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/service/strategy/Relation.java

@@ -1,15 +0,0 @@
-package com.persagy.dmp.rwd.digital.service.strategy;
-
-import java.lang.annotation.*;
-
-@Target({ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-public @interface Relation {
-    /**图类型编码*/
-    String graphCode() default "";
-    /**关系类型编码*/
-    String relCode() default "";
-    /**空间功能类型*/
-    String relValue() default "";
-}