处理注释错误的注解

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

@@ -13,10 +13,10 @@ import com.persagy.dmp.common.exception.BusinessException;
 import com.persagy.dmp.common.model.response.CommonResult;
 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.mybatis.utils.ConditionUtil;
 import com.persagy.dmp.basic.utils.QueryCriteriaHelper;
 import com.persagy.dmp.rwd.basic.dto.RequestData;
-import com.persagy.dmp.rwd.digital.entity.ObjectDigital;
 import com.persagy.dmp.rwd.digital.service.IObjectDigitalService;
 import com.persagy.dmp.rwd.digital.service.ProjectBusinessService;
 import com.persagy.dmp.rwd.digital.utils.ObjectDigitalCriteriaHelper;

dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/dao/ObjectDigitalMapper.java

@@ -1,7 +1,7 @@
 package com.persagy.dmp.rwd.digital.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.persagy.dmp.rwd.digital.entity.ObjectDigital;
+import com.persagy.dmp.digital.entity.ObjectDigital;
 
 /**
  * 对象数据 DAO

dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/entity/ObjectDigital.java

@@ -1,55 +0,0 @@
-package com.persagy.dmp.rwd.digital.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.persagy.dmp.common.model.entity.AuditableEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.List;
-
-/**
- * 对象数据
- * @author Charlie Yu
- * @date 2021-06-25
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName(value = "dt_object",autoResultMap = true)
-public class ObjectDigital extends AuditableEntity {
-
-    /** 扩展属性列 */
-    public static final String EXTRA_COLUMN = "infos";
-    /** 扩展属性列 */
-    public static final String OBJ_TYPE = "obj_type";
-
-    /** 项目ID */
-    private String projectId;
-    /** 名称 */
-    private String name;
-    /** 本地编码 */
-    private String localId;
-    /** 本地名称 */
-    private String localName;
-    /** 对象分类 */
-    private String objType;
-    /** 类型编码 */
-    private String classCode;
-    /** 集团编码 */
-    private String groupCode;
-    /** 组标识 mysql8中grouping是关键字，必须标识 */
-    @TableField(value = "`grouping`")
-    private Integer grouping;
-    /** 边类型编码 */
-    @TableField(typeHandler = JacksonTypeHandler.class)
-    private ObjectNode infos;
-    /** 虚点清单 */
-    @TableField(typeHandler = JacksonTypeHandler.class)
-    private List<String> virtualCodes;
-    /** 创建应用 */
-    private String createApp;
-    /** 最后修改应用 */
-    private String updateApp;
-}

dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/handler/ProjectMessageHandler.java

@@ -3,8 +3,8 @@ package com.persagy.dmp.rwd.digital.handler;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.persagy.dmp.digital.entity.ObjectDigital;
 import com.persagy.dmp.rwd.digital.config.DigitalRabbitConfig;
-import com.persagy.dmp.rwd.digital.entity.ObjectDigital;
 import com.persagy.dmp.rwd.digital.service.IObjectDigitalService;
 import com.persagy.dmp.amqp.handler.AbstractRabbitHandlerTemplate;
 import com.persagy.dmp.common.constant.CommonConstant;

dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/handler/ProjectMessageVO.java

@@ -4,9 +4,9 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.persagy.dmp.rwd.digital.entity.ObjectDigital;
 import com.persagy.dmp.common.context.AppContext;
 import com.persagy.dmp.common.lang.PsDateTime;
+import com.persagy.dmp.digital.entity.ObjectDigital;
 import lombok.Data;
 
 import java.math.BigDecimal;

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

@@ -2,8 +2,7 @@ package com.persagy.dmp.rwd.digital.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.persagy.dmp.define.entity.RelationDefine;
-import com.persagy.dmp.rwd.digital.entity.ObjectDigital;
+import com.persagy.dmp.digital.entity.ObjectDigital;
 
 import java.util.List;
 import java.util.Map;

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

@@ -1,7 +1,7 @@
 package com.persagy.dmp.rwd.digital.service;
 
 import com.persagy.dmp.common.model.response.CommonResult;
-import com.persagy.dmp.rwd.digital.entity.ObjectDigital;
+import com.persagy.dmp.digital.entity.ObjectDigital;
 
 import java.util.List;
 import java.util.Set;

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

@@ -15,13 +15,13 @@ import com.persagy.dmp.common.constant.ValidEnum;
 import com.persagy.dmp.common.context.AppContext;
 import com.persagy.dmp.common.model.entity.BaseEntity;
 import com.persagy.dmp.define.entity.ObjectInfoDefine;
