Browse Source

Merge branch 'develop' of http://39.106.8.246:3003/BDTP/digital-twin into develop

 Conflicts:
	dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/service/IObjectDigitalService.java
lijie 3 years ago
parent
commit
a12240f888
20 changed files with 128 additions and 20 deletions
  1. 7 1
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/define/controller/GraphDefineController.java
  2. 6 1
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/define/controller/ObjectInfoController.java
  3. 7 1
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/define/controller/ObjectTypeController.java
  4. 7 1
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/define/controller/RelationDefineController.java
  5. 7 0
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/define/service/IGraphDefineService.java
  6. 7 0
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/define/service/IObjectInfoService.java
  7. 7 0
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/define/service/IObjectTypeService.java
  8. 7 0
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/define/service/IRelationDefineService.java
  9. 5 0
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/define/service/impl/GraphDefineServiceImpl.java
  10. 10 4
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/define/service/impl/ObjectInfoServiceImpl.java
  11. 6 0
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/define/service/impl/ObjectTypeServiceImpl.java
  12. 6 1
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/define/service/impl/RelationDefineServiceImpl.java
  13. 7 1
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/controller/ObjectDigitalController.java
  14. 7 2
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/controller/ObjectRelationController.java
  15. 8 1
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/service/IObjectDigitalService.java
  16. 7 0
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/service/IObjectRelationService.java
  17. 8 5
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/service/impl/ObjectDigitalServiceImpl.java
  18. 5 1
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/service/impl/ObjectRelationServiceImpl.java
  19. 3 0
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/utils/ObjectDigitalCriteriaHelper.java
  20. 1 1
      dmp-common/src/main/java/com/persagy/dmp/common/utils/ResultHelper.java

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

@@ -38,7 +38,13 @@ public class GraphDefineController {
         QueryWrapper<GraphDefine> wrapper = new QueryWrapper<>();
         // 转换查询条件
         QueryCriteriaHelper.toWrapper(wrapper, criteria);
-        Page page = service.queryByCondition(QueryCriteriaHelper.toPage(criteria), wrapper);
+        Page page = QueryCriteriaHelper.toPage(criteria);
+        if(criteria.isOnlyCount()) {
+            Integer total = service.queryCount(wrapper);
+            page.setTotal(total);
+        } else {
+            page = service.queryByCondition(QueryCriteriaHelper.toPage(criteria), wrapper);
+        }
         return ResultHelper.multi(page.getRecords(), page.getTotal());
     }
 

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

@@ -48,7 +48,12 @@ public class ObjectInfoController {
         if(CollUtil.isEmpty(page.getOrders())) {
             wrapper.orderByAsc("show_order");
         }
-        page = service.queryByCondition(page, wrapper);
+        if(criteria.isOnlyCount()) {
+            Integer total = service.queryCount(wrapper);
+            page.setTotal(total);
+        } else {
+            page = service.queryByCondition(QueryCriteriaHelper.toPage(criteria), wrapper);
+        }
         return ResultHelper.multi(page.getRecords(), page.getTotal());
     }
 

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

@@ -43,7 +43,13 @@ public class ObjectTypeController {
         ConditionUtil.ensureProjectCriteria(wrapper);
         // 转换查询条件
         QueryCriteriaHelper.toWrapper(wrapper, criteria);
-        Page page = service.queryByCondition(QueryCriteriaHelper.toPage(criteria), wrapper);
+        Page page = QueryCriteriaHelper.toPage(criteria);
+        if(criteria.isOnlyCount()) {
+            Integer total = service.queryCount(wrapper);
+            page.setTotal(total);
+        } else {
+            page = service.queryByCondition(QueryCriteriaHelper.toPage(criteria), wrapper);
+        }
         return ResultHelper.multi(page.getRecords(), page.getTotal());
     }
 

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

@@ -41,7 +41,13 @@ public class RelationDefineController {
         ConditionUtil.ensureProjectCriteria(wrapper);
         // 转换查询条件
         QueryCriteriaHelper.toWrapper(wrapper, criteria);
-        Page page = service.queryByCondition(QueryCriteriaHelper.toPage(criteria), wrapper);
+        Page page = QueryCriteriaHelper.toPage(criteria);
+        if(criteria.isOnlyCount()) {
+            Integer total = service.queryCount(wrapper);
+            page.setTotal(total);
+        } else {
+            page = service.queryByCondition(QueryCriteriaHelper.toPage(criteria), wrapper);
+        }
         return ResultHelper.multi(page.getRecords(), page.getTotal());
     }
 

