Browse Source

Merge remote-tracking branch 'origin/develop' into develop

linhuili 2 years ago
parent
commit
2686c44a1b

+ 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/resources/db/init/schema.sql

@@ -377,7 +377,7 @@ CREATE TABLE IF NOT EXISTS `dt_define_relation_delivery` (
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
 
-CREATE TABLE `boss_bdtp_type_rel` (
+CREATE TABLE IF NOT EXISTS `boss_bdtp_type_rel` (
   `id` varchar(40) COLLATE utf8mb4_general_ci NOT NULL,
   `good_code` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'BOSS:商品编码',
   `type_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'BDTP:对象类型编码',

+ 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;
 

+ 1 - 1
dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/delivery/client/DigitalObjectTypeCollectClient.java

@@ -29,7 +29,7 @@ public interface DigitalObjectTypeCollectClient {
      * @param criteria 查询条件
      * @return 类型定义
      */
-    @PostMapping("")
+    @PostMapping("query")
     CommonResult<List<ObjectTypeCollect>> query(
             @RequestParam("groupCode") String groupCode,
             @RequestParam("projectId") String projectId,

+ 1 - 0
dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/delivery/dto/ObjectTypeCollectDTO.java

@@ -19,6 +19,7 @@ import javax.validation.constraints.NotNull;
 public class ObjectTypeCollectDTO extends ObjectTypeCollect {
     /** 类型名称 */
     private String name;
+    /** 数据字典定义编码 */
     private String aliasCode;
     /** 别名名称 */
     private String aliasName;