+import com.persagy.dmp.digital.entity.ObjectDigital;
 import com.persagy.dmp.rwd.basic.constant.DigitalMessageConstant;
 import com.persagy.dmp.rwd.basic.utils.DigitalCommonUtils;
 import com.persagy.dmp.rwd.basic.utils.DigitalMessageHelper;
 import com.persagy.dmp.rwd.define.service.IObjectInfoService;
 import com.persagy.dmp.rwd.define.service.IObjectTypeService;
 import com.persagy.dmp.rwd.digital.dao.ObjectDigitalMapper;
-import com.persagy.dmp.rwd.digital.entity.ObjectDigital;
 import com.persagy.dmp.rwd.digital.service.IObjectDigitalService;
 import com.persagy.dmp.rwd.parser.service.InfoDataFactory;
 import org.apache.commons.lang.StringUtils;

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

@@ -8,15 +8,14 @@ import com.persagy.dmp.common.constant.CommonConstant;
 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.rwd.digital.dao.ObjectDigitalMapper;
-import com.persagy.dmp.rwd.digital.entity.ObjectDigital;
 import com.persagy.dmp.rwd.digital.service.ProjectBusinessService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 

dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/utils/ObjectDigitalCriteriaHelper.java

@@ -8,7 +8,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.persagy.dmp.basic.model.QueryOperator;
 import com.persagy.dmp.basic.utils.JsonNodeUtils;
 import com.persagy.dmp.common.model.entity.BaseEntity;
-import com.persagy.dmp.rwd.digital.entity.ObjectDigital;
+import com.persagy.dmp.digital.entity.ObjectDigital;
 
 import java.util.HashMap;
 import java.util.Iterator;

dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/iot/service/impl/CurrentIotServiceImpl.java

@@ -8,11 +8,11 @@ import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.persagy.dmp.basic.model.QueryCriteria;
 import com.persagy.dmp.common.context.AppContext;
+import com.persagy.dmp.digital.entity.ObjectDigital;
 import com.persagy.dmp.mybatis.utils.ConditionUtil;
 import com.persagy.dmp.basic.utils.QueryCriteriaHelper;
 import com.persagy.dmp.rwd.basic.constant.IotUrlConstant;
 import com.persagy.dmp.rwd.basic.utils.MeterUtils;
-import com.persagy.dmp.rwd.digital.entity.ObjectDigital;
 import com.persagy.dmp.rwd.digital.service.IObjectDigitalService;
 import com.persagy.dmp.rwd.iot.model.CurrentDataModel;
 import com.persagy.dmp.rwd.iot.service.CurrentIotService;

dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/define/client/DigitalDefineClient.java

@@ -17,7 +17,7 @@ import java.util.List;
  * @author Charlie Yu
  * @date 2021-05-15
  */
