Browse Source

调整代码

lijie 3 years ago
parent
commit
23d7d7c4ed
18 changed files with 36 additions and 91 deletions
  1. 1 1
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/define/controller/GraphDefineController.java
  2. 1 1
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/define/controller/ObjectInfoController.java
  3. 1 2
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/define/controller/ObjectTypeController.java
  4. 2 3
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/define/controller/RelationDefineController.java
  5. 1 1
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/controller/ObjectDigitalController.java
  6. 1 1
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/controller/ObjectRelationController.java
  7. 1 1
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/iot/service/impl/CurrentIotServiceImpl.java
  8. 0 18
      dmp-comp/dmp-digital-starter/pom.xml
  9. 1 0
      dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/basic/model/QueryCriteria.java
  10. 2 23
      dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/basic/utils/QueryCriteriaHelper.java
  11. 1 1
      dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/define/client/DigitalDefineClient.java
  12. 5 9
      dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/define/entity/GraphDefine.java
  13. 2 5
      dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/define/entity/ObjectInfoDefine.java
  14. 10 14
      dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/define/entity/ObjectTypeDefine.java
  15. 1 2
      dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/define/entity/RelationDefine.java
  16. 1 1
      dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/digital/client/DigitalObjectClient.java
  17. 1 1
      dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/digital/client/DigitalObjecctFacade.java
  18. 4 7
      dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/digital/entity/ObjectDigital.java

+ 1 - 1
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/define/controller/GraphDefineController.java

@@ -3,12 +3,12 @@ package com.persagy.dmp.rwd.define.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.persagy.dmp.basic.model.QueryCriteria;
-import com.persagy.dmp.basic.utils.QueryCriteriaHelper;
 import com.persagy.dmp.common.constant.ResponseCode;
 import com.persagy.dmp.common.exception.BusinessException;
 import com.persagy.dmp.common.model.response.CommonResult;
 import com.persagy.dmp.common.utils.ResultHelper;
 import com.persagy.dmp.define.entity.GraphDefine;
+import com.persagy.dmp.basic.utils.QueryCriteriaHelper;
 import com.persagy.dmp.rwd.define.service.IGraphDefineService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;

+ 1 - 1
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/define/controller/ObjectInfoController.java

@@ -4,13 +4,13 @@ import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.persagy.dmp.basic.model.QueryCriteria;
-import com.persagy.dmp.basic.utils.QueryCriteriaHelper;
 import com.persagy.dmp.common.constant.ResponseCode;
 import com.persagy.dmp.common.exception.BusinessException;
 import com.persagy.dmp.common.model.response.CommonResult;
 import com.persagy.dmp.common.utils.ResultHelper;
 import com.persagy.dmp.define.entity.ObjectInfoDefine;
 import com.persagy.dmp.mybatis.utils.ConditionUtil;
+import com.persagy.dmp.basic.utils.QueryCriteriaHelper;
 import com.persagy.dmp.rwd.define.service.IObjectInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;

+ 1 - 2
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/define/controller/ObjectTypeController.java

@@ -5,14 +5,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 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.ResponseCode;
 import com.persagy.dmp.common.exception.BusinessException;
 import com.persagy.dmp.common.model.response.CommonResult;
 import com.persagy.dmp.common.utils.ResultHelper;
 import com.persagy.dmp.define.entity.ObjectTypeDefine;
 import com.persagy.dmp.mybatis.utils.ConditionUtil;
+import com.persagy.dmp.basic.utils.QueryCriteriaHelper;
 import com.persagy.dmp.rwd.define.service.IObjectTypeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;

+ 2 - 3
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/define/controller/RelationDefineController.java

@@ -3,13 +3,12 @@ package com.persagy.dmp.rwd.define.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.persagy.dmp.basic.model.QueryCriteria;
-import com.persagy.dmp.basic.utils.QueryCriteriaHelper;
 import com.persagy.dmp.common.constant.ResponseCode;
 import com.persagy.dmp.common.exception.BusinessException;
 import com.persagy.dmp.common.model.response.CommonResult;
 import com.persagy.dmp.common.utils.ResultHelper;
 import com.persagy.dmp.define.entity.RelationDefine;
