Pārlūkot izejas kodu

对象处理中删除关系处理有误。改用调接口方式执行。

yucheng 3 gadi atpakaļ
vecāks
revīzija
70b71951ab

+ 1 - 2
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/basic/utils/DigitalCommonUtils.java

@@ -8,7 +8,6 @@ import com.persagy.dmp.common.constant.CommonConstant;
 import com.persagy.dmp.common.helper.SpringHelper;
 import com.persagy.dmp.rwd.basic.constant.DigitalObjectType;
 import com.persagy.dmp.rwd.basic.constant.DigitalObjectTypeShort;
-import org.apache.poi.ss.formula.functions.T;
 
 /**
  * 数据孪生通用工具
@@ -71,7 +70,7 @@ public class DigitalCommonUtils {
      * @date :2021/9/3 16:07
      * Update By lijie 2021/9/3 16:07
      */
-    public static String getDefaultGraphIdByGraphCode(String graphCode) {
+    public static String getDefaultGraphId(String graphCode) {
         return StrUtil.format(CommonConstant.DEFAULT_GRAPH_ID_FORMAT,graphCode);
     }
 

+ 6 - 13
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/service/calstrategy/CoordinateCalculateServiceImpl.java

@@ -2,13 +2,9 @@ package com.persagy.dmp.rwd.digital.service.calstrategy;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.persagy.dmp.basic.dto.CoordinateCalInfo;
-import com.persagy.dmp.basic.dto.RelationCalDTO;
 import com.persagy.dmp.basic.dto.RelationCalRuleDTO;
-import com.persagy.dmp.basic.dto.RequestData;
 import com.persagy.dmp.common.constant.CommonConstant;
 import com.persagy.dmp.common.exception.BusinessException;
 import com.persagy.dmp.define.entity.RelationDefine;
@@ -28,7 +24,10 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 /***
@@ -146,7 +145,6 @@ public class CoordinateCalculateServiceImpl implements CalculateService {
                 ObjectRelation objectRelation = new ObjectRelation();
                 objectRelation.setGroupCode(fromObjectDigital.getGroupCode());
                 objectRelation.setProjectId(fromObjectDigital.getProjectId());
-                objectRelation.setGraphId(DigitalCommonUtils.getDefaultGraphIdByGraphCode(calculatingDTO.getGraphCode()));
                 objectRelation.setGraphCode(calculatingDTO.getGraphCode());
                 objectRelation.setRelCode(calculatingDTO.getRelCode());
                 objectRelation.setObjFrom(fromObjectDigital.getId());
@@ -157,11 +155,6 @@ public class CoordinateCalculateServiceImpl implements CalculateService {
                 if (DigitalObjectType.SPACE.getIndex().equals(toObjectDigital.getObjType())){
                     objectRelation.setRelValue(toObjectDigital.getClassCode());
                 }
-                objectRelation.setCreateApp(calculatingDTO.getAppId());
-                objectRelation.setUpdateApp(calculatingDTO.getAppId());
-                objectRelation.setCreator(calculatingDTO.getAccountId());
-                objectRelation.setModifier(calculatingDTO.getAccountId());
-                objectRelation.setValid(1);
                 resultList.add(objectRelation);
             }
         }
@@ -175,7 +168,7 @@ public class CoordinateCalculateServiceImpl implements CalculateService {
                 resultList.stream().filter(objectRelation -> StrUtil.isNotBlank(objectRelation.getRelValue()))
                         .map(ObjectRelation::getRelValue).collect(Collectors.toSet()));
         // 新增关系
-        objectRelationService.saveBatch(resultList);
+        objectRelationService.save(resultList);
     }
     /***
      * Description: 根据请求参数和id集合删除关系
@@ -205,7 +198,7 @@ public class CoordinateCalculateServiceImpl implements CalculateService {
             wrapper.or(CollUtil.isNotEmpty(relFromIds),subWapper->subWapper.in(ObjectRelation.OBJ_FROM,relFromIds));
             wrapper.or(CollUtil.isNotEmpty(relToIds),subWapper->subWapper.in(ObjectRelation.OBJ_TO,relToIds));
         });
-        objectRelationService.remove(queryWrapper);
+        objectRelationService.delete(queryWrapper);
     }
 
     /***

+ 3 - 15
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/service/calstrategy/EqToSpCalculateServiceImpl.java

@@ -4,14 +4,9 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.persagy.dmp.basic.dto.CoordinateCalInfo;
 import com.persagy.dmp.basic.dto.RelationCalRuleDTO;
-import com.persagy.dmp.common.constant.CommonConstant;
-import com.persagy.dmp.common.exception.BusinessException;
-import com.persagy.dmp.define.entity.RelationDefine;
 import com.persagy.dmp.digital.entity.ObjectDigital;
 import com.persagy.dmp.digital.entity.ObjectRelation;
-import com.persagy.dmp.rwd.basic.constant.BusinessErrorRwdCode;
 import com.persagy.dmp.rwd.basic.constant.DigitalObjectType;
 import com.persagy.dmp.rwd.basic.utils.DigitalCommonUtils;
 import com.persagy.dmp.rwd.basic.utils.GeoToolsUtil;
@@ -26,7 +21,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -83,17 +77,11 @@ public class EqToSpCalculateServiceImpl implements CalculateService {
                         ObjectRelation objectRelation = new ObjectRelation();
                         objectRelation.setGroupCode(calculatingDTO.getGroupCode());
                         objectRelation.setProjectId(calculatingDTO.getProjectId());
-                        objectRelation.setGraphId(DigitalCommonUtils.getDefaultGraphIdByGraphCode(calculatingDTO.getGraphCode()));
                         objectRelation.setGraphCode(calculatingDTO.getGraphCode());
                         objectRelation.setRelCode(calculatingDTO.getRelCode());
+                        objectRelation.setRelValue(space.getClassCode());
                         objectRelation.setObjFrom(equipment.getId());
                         objectRelation.setObjTo(space.getId());
-                        objectRelation.setRelValue(space.getClassCode());
-                        objectRelation.setCreateApp(calculatingDTO.getAppId());
-                        objectRelation.setUpdateApp(calculatingDTO.getAppId());
-                        objectRelation.setCreator(calculatingDTO.getAccountId());
-                        objectRelation.setModifier(calculatingDTO.getAccountId());
-                        objectRelation.setValid(1);
                         insertRels.add(objectRelation);
                     }
                 }
@@ -102,7 +90,7 @@ public class EqToSpCalculateServiceImpl implements CalculateService {
                 deleteRelDataByCondition(calculatingDTO,insertRels.stream().map(ObjectRelation::getObjFrom).collect(Collectors.toSet()),
                         insertRels.stream().map(ObjectRelation::getObjTo).collect(Collectors.toSet()),
                         insertRels.stream().map(ObjectRelation::getRelValue).collect(Collectors.toSet()));
-                objectRelationService.saveBatch(insertRels,insertRels.size());
+                objectRelationService.save(insertRels);
             }
         }
 
@@ -149,6 +137,6 @@ public class EqToSpCalculateServiceImpl implements CalculateService {
             wrapper.or(CollUtil.isNotEmpty(fromIds),subWapper->subWapper.in(ObjectRelation.OBJ_FROM,fromIds));
             wrapper.or(CollUtil.isNotEmpty(toIds),subWapper->subWapper.in(ObjectRelation.OBJ_TO,toIds));
         });
-        objectRelationService.remove(queryWrapper);
+        objectRelationService.delete(queryWrapper);
     }
 }

+ 3 - 18
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/service/calstrategy/RelExtendCalculateServiceImpl.java

@@ -2,20 +2,14 @@ package com.persagy.dmp.rwd.digital.service.calstrategy;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.persagy.dmp.basic.dto.RelExtendCalDTO;
 import com.persagy.dmp.basic.dto.RelationCalRuleDTO;
 import com.persagy.dmp.basic.model.QueryCriteria;
 import com.persagy.dmp.basic.utils.QueryCriteriaHelper;
 import com.persagy.dmp.common.constant.CommonConstant;
-import com.persagy.dmp.common.helper.SpringHelper;
 import com.persagy.dmp.common.model.entity.BaseEntity;
-import com.persagy.dmp.define.entity.RelationDefine;
 import com.persagy.dmp.digital.entity.ObjectDigital;
 import com.persagy.dmp.digital.entity.ObjectRelation;
 import com.persagy.dmp.rwd.basic.utils.DigitalCommonUtils;
@@ -25,13 +19,10 @@ import com.persagy.dmp.rwd.digital.service.IObjectDigitalService;
 import com.persagy.dmp.rwd.digital.service.IObjectRelationService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.integration.json.JsonToObjectTransformer;
 import org.springframework.stereotype.Service;
 
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -122,17 +113,11 @@ public class RelExtendCalculateServiceImpl implements CalculateService {
             ObjectRelation objectRelation = new ObjectRelation();
             objectRelation.setGroupCode(calculatingDTO.getGroupCode());
             objectRelation.setProjectId(calculatingDTO.getProjectId());
-            objectRelation.setGraphId(DigitalCommonUtils.getDefaultGraphIdByGraphCode(calculatingDTO.getGraphCode()));
             objectRelation.setGraphCode(calculatingDTO.getGraphCode());
             objectRelation.setRelCode(calculatingDTO.getRelCode());
+            objectRelation.setRelValue(calculatingDTO.getRelValue());
             objectRelation.setObjFrom(queryObjectRelation.getObjFrom());
             objectRelation.setObjTo(queryObjectRelation.getObjTo());
-            objectRelation.setRelValue(calculatingDTO.getRelValue());
-            objectRelation.setCreateApp(calculatingDTO.getAppId());
-            objectRelation.setUpdateApp(calculatingDTO.getAppId());
-            objectRelation.setCreator(calculatingDTO.getAccountId());
-            objectRelation.setModifier(calculatingDTO.getAccountId());
-            objectRelation.setValid(1);
             objectRelations.add(objectRelation);
         }
         if (CollUtil.isNotEmpty(objectRelations)){
@@ -141,7 +126,7 @@ public class RelExtendCalculateServiceImpl implements CalculateService {
                     objectRelations.stream().map(ObjectRelation::getObjFrom).collect(Collectors.toSet()),
                     objectRelations.stream().map(ObjectRelation::getObjTo).collect(Collectors.toSet()));
             // 2.3 保存对象关系
-            objectRelationService.saveBatch(objectRelations);
+            objectRelationService.save(objectRelations);
         }
     }
 
@@ -163,7 +148,7 @@ public class RelExtendCalculateServiceImpl implements CalculateService {
         if (StrUtil.isNotBlank(calculatingDTO.getRelValue())){
             queryWrapper.eq(StrUtil.toUnderlineCase(ObjectRelation.REL_VALUE_HUM),calculatingDTO.getRelValue());
         }
-        objectRelationService.remove(queryWrapper);
+        objectRelationService.delete(queryWrapper);
     }
 
     /***

+ 3 - 11
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/service/calstrategy/ShThroughShRelCalculateServiceImpl.java

@@ -5,7 +5,6 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.persagy.dmp.basic.dto.RelationCalRuleDTO;
-import com.persagy.dmp.digital.entity.ObjectDigital;
 import com.persagy.dmp.digital.entity.ObjectRelation;
 import com.persagy.dmp.rwd.basic.utils.DigitalCommonUtils;
 import com.persagy.dmp.rwd.basic.utils.GeoToolsUtil;
@@ -18,7 +17,6 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
-import javax.validation.constraints.NotNull;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -85,17 +83,11 @@ public class ShThroughShRelCalculateServiceImpl implements CalculateService {
                     ObjectRelation objectRelation = new ObjectRelation();
                     objectRelation.setGroupCode(calculatingDTO.getGroupCode());
                     objectRelation.setProjectId(calculatingDTO.getProjectId());
-                    objectRelation.setGraphId(DigitalCommonUtils.getDefaultGraphIdByGraphCode(calculatingDTO.getGraphCode()));
                     objectRelation.setGraphCode(calculatingDTO.getGraphCode());
                     objectRelation.setRelCode(calculatingDTO.getRelCode());
+                    objectRelation.setRelValue(calculatingDTO.getRelValue());
                     objectRelation.setObjFrom(shaftId);
                     objectRelation.setObjTo(otherShaftId);
-                    objectRelation.setRelValue(calculatingDTO.getRelValue());
-                    objectRelation.setCreateApp(calculatingDTO.getAppId());
-                    objectRelation.setUpdateApp(calculatingDTO.getAppId());
-                    objectRelation.setCreator(calculatingDTO.getAccountId());
-                    objectRelation.setModifier(calculatingDTO.getAccountId());
-                    objectRelation.setValid(1);
                     resultList.add(objectRelation);
                 }
             }
@@ -104,7 +96,7 @@ public class ShThroughShRelCalculateServiceImpl implements CalculateService {
             // 3.根据图类型编码,边类型编码,relValue,项目id,集团编码删除关系
             deleteRelDataByCondition(calculatingDTO);
             // 4.新增关系
-            objectRelationService.saveBatch(resultList);
+            objectRelationService.save(resultList);
         }
     }
     /***
@@ -141,6 +133,6 @@ public class ShThroughShRelCalculateServiceImpl implements CalculateService {
         QueryWrapper<ObjectRelation> queryWrapper = ObjectDigitalCriteriaHelper.createCommonQueryWrapper(null,calculatingDTO);
         queryWrapper.eq(StrUtil.toUnderlineCase(ObjectRelation.GRAPH_CODE_HUM),calculatingDTO.getGraphCode());
         queryWrapper.eq(StrUtil.toUnderlineCase(ObjectRelation.REL_CODE_HUM),calculatingDTO.getRelCode());
-        objectRelationService.remove(queryWrapper);
+        objectRelationService.delete(queryWrapper);
     }
 }

+ 7 - 13
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/service/calstrategy/SpaceConnectionRelCalculateServiceImpl.java

@@ -1,8 +1,6 @@
 package com.persagy.dmp.rwd.digital.service.calstrategy;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.math.MathUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -10,7 +8,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.persagy.dmp.basic.dto.RelationCalRuleDTO;
-import com.persagy.dmp.basic.dto.SpaceConnectionCalDTO;
 import com.persagy.dmp.common.helper.SpringHelper;
 import com.persagy.dmp.digital.entity.ObjectRelation;
 import com.persagy.dmp.rwd.basic.constant.EquipmentTypeEnum;
@@ -28,7 +25,10 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 /***
@@ -85,7 +85,7 @@ public class SpaceConnectionRelCalculateServiceImpl implements CalculateService
             // 3.根据图类型编码,边类型编码,relValue,项目id,集团编码删除关系
             deleteRelDataByCondition(calculatingDTO);
             // 4.新增关系
-            objectRelationService.saveBatch(resultList);
+            objectRelationService.save(resultList);
         }
     }
     /***
@@ -269,17 +269,11 @@ public class SpaceConnectionRelCalculateServiceImpl implements CalculateService
         ObjectRelation objectRelation = new ObjectRelation();
         objectRelation.setGroupCode(groupCode);
         objectRelation.setProjectId(projectId);
-        objectRelation.setGraphId(DigitalCommonUtils.getDefaultGraphIdByGraphCode(calculatingDTO.getGraphCode()));
         objectRelation.setGraphCode(calculatingDTO.getGraphCode());
         objectRelation.setRelCode(calculatingDTO.getRelCode());
+        objectRelation.setRelValue(classCode);
         objectRelation.setObjFrom(objFrom);
         objectRelation.setObjTo(objTo);
-        objectRelation.setRelValue(classCode);
-        objectRelation.setCreateApp(calculatingDTO.getAppId());
-        objectRelation.setUpdateApp(calculatingDTO.getAppId());
-        objectRelation.setCreator(calculatingDTO.getAccountId());
-        objectRelation.setModifier(calculatingDTO.getAccountId());
-        objectRelation.setValid(1);
         return objectRelation;
     }
 
@@ -488,6 +482,6 @@ public class SpaceConnectionRelCalculateServiceImpl implements CalculateService
         QueryWrapper<ObjectRelation> queryWrapper = ObjectDigitalCriteriaHelper.createCommonQueryWrapper(null,calculatingDTO);
         queryWrapper.eq(StrUtil.toUnderlineCase(ObjectRelation.GRAPH_CODE_HUM),calculatingDTO.getGraphCode());
         queryWrapper.eq(StrUtil.toUnderlineCase(ObjectRelation.REL_CODE_HUM),calculatingDTO.getRelCode());
-        objectRelationService.remove(queryWrapper);
+        objectRelationService.delete(queryWrapper);
     }
 }

+ 1 - 1
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/service/impl/ObjectRelationServiceImpl.java

@@ -62,7 +62,7 @@ public class ObjectRelationServiceImpl extends ServiceImpl<ObjectRelationMapper,
         String appId = AppContext.getContext().getAppId();
         for (ObjectRelation vo : voList) {
             // 图实例id
-            vo.setGraphId(DigitalCommonUtils.getDefaultGraphIdByGraphCode(vo.getGraphCode()));
+            vo.setGraphId(DigitalCommonUtils.getDefaultGraphId(vo.getGraphCode()));
             vo.setGroupCode(groupCode);
             vo.setProjectId(projectId);
             vo.setCreateApp(appId);

+ 12 - 67
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/service/impl/RelationCalServiceImpl.java

@@ -3,12 +3,10 @@ package com.persagy.dmp.rwd.digital.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.BooleanUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.persagy.dmp.basic.dto.RelationCalDTO;
 import com.persagy.dmp.basic.dto.RelationCalRuleDTO;
 import com.persagy.dmp.basic.dto.RequestData;
@@ -26,11 +24,13 @@ import com.persagy.dmp.digital.entity.ObjectRelationProjectCal;
 import com.persagy.dmp.rwd.basic.constant.BusinessErrorRwdCode;
 import com.persagy.dmp.rwd.basic.constant.CalRuleTypeEnum;
 import com.persagy.dmp.rwd.basic.constant.ComputationalStateEnum;
-import com.persagy.dmp.rwd.basic.utils.DigitalCommonUtils;
 import com.persagy.dmp.rwd.define.service.IRelationDefineService;
 import com.persagy.dmp.rwd.digital.dao.ObjectDigitalMapper;
 import com.persagy.dmp.rwd.digital.domain.CalculatingDTO;
-import com.persagy.dmp.rwd.digital.service.*;
+import com.persagy.dmp.rwd.digital.service.CalculateService;
+import com.persagy.dmp.rwd.digital.service.IObjectRelationService;
+import com.persagy.dmp.rwd.digital.service.RelationCalService;
+import com.persagy.dmp.rwd.digital.service.RelationProjectCalService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -81,96 +81,41 @@ public class RelationCalServiceImpl implements RelationCalService {
         checkSlaveObjValid(resultList,requestData);
         // 4.插入关系from_id,to_id,图类型编码,边类型编码,项目id,如果rel_value有值则加上,结束
         // 4.1 获得主对象
-        ObjectDigital masterObjectDigital = resultList
-                .stream()
-                .filter(ObjectDigital::getMainFlag)
-                .collect(Collectors.toList())
-                .get(0);
+        ObjectDigital masterObjectDigital = resultList.stream().filter(ObjectDigital::getMainFlag).collect(Collectors.toList()).get(0);
         // 校验传感器类型
         checkSensor(masterObjectDigital,requestData);
         // 校验对象类型
         checkClassCode(masterObjectDigital,requestData);
         // 4.2 获得从对象
-        List<ObjectDigital> slaveObjectDigitals = resultList
-                .stream()
-                .filter(objectDigital -> !objectDigital.getMainFlag())
-                .collect(Collectors.toList());
+        List<ObjectDigital> slaveObjectDigitals = resultList.stream().filter(objectDigital -> !objectDigital.getMainFlag()).collect(Collectors.toList());
         // 4.3 根据主对象id和从对象id数组查询已经存在的关系
         Map<String, ObjectRelation> relationMap =
                 queryObjectRelationMapByFromIdAndToIds(masterObjectDigital.getId(),slaveObjectDigitals
                 .stream().map(BaseEntity::getId).collect(Collectors.toList()));
         // 4.3 创建关系
-        List<ObjectRelation> addRelations = new ArrayList<>();
-        List<ObjectRelation> updateRelations = new ArrayList<>();
+        List<ObjectRelation> relations = new ArrayList<>();
         //List<RelationCalSign> relationCalSigns = new ArrayList<>();
         boolean flag = StrUtil.isNotBlank(requestData.getSign()) && NumberUtil.isInteger(requestData.getSign());
+        // 生成插入关系
         for (ObjectDigital slaveObjectDigital : slaveObjectDigitals) {
-            // 当已经存在关系,仅更新一下操作记录
-            String uniqueKey = StrUtil
-                    .format(CommonConstant.RELATION_UNIQUE_KEY_FORMAT,
-                            requestData.getGraphCode(),
-                            requestData.getRelCode(),
-                            masterObjectDigital.getId(),
-                            slaveObjectDigital.getId());
-            if (relationMap.containsKey(uniqueKey)){
-                ObjectRelation objectRelation = relationMap.get(uniqueKey);
-                objectRelation.setUpdateApp(AppContext.getContext().getAppId());
-                objectRelation.setModifier(AppContext.getContext().getAccountId());
-                if (requestData.getHasRelValue()){
-                    objectRelation.setRelValue(masterObjectDigital.getClassCode());
-                }
-                updateRelations.add(objectRelation);
-//                if (flag){
-//                    // 因为lombok的SuperBuilder注解还处于实验性,所以暂时不用
-//                    RelationCalSign relationCalSign = RelationCalSign
-//                            .builder()
-//                            .sign(NumberUtil.parseInt(requestData.getSign()))
-//                            .build();
-//                    relationCalSign.setId(objectRelation.getId());
-//                    relationCalSigns.add(relationCalSign);
-//                }
-                continue;
-            }
-            // 生成插入关系
             ObjectRelation objectRelation = new ObjectRelation();
-            objectRelation.setId(IdWorker.getIdStr());
             objectRelation.setGraphCode(requestData.getGraphCode());
-            objectRelation.setGroupCode(AppContext.getContext().getGroupCode());
-            objectRelation.setProjectId(AppContext.getContext().getProjectId());
-            objectRelation.setCreateApp(AppContext.getContext().getAppId());
-            objectRelation.setUpdateApp(AppContext.getContext().getAppId());
-            objectRelation.setGraphId(DigitalCommonUtils.getDefaultGraphIdByGraphCode(requestData.getGraphCode()));
             objectRelation.setObjFrom(masterObjectDigital.getId());
             objectRelation.setObjTo(slaveObjectDigital.getId());
             objectRelation.setRelCode(requestData.getRelCode());
             if (requestData.getHasRelValue()){
                 objectRelation.setRelValue(masterObjectDigital.getClassCode());
             }
-            objectRelation.setCreator(AppContext.getContext().getAccountId());
-            objectRelation.setModifier(AppContext.getContext().getAccountId());
-            objectRelation.setValid(1);
-            addRelations.add(objectRelation);
-//            if (flag){
-//                RelationCalSign relationCalSign = RelationCalSign
-//                        .builder()
-//                        .sign(NumberUtil.parseInt(requestData.getSign()))
-//                        .build();
-//                relationCalSign.setId(objectRelation.getId());
-//                relationCalSigns.add(relationCalSign);
-//            }
-        }
-        if (CollUtil.isNotEmpty(updateRelations)){
-            objectRelationService.updateBatchById(updateRelations);
+            relations.add(objectRelation);
         }
-        if (CollUtil.isNotEmpty(addRelations)){
-            objectRelationService.saveBatch(addRelations);
+        if (CollUtil.isNotEmpty(relations)){
+            objectRelationService.save(relations);
         }
         // 5.处理sign:计算标记 1 为手动 2为自动
 //        if (CollUtil.isNotEmpty(relationCalSigns)){
 //            relationCalSignService.saveOrUpdateBatch(relationCalSigns);
 //        }
-        addRelations.addAll(updateRelations);
-        return ResultHelper.multi(addRelations,addRelations.size());
+        return ResultHelper.multi(relations, relations.size());
     }
 
     /***