From fbe48349985f6b14618d5bd34bb76b262dc6e3ad Mon Sep 17 00:00:00 2001
From: wangjingsheng <wangjinsheng@wodcloud.com>
Date: Wed, 23 Mar 2022 13:54:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/pms/ocp/controller/ModelBaseController.java    | 10 +++-------
 src/main/java/com/pms/ocp/model/dto/TenanBaseDto.java  |  3 +--
 .../java/com/pms/ocp/service/ModelRelationService.java |  2 +-
 .../pms/ocp/service/impl/ModelRelationServiceImpl.java |  6 +++++-
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/pms/ocp/controller/ModelBaseController.java b/src/main/java/com/pms/ocp/controller/ModelBaseController.java
index 4a1c26a..02a0b8f 100644
--- a/src/main/java/com/pms/ocp/controller/ModelBaseController.java
+++ b/src/main/java/com/pms/ocp/controller/ModelBaseController.java
@@ -278,11 +278,6 @@ public class ModelBaseController {
                                            @ApiParam(value = "当前页") @RequestParam(value = "currentPage", required = false) Integer currentPage,
                                            @ApiParam(value = "每页数量") @RequestParam(value = "pageSize", required = false) Integer pageSize) {
 
-//        PageHelper.startPage(currentPage, pageSize);
-//        List<ModelProperty> modelPropertyVOList = modelPropertyService.listModelProperty(objId, modelCode, subsCompanyCode);
-//        PageInfo<ModelProperty> pageInfo = new PageInfo<>(modelPropertyVOList);
-
-
         PageHelper.startPage(currentPage, pageSize);
         List<ModelPropertyVO> pageInfo = modelPropertyService.listModelPropertyVO(currentPage, pageSize, modelCode, ownerCompanyCode, modelGroupCode);
         PageInfo<ModelPropertyVO> pageInfo1 = new PageInfo<>(pageInfo);
@@ -334,8 +329,9 @@ public class ModelBaseController {
     @ApiOperation("模型拓扑关系-查询")
     @GetMapping("/get/model/topology")
     public ResponseVO getModelTopology(@ApiParam(value = "模型拓扑关系编号") @RequestParam(value = "objId", required = false) String objId,
+                                       @ApiParam(value = "模型归属分类编码") @RequestParam(value = "modelGroupCode", required = false) String modelGroupCode,
                                        @ApiParam(value = "模型编码") @RequestParam(value = "modelCode", required = false) String modelCode) {
-        return ResponseVO.ok(modelRelationService.getModelRelationList(objId, modelCode));
+        return ResponseVO.ok(modelRelationService.getModelRelationList(objId, modelGroupCode, modelCode));
     }
 
     /**
@@ -351,7 +347,7 @@ public class ModelBaseController {
     }
 
 
-    @ApiOperation("模型列表-导航树")
+    @ApiOperation("模型-导航树")
     @GetMapping("/delete/model/modelListNavigation")
     public ResponseVO modelListNavigation(@RequestParam(required = false) String searchCondition) {
         return modelSubscribeService.modelListNavigation(searchCondition);
diff --git a/src/main/java/com/pms/ocp/model/dto/TenanBaseDto.java b/src/main/java/com/pms/ocp/model/dto/TenanBaseDto.java
index b30ca9e..96cc459 100644
--- a/src/main/java/com/pms/ocp/model/dto/TenanBaseDto.java
+++ b/src/main/java/com/pms/ocp/model/dto/TenanBaseDto.java
@@ -227,8 +227,7 @@ public class TenanBaseDto extends OcpTenantGroup {
         this.tenantGroupLevel = tenantGroupLevel;
     }
 
-    public OcpTenantGroup setClassIfy(String classIfy) {
+    public void setClassIfy(String classIfy) {
         this.classIfy = classIfy;
-        return null;
     }
 }
diff --git a/src/main/java/com/pms/ocp/service/ModelRelationService.java b/src/main/java/com/pms/ocp/service/ModelRelationService.java
index c69adcf..371f761 100644
--- a/src/main/java/com/pms/ocp/service/ModelRelationService.java
+++ b/src/main/java/com/pms/ocp/service/ModelRelationService.java
@@ -53,7 +53,7 @@ public interface ModelRelationService {
      * @param
      * @return
      */
-    List<ModelRelation> getModelRelationList(String objId, String modelCode);
+    List<ModelRelation> getModelRelationList(String objId, String modelGroupCode, String modelCode);
 
     /**
      * 获取模型关系列表
diff --git a/src/main/java/com/pms/ocp/service/impl/ModelRelationServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ModelRelationServiceImpl.java
index 5cf3b86..d350d82 100644
--- a/src/main/java/com/pms/ocp/service/impl/ModelRelationServiceImpl.java
+++ b/src/main/java/com/pms/ocp/service/impl/ModelRelationServiceImpl.java
@@ -65,13 +65,17 @@ public class ModelRelationServiceImpl implements ModelRelationService {
     }
 
     @Override
-    public List<ModelRelation> getModelRelationList(String objId, String modelCode) {
+    public List<ModelRelation> getModelRelationList(String objId, String modelGroupCode, String modelCode) {
         QueryWrapper<ModelRelation> queryWrapper = new QueryWrapper();
 
         if (StringUtils.isNotEmpty(objId)) {
             queryWrapper.lambda().eq(ModelRelation::getObjId, objId);
         }
 
+        if (StringUtils.isNotEmpty(modelGroupCode)) {
+            queryWrapper.lambda().eq(ModelRelation::getModelPropCode, modelGroupCode);
+        }
+
         if (StringUtils.isNotEmpty(modelCode)) {
             queryWrapper.lambda().eq(ModelRelation::getModelCode, modelCode);
         }
-- 
2.26.0