-import com.persagy.dmp.mybatis.utils.ConditionUtil;
+import com.persagy.dmp.basic.utils.QueryCriteriaHelper;
 import com.persagy.dmp.rwd.define.service.IRelationDefineService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -38,7 +37,7 @@ public class RelationDefineController {
         }
         QueryWrapper<RelationDefine> wrapper = new QueryWrapper<>();
         // 添加所属项目条件
-        ConditionUtil.ensureProjectCriteria(wrapper);
+        // ConditionUtil.ensureProjectCriteria(wrapper);
         // 转换查询条件
         QueryCriteriaHelper.toWrapper(wrapper, criteria);
         Page page = QueryCriteriaHelper.toPage(criteria);

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

@@ -7,7 +7,6 @@ import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.persagy.dmp.basic.model.QueryCriteria;
 import com.persagy.dmp.basic.utils.JsonNodeUtils;
-import com.persagy.dmp.basic.utils.QueryCriteriaHelper;
 import com.persagy.dmp.common.constant.CommonConstant;
 import com.persagy.dmp.common.constant.ResponseCode;
 import com.persagy.dmp.common.exception.BusinessException;
@@ -15,6 +14,7 @@ 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.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;

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

@@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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.ResponseCode;
 import com.persagy.dmp.common.exception.BusinessException;
@@ -12,6 +11,7 @@ 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.mybatis.utils.ConditionUtil;
+import com.persagy.dmp.basic.utils.QueryCriteriaHelper;
 import com.persagy.dmp.rwd.digital.entity.ObjectRelation;
 import com.persagy.dmp.rwd.digital.service.IObjectRelationService;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -7,9 +7,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.basic.utils.QueryCriteriaHelper;
 import com.persagy.dmp.common.context.AppContext;
 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;

+ 0 - 18
dmp-comp/dmp-digital-starter/pom.xml

@@ -11,14 +11,6 @@
     <groupId>com.persagy</groupId>
     <artifactId>dmp-digital-starter</artifactId>
     <version>1.0.0</version>
-    <!--<repositories>
-        <repository>
-            &lt;!&ndash; nexus服务器中用户名:在settings.xml中<server>的id&ndash;&gt;
-            <id>persagy</id>
-            <name>persagy</name>
-            <url>http://47.93.132.139:8081/nexus/content/repositories/persagy/</url>
-        </repository>
-    </repositories>-->
     <dependencies>
         <!-- fm 工具包 -->
         <dependency>
@@ -40,14 +32,4 @@
             <scope>compile</scope>
         </dependency>
     </dependencies>
-
-    <!--<distributionManagement>
-        <repository>
-            &lt;!&ndash; nexus服务器中用户名:在settings.xml中<server>的id&ndash;&gt;
-            <id>persagy</id>
-            <name>persagy</name>
-            <url>http://47.93.132.139:8081/nexus/content/repositories/persagy/</url>
-            <uniqueVersion>true</uniqueVersion>
-        </repository>
-    </distributionManagement>-->
 </project>

+ 1 - 0
dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/basic/model/QueryCriteria.java

@@ -57,4 +57,5 @@ public class QueryCriteria {
     private List<OrderItem> orders;
     /** 额外返回的扩展字段清单 */
     private Set<String> withColumns;
+
 }

+ 2 - 23
dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/basic/utils/QueryCriteriaHelper.java

@@ -1,9 +1,7 @@
 package com.persagy.dmp.basic.utils;
 
-import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
@@ -12,7 +10,6 @@ import com.persagy.dmp.basic.model.QueryOperator;
 import com.persagy.dmp.common.model.entity.BaseEntity;
 
 import java.util.Iterator;
