胡秀武:模型列表树基础信息属性信息

src/main/java/com/pms/ocp/common/constants/Constant.java

@@ -725,4 +725,6 @@ public interface Constant {
          */
         String SENDEMAIL = "qkjfdzyxt@isc.com";
     }
+
+
 }

src/main/java/com/pms/ocp/common/constants/Constants.java

-package com.pms.ocp.common.constants;
-
-/**
- * @author huxiuwu
- * @version 1.0
- * @date 2022/3/8 17:09
- */
-public interface Constants {
-    /**
-     * 数字产量
-     */
-    interface NumberConstant{
-        Integer ZERO = 0;
-    }
-}

src/main/java/com/pms/ocp/controller/ModelBaseController.java

 package com.pms.ocp.controller;
 
-import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.pms.ocp.common.utils.ExcelUtils;
 import com.pms.ocp.model.dto.ModelDTO;
-import com.pms.ocp.model.dto.ModelSubscribeDTO;
 import com.pms.ocp.model.dto.ModelPropertyDTO;
 import com.pms.ocp.model.dto.ModelRelationDTO;
+import com.pms.ocp.model.dto.ModelSubscribeDTO;
 import com.pms.ocp.model.entity.Model;
-import com.pms.ocp.model.entity.ModelProperty;
-import com.pms.ocp.model.entity.ModelSubscribe;
 import com.pms.ocp.model.entity.ModelAudit;
+import com.pms.ocp.model.entity.ModelSubscribe;
 import com.pms.ocp.model.vo.ModelAuditVO;
 import com.pms.ocp.model.vo.ModelPropertyVO;
 import com.pms.ocp.model.vo.ResponseVO;