+ 7 - 0
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/define/service/IGraphDefineService.java

@@ -21,6 +21,13 @@ public interface IGraphDefineService {
     List<GraphDefine> queryByCondition(Wrapper<GraphDefine> queryWrapper);
 
     /**
+     * 按条件计数
+     * @param queryWrapper 查询条件
+     * @return 结果数量
+     */
+    Integer queryCount(Wrapper<GraphDefine> queryWrapper);
+
+    /**
      * 按条件查询
      * @param page 分页条件
      * @param queryWrapper 查询条件

+ 7 - 0
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/define/service/IObjectInfoService.java

@@ -43,6 +43,13 @@ public interface IObjectInfoService {
     Map<String, Map<String, ObjectInfoDefine>> queryByTypes(List<String> typeCodeList);
 
     /**
+     * 按条件计数
+     * @param queryWrapper 查询条件
+     * @return 结果数量
+     */
+    Integer queryCount(Wrapper<ObjectInfoDefine> queryWrapper);
+
+    /**
      * 按条件查询
      * @param queryWrapper 查询条件
      * @return 列表

+ 7 - 0
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/define/service/IObjectTypeService.java

@@ -38,6 +38,13 @@ public interface IObjectTypeService {
     Page queryByProjectAndApp(Page page, String projectId, String appId);
 
     /**
+     * 按条件计数
+     * @param queryWrapper 查询条件
+     * @return 结果数量
+     */
+    Integer queryCount(Wrapper<ObjectTypeDefine> queryWrapper);
+
+    /**
      * 按条件查询
      * @param queryWrapper 查询条件
      * @return 列表

+ 7 - 0
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/define/service/IRelationDefineService.java

@@ -14,6 +14,13 @@ import java.util.List;
 public interface IRelationDefineService {
 
     /**
+     * 按条件计数
+     * @param queryWrapper 查询条件
+     * @return 结果数量
+     */
+    Integer queryCount(Wrapper<RelationDefine> queryWrapper);
+
+    /**
      * 按条件查询
      * @param queryWrapper 查询条件
      * @return 列表

+ 5 - 0
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/define/service/impl/GraphDefineServiceImpl.java

@@ -30,6 +30,11 @@ public class GraphDefineServiceImpl implements IGraphDefineService {
     }
 
     @Override
+    public Integer queryCount(Wrapper<GraphDefine> queryWrapper) {
+        return dao.selectCount(queryWrapper);
+    }
+
+    @Override
     public Page queryByCondition(Page page, Wrapper<GraphDefine> queryWrapper) {
         return dao.selectPage(page, queryWrapper);
     }

+ 10 - 4
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/define/service/impl/ObjectInfoServiceImpl.java

@@ -7,14 +7,15 @@ import cn.hutool.core.text.StrFormatter;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.persagy.dmp.rwd.basic.constant.DigitalMessageConstant;
-import com.persagy.dmp.rwd.basic.utils.DigitalMessageHelper;
-import com.persagy.dmp.rwd.define.dao.ObjectInfoMapper;
-import com.persagy.dmp.rwd.define.service.IObjectInfoService;
 import com.persagy.dmp.common.constant.ValidEnum;
 import com.persagy.dmp.common.exception.BusinessException;
 import com.persagy.dmp.common.model.entity.BaseEntity;
+import com.persagy.dmp.define.entity.GraphDefine;
 import com.persagy.dmp.define.entity.ObjectInfoDefine;
+import com.persagy.dmp.rwd.basic.constant.DigitalMessageConstant;
+import com.persagy.dmp.rwd.basic.utils.DigitalMessageHelper;
+import com.persagy.dmp.rwd.define.dao.ObjectInfoMapper;
+import com.persagy.dmp.rwd.define.service.IObjectInfoService;
 import com.persagy.dmp.rwd.parser.service.InfoDataFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -76,6 +77,11 @@ public class ObjectInfoServiceImpl implements IObjectInfoService {
     }
 
     @Override
+    public Integer queryCount(Wrapper<ObjectInfoDefine> queryWrapper) {
+        return dao.selectCount(queryWrapper);
+    }
+
+    @Override
     public Page queryByCondition(Page page, Wrapper<ObjectInfoDefine> queryWrapper) {
         return dao.selectPage(page, queryWrapper);
     }

+ 6 - 0
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/define/service/impl/ObjectTypeServiceImpl.java

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.persagy.dmp.common.constant.ValidEnum;
 import com.persagy.dmp.common.exception.BusinessException;
 import com.persagy.dmp.common.model.entity.BaseEntity;
+import com.persagy.dmp.define.entity.ObjectInfoDefine;
 import com.persagy.dmp.define.entity.ObjectTypeDefine;
 import com.persagy.dmp.mybatis.utils.ConditionUtil;
 import com.persagy.dmp.rwd.basic.constant.DigitalMessageConstant;
@@ -94,6 +95,11 @@ public class ObjectTypeServiceImpl implements IObjectTypeService {
     }
 
     @Override
+    public Integer queryCount(Wrapper<ObjectTypeDefine> queryWrapper) {
+        return dao.selectCount(queryWrapper);
+    }
+
+    @Override
     public Page queryByCondition(Page page, Wrapper<ObjectTypeDefine> queryWrapper) {
         return dao.selectPage(page, queryWrapper);
     }

+ 6 - 1
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/define/service/impl/RelationDefineServiceImpl.java

@@ -3,9 +3,9 @@ package com.persagy.dmp.rwd.define.service.impl;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.persagy.dmp.common.constant.ValidEnum;
+import com.persagy.dmp.define.entity.RelationDefine;
 import com.persagy.dmp.rwd.define.dao.RelationDefineMapper;
 import com.persagy.dmp.rwd.define.service.IRelationDefineService;
-import com.persagy.dmp.define.entity.RelationDefine;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -30,6 +30,11 @@ public class RelationDefineServiceImpl implements IRelationDefineService {
     }
 
     @Override
+    public Integer queryCount(Wrapper<RelationDefine> queryWrapper) {
+        return dao.selectCount(queryWrapper);
+    }
+
+    @Override
     public Page queryByCondition(Page page, Wrapper<RelationDefine> queryWrapper) {
         return dao.selectPage(page, queryWrapper);
     }

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

@@ -57,7 +57,13 @@ public class ObjectDigitalController{
         ObjectDigitalCriteriaHelper.ensureExtraCond(criteria.getCriteria());
         // 转换查询条件
         QueryCriteriaHelper.toWrapper(wrapper, criteria);
-        Page page = service.queryByCondition(QueryCriteriaHelper.toPage(criteria), wrapper);
+        Page page = QueryCriteriaHelper.toPage(criteria);
+        if(criteria.isOnlyCount()) {
+            Integer total = service.queryCount(wrapper);
+            page.setTotal(total);
+        } else {
+            page = service.queryByCondition(QueryCriteriaHelper.toPage(criteria), wrapper);
+        }
         // 处理扩展属性
         List<ObjectNode> records = JsonNodeUtils.toListNode(page.getRecords(), ObjectDigital.EXTRA_COLUMN, criteria.getWithColumns());
         return ResultHelper.multi(records, page.getTotal());

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

@@ -11,7 +11,6 @@ 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.define.entity.RelationDefine;
 import com.persagy.dmp.mybatis.utils.ConditionUtil;
 import com.persagy.dmp.rwd.digital.entity.ObjectRelation;
 import com.persagy.dmp.rwd.digital.service.IObjectRelationService;
@@ -49,7 +48,13 @@ public class ObjectRelationController {
         ConditionUtil.ensureProjectCriteria(wrapper);
         // 转换查询条件
         QueryCriteriaHelper.toWrapper(wrapper, criteria);
-        Page page = service.queryByCondition(QueryCriteriaHelper.toPage(criteria), wrapper);
+        Page page = QueryCriteriaHelper.toPage(criteria);
+        if(criteria.isOnlyCount()) {
+            Integer total = service.queryCount(wrapper);
+            page.setTotal(total);
+        } else {
+            page = service.queryByCondition(QueryCriteriaHelper.toPage(criteria), wrapper);
+        }
         return ResultHelper.multi(page.getRecords(), page.getTotal());
     }
 

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

@@ -2,7 +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.common.model.response.CommonResult;
+import com.persagy.dmp.define.entity.RelationDefine;
 import com.persagy.dmp.rwd.digital.entity.ObjectDigital;
 
 import java.util.List;
@@ -23,6 +23,13 @@ public interface IObjectDigitalService {
     ObjectDigital load(String id);
 
     /**
+     * 按条件计数
+     * @param queryWrapper 查询条件
+     * @return 结果数量
+     */
+    Integer queryCount(Wrapper<ObjectDigital> queryWrapper);
+
+    /**
      * 按条件查询
      * @param queryWrapper 查询条件
      * @return 列表

+ 7 - 0
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/service/IObjectRelationService.java

@@ -22,6 +22,13 @@ public interface IObjectRelationService {
     List<ObjectRelation> queryByCondition(Wrapper<ObjectRelation> queryWrapper);
 
     /**
+     * 按条件计数
+     * @param queryWrapper 查询条件
+     * @return 结果数量
+     */
+    Integer queryCount(Wrapper<ObjectRelation> queryWrapper);
+
+    /**
      * 按条件查询
      * @param page 分页条件
      * @param queryWrapper 查询条件

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

@@ -9,18 +9,16 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.persagy.dmp.common.constant.ValidEnum;
 import com.persagy.dmp.common.context.AppContext;
-import com.persagy.dmp.define.entity.ObjectTypeDefine;
+import com.persagy.dmp.common.model.entity.BaseEntity;
+import com.persagy.dmp.define.entity.ObjectInfoDefine;
 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.common.constant.ValidEnum;
-import com.persagy.dmp.common.model.entity.BaseEntity;
-import com.persagy.dmp.define.entity.ObjectInfoDefine;
 import com.persagy.dmp.rwd.define.service.IObjectTypeService;
 import com.persagy.dmp.rwd.digital.dao.ObjectDigitalMapper;
 import com.persagy.dmp.rwd.digital.entity.ObjectDigital;
@@ -63,6 +61,11 @@ public class ObjectDigitalServiceImpl implements IObjectDigitalService {
     }
 
     @Override
+    public Integer queryCount(Wrapper<ObjectDigital> queryWrapper) {
+        return dao.selectCount(queryWrapper);
+    }
+
+    @Override
     public Page queryByCondition(Page page, Wrapper<ObjectDigital> queryWrapper) {
         return dao.selectPage(page, queryWrapper);
     }

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

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.persagy.dmp.common.constant.ValidEnum;
-import com.persagy.dmp.define.entity.RelationDefine;
 import com.persagy.dmp.rwd.basic.utils.DigitalMessageHelper;
 import com.persagy.dmp.rwd.digital.dao.ObjectRelationMapper;
 import com.persagy.dmp.rwd.digital.entity.ObjectRelation;
@@ -45,6 +44,11 @@ public class ObjectRelationServiceImpl implements IObjectRelationService {
     }
 
     @Override
+    public Integer queryCount(Wrapper<ObjectRelation> queryWrapper) {
+        return dao.selectCount(queryWrapper);
+    }
+
+    @Override
     public Page queryByCondition(Page page, Wrapper<ObjectRelation> queryWrapper) {
         return dao.selectPage(page, queryWrapper);
     }

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

@@ -32,6 +32,9 @@ public class ObjectDigitalCriteriaHelper {
      * @param criteria
      */
     public static void ensureExtraCond(ObjectNode criteria) {
+        if(criteria == null || criteria.isNull()) {
+            return;
+        }
         ensureSearchCond(criteria);
         ensureRelationCond(criteria);
         ensureJsonCond(criteria);

+ 1 - 1
dmp-common/src/main/java/com/persagy/dmp/common/utils/ResultHelper.java

@@ -109,7 +109,7 @@ public class ResultHelper {
     public static <T> CommonResult<List<T>> multi(List<T> records, long total) {
         // 容错处理,出现总数比实际数少时,以实际数为准(page查询全部时,total为0)
         int size = CollUtil.size(records);
-        if(total < CollUtil.size(records)) {
+        if(total < size) {
             total = size;
         }
         CommonResult<List<T>> result = success();