|
@@ -1,7 +1,6 @@
|
|
-package com.persagy.proxy.adm.service.impl;
|
|
|
|
|
|
+package com.persagy.proxy.calculation.service.impl;
|
|
|
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
import cn.hutool.core.collection.CollUtil;
|
|
-import cn.hutool.core.math.MathUtil;
|
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
import cn.hutool.core.util.StrUtil;
|
|
import com.fasterxml.jackson.databind.JsonNode;
|
|
import com.fasterxml.jackson.databind.JsonNode;
|
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
|
@@ -9,7 +8,6 @@ import com.fasterxml.jackson.databind.node.ArrayNode;
|
|
import com.fasterxml.jackson.databind.node.ObjectNode;
|
|
import com.fasterxml.jackson.databind.node.ObjectNode;
|
|
import com.persagy.dmp.basic.dto.RequestData;
|
|
import com.persagy.dmp.basic.dto.RequestData;
|
|
import com.persagy.dmp.basic.model.QueryCriteria;
|
|
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.constant.CommonConstant;
|
|
import com.persagy.dmp.common.helper.SpringHelper;
|
|
import com.persagy.dmp.common.helper.SpringHelper;
|
|
import com.persagy.dmp.common.model.response.CommonResult;
|
|
import com.persagy.dmp.common.model.response.CommonResult;
|
|
@@ -17,17 +15,14 @@ import com.persagy.dmp.digital.client.DigitalObjectFacade;
|
|
import com.persagy.dmp.digital.client.DigitalRelationCaclFacade;
|
|
import com.persagy.dmp.digital.client.DigitalRelationCaclFacade;
|
|
import com.persagy.dmp.digital.client.DigitalRelationFacade;
|
|
import com.persagy.dmp.digital.client.DigitalRelationFacade;
|
|
import com.persagy.dmp.digital.entity.ObjectDigital;
|
|
import com.persagy.dmp.digital.entity.ObjectDigital;
|
|
-import com.persagy.dmp.digital.entity.ObjectRelation;
|
|
|
|
import com.persagy.proxy.adm.constant.AdmObjectInfoConstant;
|
|
import com.persagy.proxy.adm.constant.AdmObjectInfoConstant;
|
|
import com.persagy.proxy.adm.constant.AdmObjectType;
|
|
import com.persagy.proxy.adm.constant.AdmObjectType;
|
|
import com.persagy.proxy.adm.constant.AdmRelationTypeEnum;
|
|
import com.persagy.proxy.adm.constant.AdmRelationTypeEnum;
|
|
-import com.persagy.proxy.adm.constant.ObjTypeMapping;
|
|
|
|
-import com.persagy.proxy.adm.dto.TwicePointDTO;
|
|
|
|
|
|
+import com.persagy.proxy.adm.model.TwicePointDTO;
|
|
import com.persagy.proxy.adm.request.AdmResponse;
|
|
import com.persagy.proxy.adm.request.AdmResponse;
|
|
-import com.persagy.proxy.adm.service.AdmRelCalService;
|
|
|
|
import com.persagy.proxy.adm.utils.GeoToolsUtil;
|
|
import com.persagy.proxy.adm.utils.GeoToolsUtil;
|
|
|
|
+import com.persagy.proxy.calculation.service.AdmRelCalService;
|
|
import com.persagy.proxy.common.entity.InstanceUrlParam;
|
|
import com.persagy.proxy.common.entity.InstanceUrlParam;
|
|
-import lombok.Data;
|
|
|
|
import lombok.RequiredArgsConstructor;
|
|
import lombok.RequiredArgsConstructor;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|