-@FeignClient(name = "dmp-rwd", configuration = DigitalFeignConfig.class,url = "${dmp.rwd.service:}")
+@FeignClient(name = "dmp-rwd", configuration = DigitalFeignConfig.class,url = "${persagy.bdtp.rwd.service:}")
 public interface DigitalDefineClient {
 
     /**

dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/define/entity/GraphDefine.java

@@ -1,8 +1,12 @@
 package com.persagy.dmp.define.entity;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.persagy.dmp.common.model.entity.AuditableEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotNull;
 
 /**
  * 图例定义
@@ -11,15 +15,15 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-// @TableName(value = "dt_define_graph", autoResultMap = true)
+@TableName(value = "dt_define_graph", autoResultMap = true)
 public class GraphDefine extends AuditableEntity {
     /** 编码 */
-    //@NotNull(message = "编码不允许为空")
-    //@Length(max = 40)
+    @NotNull(message = "编码不允许为空")
+    @Length(max = 40)
     private String code;
     /** 名称 */
-    //@NotNull(message = "名称不允许为空")
-    //@Length(max = 200)
+    @NotNull(message = "名称不允许为空")
+    @Length(max = 200)
     private String name;
     /** 一级分类 */
     private String firstCategory;

dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/define/entity/ObjectInfoDefine.java

@@ -1,5 +1,8 @@
 package com.persagy.dmp.define.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.persagy.dmp.common.model.entity.AuditableEntity;
 import lombok.Data;
@@ -12,7 +15,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-//@TableName(value = "dt_define_info", autoResultMap = true)
+@TableName(value = "dt_define_info", autoResultMap = true)
 public class ObjectInfoDefine extends AuditableEntity {
     /** 项目ID */
     private String projectId;
@@ -51,7 +54,7 @@ public class ObjectInfoDefine extends AuditableEntity {
     /** 数据格式 */
     private String formater;
     /** 取值范围 */
-    //@TableField(typeHandler = JacksonTypeHandler.class)
+    @TableField(typeHandler = JacksonTypeHandler.class)
     private ArrayNode dataSource;
     /** 备注 */
     private String remark;

dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/define/entity/ObjectTypeDefine.java

@@ -1,8 +1,12 @@
 package com.persagy.dmp.define.entity;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.persagy.dmp.common.model.entity.AuditableEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotNull;
 
 /**
  * 对象类型定义
@@ -11,29 +15,29 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-// @TableName(value = "dt_define_type", autoResultMap = true)
+@TableName(value = "dt_define_type", autoResultMap = true)
 public class ObjectTypeDefine extends AuditableEntity {
     /** 编码 */
-//    @NotNull(message = "编码不允许为空")
-//    @Length(max = 40)
+    @NotNull(message = "编码不允许为空")
+    @Length(max = 40)
     private String code;
     /** 名称 */
-//    @NotNull(message = "名称不允许为空")
-//    @Length(max = 200)
+    @NotNull(message = "名称不允许为空")
+    @Length(max = 200)
     private String name;
     /** 别名编码 */
-//    @NotNull(message = "别名编码不允许为空")
-//    @Length(max = 40)
+    @NotNull(message = "别名编码不允许为空")
+    @Length(max = 40)
     private String aliasCode;
     /** 别名名称 */
-//    @NotNull(message = "别名名称不允许为空")
-//    @Length(max = 200)
+    @NotNull(message = "别名名称不允许为空")
+    @Length(max = 200)
     private String aliasName;
     /** 大类:project-项目, building-建筑, floor-楼层, space-空间,
      * system-系统, equipment-设备, shaft-竖井, component-部件,
      * virtual-虚拟, tool-工具, material-耗材
      **/
-    //@NotNull
+    @NotNull
     private String objType;
     //** 管理层级:common-平台级,group-集团级,project-项目级 */
     //private String type;

dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/define/entity/RelationDefine.java

@@ -1,5 +1,6 @@
 package com.persagy.dmp.define.entity;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.persagy.dmp.common.model.entity.AuditableEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -11,7 +12,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-//@TableName(value = "dt_define_rel", autoResultMap = true)
+@TableName(value = "dt_define_rel", autoResultMap = true)
 public class RelationDefine extends AuditableEntity {
     /** 编码 */
     private String code;

dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/digital/client/DigitalObjectClient.java

@@ -20,7 +20,7 @@ import java.util.Set;
  * @date :2021/8/19 17:38
  * Update By lijie 2021/8/19 17:38
  */
-@FeignClient(name = "dmp-rwd", configuration = DigitalFeignConfig.class,url = "${dmp.rwd.service:}")
+@FeignClient(name = "dmp-rwd", configuration = DigitalFeignConfig.class,url = "${persagy.bdtp.rwd.service:}")
 public interface DigitalObjectClient {
 
     /**

dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/digital/entity/ObjectDigital.java

@@ -1,5 +1,8 @@
 package com.persagy.dmp.digital.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.persagy.dmp.common.model.entity.AuditableEntity;
 import lombok.Data;
@@ -14,7 +17,7 @@ import java.util.List;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-//@TableName(value = "dt_object",autoResultMap = true)
+@TableName(value = "dt_object",autoResultMap = true)
 public class ObjectDigital extends AuditableEntity {
 
     /** 扩展属性列 */
@@ -37,13 +40,13 @@ public class ObjectDigital extends AuditableEntity {
     /** 集团编码 */
     private String groupCode;
     /** 组标识 mysql8中grouping是关键字，必须标识 */
-    //@TableField(value = "`grouping`")
+    @TableField(value = "`grouping`")
     private Integer grouping;
     /** 边类型编码 */
-    //@TableField(typeHandler = JacksonTypeHandler.class)
+    @TableField(typeHandler = JacksonTypeHandler.class)
     private ObjectNode infos;
     /** 虚点清单 */
-    //@TableField(typeHandler = JacksonTypeHandler.class)
+    @TableField(typeHandler = JacksonTypeHandler.class)
     private List<String> virtualCodes;
     /** 创建应用 */
     private String createApp;