-import java.util.List;
 
 /**
  * 查询条件 助手
@@ -41,8 +38,7 @@ public class QueryCriteriaHelper {
         Page pageInfo = new Page();
         pageInfo.setCurrent(criteria.getPage());
         pageInfo.setSize(criteria.getSize());
-        // 20210819 size<-1时,拦截器不执行page的配置,因此改为在wrapper中排序
-//        pageInfo.setOrders(criteria.getOrders());
+        pageInfo.setOrders(criteria.getOrders());
         pageInfo.setSearchCount(!criteria.isWithoutCount());
         return pageInfo;
     }
@@ -56,7 +52,6 @@ public class QueryCriteriaHelper {
             return;
         }
         toWrapper(wrapper, criteria.getCriteria());
-        ensureOrders(wrapper, criteria.getOrders());
     }
 
     /**
@@ -76,7 +71,7 @@ public class QueryCriteriaHelper {
             String dbField = StrUtil.startWith(field, "#JSON#")?field.substring(6):StrUtil.toUnderlineCase(field);
             // 20210813增加ADM传sql特殊处理 - 不公开到接口文档中
             if("$sql".equalsIgnoreCase(field)) {
-                wrapper.apply((String)JsonNodeUtils.getNodeValue(fieldValue));
+                wrapper.apply((String) JsonNodeUtils.getNodeValue(fieldValue));
                 continue;
             }
             // 20210816增加or条件支持
@@ -175,20 +170,4 @@ public class QueryCriteriaHelper {
             }
         }
     }
-
-    /**
-     * 拼接排序条件
-     * @param wrapper
-     * @param orders
-     * @param <T>
-     */
-    public static <T extends BaseEntity> void ensureOrders(QueryWrapper<T> wrapper, List<OrderItem> orders) {
-        if(CollUtil.isEmpty(orders)) {
-            return;
-        }
-        for(OrderItem order:orders) {
-            String column = StrUtil.toUnderlineCase(order.getColumn());
-            wrapper.orderBy(true, order.isAsc(), column);
-        }
-    }
 }

+ 1 - 1
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)
+@FeignClient(name = "dmp-rwd", configuration = DigitalFeignConfig.class, url = "${dmp.rwd.service:''}")
 public interface DigitalDefineClient {
 
     /**

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

@@ -1,12 +1,8 @@
 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;
 
 /**
  * 图例定义
@@ -15,15 +11,15 @@ import javax.validation.constraints.NotNull;
  */
 @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;

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

@@ -1,8 +1,5 @@
 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;
@@ -15,7 +12,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;
@@ -54,7 +51,7 @@ public class ObjectInfoDefine extends AuditableEntity {
     /** 数据格式 */
     private String formater;
     /** 取值范围 */
-    @TableField(typeHandler = JacksonTypeHandler.class)
+    //@TableField(typeHandler = JacksonTypeHandler.class)
     private ArrayNode dataSource;
     /** 备注 */
     private String remark;

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

@@ -1,12 +1,8 @@
 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;
 
 /**
  * 对象类型定义
@@ -15,29 +11,29 @@ import javax.validation.constraints.NotNull;
  */
 @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;

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

@@ -1,6 +1,5 @@
 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;
@@ -12,7 +11,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;

+ 1 - 1
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)
+@FeignClient(name = "dmp-rwd", configuration = DigitalFeignConfig.class,url = "${dmp.rwd.service:''}")
 public interface DigitalObjectClient {
 
     /**

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

@@ -16,7 +16,7 @@ import java.util.Set;
  * @author Charlie Yu
  * @date 2021-05-15
  */
-public class DigitalObjecctFacade {
+public class DigitalObjectFacade {
 
     private static DigitalObjectClient client = SpringUtil.getBean(DigitalObjectClient.class);
 

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

@@ -1,8 +1,5 @@
 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;
@@ -17,7 +14,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 {
 
     /** 扩展属性列 */
@@ -40,13 +37,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;