Browse Source

调整常量位置

lijie 3 years ago
parent
commit
ab36d63fbe

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

@@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.persagy.dmp.basic.dto.RequestData;
 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 com.persagy.dmp.common.constant.DigitalObjectType;
+import com.persagy.dmp.common.constant.DigitalObjectTypeShort;
 
 /**
  * 数据孪生通用工具

+ 1 - 1
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/controller/ObjectDigitalController.java

@@ -27,7 +27,7 @@ import com.persagy.dmp.common.utils.ParamCheckUtil;
 import com.persagy.dmp.common.utils.ResultHelper;
 import com.persagy.dmp.digital.entity.ObjectDigital;
 import com.persagy.dmp.digital.entity.ObjectRelation;
-import com.persagy.dmp.rwd.basic.constant.DigitalObjectType;
+import com.persagy.dmp.common.constant.DigitalObjectType;
 import com.persagy.dmp.rwd.basic.constant.DigitalRelCode;
 import com.persagy.dmp.rwd.digital.service.IObjectDigitalService;
 import com.persagy.dmp.rwd.digital.service.ProjectBusinessService;

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

@@ -11,8 +11,7 @@ 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.common.constant.DigitalObjectType;
 import com.persagy.dmp.rwd.basic.utils.GeoToolsUtil;
 import com.persagy.dmp.rwd.digital.dao.ObjectDigitalMapper;
 import com.persagy.dmp.rwd.digital.domain.CalculatingDTO;

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

@@ -7,8 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.constant.DigitalObjectType;
-import com.persagy.dmp.rwd.basic.utils.DigitalCommonUtils;
+import com.persagy.dmp.common.constant.DigitalObjectType;
 import com.persagy.dmp.rwd.basic.utils.GeoToolsUtil;
 import com.persagy.dmp.rwd.digital.dao.ObjectDigitalMapper;
 import com.persagy.dmp.rwd.digital.domain.CalculatingDTO;

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

@@ -28,7 +28,7 @@ import com.persagy.dmp.common.utils.ResultHelper;
 import com.persagy.dmp.define.entity.ObjectInfoDefine;
 import com.persagy.dmp.digital.entity.ObjectDigital;
 import com.persagy.dmp.digital.entity.ObjectRelation;
-import com.persagy.dmp.rwd.basic.constant.DigitalObjectType;
+import com.persagy.dmp.common.constant.DigitalObjectType;
 import com.persagy.dmp.rwd.basic.constant.DigitalRelCode;
 import com.persagy.dmp.rwd.basic.utils.DigitalCommonUtils;
 import com.persagy.dmp.rwd.basic.utils.DigitalMessageHelper;
@@ -41,7 +41,6 @@ import com.persagy.dmp.rwd.parser.service.InfoDataFactory;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 

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

@@ -9,7 +9,7 @@ import com.persagy.dmp.common.context.AppContext;
 import com.persagy.dmp.common.model.response.CommonResult;
 import com.persagy.dmp.common.utils.ResultHelper;
 import com.persagy.dmp.digital.entity.ObjectDigital;
-import com.persagy.dmp.rwd.basic.constant.DigitalObjectType;
+import com.persagy.dmp.common.constant.DigitalObjectType;
 import com.persagy.dmp.rwd.digital.dao.ObjectDigitalMapper;
 import com.persagy.dmp.rwd.digital.service.ProjectBusinessService;
 import lombok.RequiredArgsConstructor;

+ 1 - 1
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/simple/service/impl/EquipmentReportServiceImpl.java

@@ -5,9 +5,9 @@ import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.StrUtil;
 import com.persagy.dmp.basic.dto.RequestData;
 import com.persagy.dmp.common.constant.CommonConstant;
+import com.persagy.dmp.common.constant.DigitalObjectType;
 import com.persagy.dmp.common.context.AppContext;
 import com.persagy.dmp.common.utils.DateHelper;
-import com.persagy.dmp.rwd.basic.constant.DigitalObjectType;
 import com.persagy.dmp.rwd.digital.utils.ObjectDigitalCriteriaHelper;
 import com.persagy.dmp.rwd.simple.dao.EquipmentReportMapper;
 import com.persagy.dmp.rwd.simple.domain.GroupDTO;

+ 1 - 1
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/basic/constant/DigitalObjectType.java

@@ -1,4 +1,4 @@
-package com.persagy.dmp.rwd.basic.constant;
+package com.persagy.dmp.common.constant;
 
 import lombok.Getter;
 

+ 1 - 1
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/basic/constant/DigitalObjectTypeShort.java

@@ -1,4 +1,4 @@
-package com.persagy.dmp.rwd.basic.constant;
+package com.persagy.dmp.common.constant;
 
 import lombok.Getter;