@@ -74,7 +72,7 @@ public class ModelBaseController {
      *
      * @return
      */
-    @ApiOperation("模型-查询列表")
+    //@ApiOperation("模型-查询列表")
     @GetMapping("/get/model/list")
     public ResponseVO getModelList(@ApiParam(value = "模型订阅编号") @RequestParam(value = "objId", required = false) String objId,
                                    @ApiParam(value = "模型编码") @RequestParam(value = "modelCode", required = false) String modelCode,
@@ -86,10 +84,25 @@ public class ModelBaseController {
         PageHelper.startPage(currentPage, pageSize);
         List<Model> modelList = modelService.getModelList(objId, modelCode, ownerCompanyCodes, modelGroupCodes);
         PageInfo<Model> pageInfo = new PageInfo<>(modelList);
-
         return ResponseVO.ok(pageInfo);
     }
 
+    /**
+     * 模型-查询列表
+     *
+     * @return
+     */
+    @ApiOperation("模型-查询列表")
+    @GetMapping("/get/model/getModeBaselList")
+    public ResponseVO getModeBaselList(@ApiParam(value = "所属级别") @RequestParam(value = "belongLevel", required = false) String belongLevel,
+                                       @ApiParam(value = "模型编码") @RequestParam(value = "modelCode", required = false) String modelCode,
+                                       @ApiParam(value = "当前页") @RequestParam(value = "currentPage") Integer currentPage,
+                                       @ApiParam(value = "每页数量") @RequestParam(value = "pageSize") Integer pageSize,
+                                       @ApiParam(value = "模糊搜索条件") @RequestParam(value = "searchCondition",required = false) String searchCondition) {
+            return modelService.getModeBaselList(belongLevel, modelCode, currentPage, pageSize, searchCondition);
+
+    }
+
     /**
      * 模型-删除
      *

src/main/java/com/pms/ocp/service/ModelService.java

@@ -2,6 +2,7 @@ package com.pms.ocp.service;
 
 import com.pms.ocp.model.dto.ModelDTO;
 import com.pms.ocp.model.entity.Model;
+import com.pms.ocp.model.vo.ResponseVO;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
@@ -64,4 +65,5 @@ public interface ModelService {
      */
     Model getModel(String objId, String modelCode);
 
+    ResponseVO getModeBaselList(String belongLevel, String modelCode, Integer currentPage, Integer pageSize, String searchCondition);
 }

src/main/java/com/pms/ocp/service/impl/ModelServiceImpl.java

@@ -3,18 +3,23 @@ package com.pms.ocp.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.pms.ocp.common.constants.Constant;
 import com.pms.ocp.common.utils.ExcelUtils;
+import com.pms.ocp.common.utils.PageUtil;
 import com.pms.ocp.mapper.ModelMapper;
+import com.pms.ocp.mapper.ModelPropertyMapper;
 import com.pms.ocp.model.dto.ModelDTO;
 import com.pms.ocp.model.entity.Model;
+import com.pms.ocp.model.entity.ModelProperty;
 import com.pms.ocp.model.vo.ModelVO;
+import com.pms.ocp.model.vo.ResponseVO;
 import com.pms.ocp.service.ModelService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.annotation.Resource;
 import java.io.IOException;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -29,9 +34,12 @@ import java.util.List;
 @Service
 public class ModelServiceImpl extends ServiceImpl<ModelMapper, Model> implements ModelService {
 
-    @Autowired
+    @Resource
     private ModelMapper modelMapper;
 
+    @Resource
+    private ModelPropertyMapper modelPropertyMapper;
+
     /**
      * 创建模型
      *
@@ -191,4 +199,58 @@ public class ModelServiceImpl extends ServiceImpl<ModelMapper, Model> implements
 
         return modelMapper.selectOne(queryWrapper);
     }
+
+    @Override
+    public ResponseVO getModeBaselList(String belongLevel, String modelCode, Integer currentPage, Integer pageSize, String searchCondition) {
+         ResponseVO result;
+        switch (belongLevel){
+            case Constant.Character.STRINGTWO:
+                 result = this.getModelInfoList(modelCode,currentPage,pageSize,searchCondition);
+                 break;
+            case Constant.Character.STRINGTHREE:
+                 result = this.getPropertyList(modelCode,currentPage,pageSize,searchCondition);
+                 break;
+                 default: return ResponseVO.ok();
+        }
+                return result;
+    }
+    /**
+     *
+     * @author huxiuwu
+     * @date 2022/3/17
+     * @param modelCode 分类编码
+     * @param currentPage 当前页
+     * @param pageSize 每页数量
+     * @param searchCondition 搜索条件
+     * @return pms.ocp.model.vo.ResponseVO
+     **/
+    private ResponseVO getModelInfoList(String modelCode, Integer currentPage, Integer pageSize, String searchCondition) {
+           QueryWrapper<Model> queryWrapper = new QueryWrapper<>();
+           queryWrapper.eq("model_group_code",modelCode).like(StringUtils.isNotEmpty(searchCondition),"ocp_model_prop",searchCondition);
+           List<Model> modelList = modelMapper.selectList(queryWrapper);
+           PageUtil<Model> pageUtil = new PageUtil<>();
+           pageUtil.startPage(currentPage,pageSize,modelList);
+           return ResponseVO.ok(pageUtil);
+    }
+
+    /**
+     *
+     * @author huxiuwu
+     * @date 2022/3/17
+     * @param modelCode 分类编码
+     * @param currentPage 当前页
+     * @param pageSize 每页数量
+     * @param searchCondition 搜索条件
+     * @return pms.ocp.model.vo.ResponseVO
+     **/
+    private ResponseVO getPropertyList(String modelCode, Integer currentPage, Integer pageSize, String searchCondition) {
+        QueryWrapper<ModelProperty> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("model_code",modelCode).like(StringUtils.isNotEmpty(searchCondition),"column_name",searchCondition);
+        List<ModelProperty> modelPropertiesList = modelPropertyMapper.selectList(queryWrapper);
+        PageUtil<ModelProperty> pageUtil = new PageUtil<>();
+        pageUtil.startPage(currentPage,pageSize,modelPropertiesList);
+        return ResponseVO.ok(pageUtil);
+    }
+
+
 }