修改模型查询接口

pom.xml

@@ -19,19 +19,19 @@
         <spring-boot.version>2.4.2</spring-boot.version>
 
         <swagger.version>3.0.0</swagger.version>
-<!--        <mybatis-spring-boot.version>2.1.4</mybatis-spring-boot.version>-->
-<!--        <pagehelper.boot.version>1.3.1</pagehelper.boot.version>-->
-<!--        <fastjson.version>1.2.76</fastjson.version>-->
-<!--        <oshi.version>5.8.0</oshi.version>-->
-<!--        <jna.version>5.8.0</jna.version>-->
-<!--        <commons.io.version>2.10.0</commons.io.version>-->
-<!--        <commons.fileupload.version>1.4</commons.fileupload.version>-->
-<!--        <poi.version>4.1.2</poi.version>-->
-<!--        <velocity.version>1.7</velocity.version>-->
-<!--        <lombok.version>1.18.8</lombok.version>-->
-<!--        <minio.version>7.0.2</minio.version>-->
-<!--        <alipay-sdk-java.version>4.8.10.ALL</alipay-sdk-java.version>-->
-<!--        <ali-sms-sdk.version>4.5.0</ali-sms-sdk.version>-->
+        <!--        <mybatis-spring-boot.version>2.1.4</mybatis-spring-boot.version>-->
+        <!--        <pagehelper.boot.version>1.3.1</pagehelper.boot.version>-->
+        <!--        <fastjson.version>1.2.76</fastjson.version>-->
+        <!--        <oshi.version>5.8.0</oshi.version>-->
+        <!--        <jna.version>5.8.0</jna.version>-->
+        <!--        <commons.io.version>2.10.0</commons.io.version>-->
+        <!--        <commons.fileupload.version>1.4</commons.fileupload.version>-->
+        <!--        <poi.version>4.1.2</poi.version>-->
+        <!--        <velocity.version>1.7</velocity.version>-->
+        <!--        <lombok.version>1.18.8</lombok.version>-->
+        <!--        <minio.version>7.0.2</minio.version>-->
+        <!--        <alipay-sdk-java.version>4.8.10.ALL</alipay-sdk-java.version>-->
+        <!--        <ali-sms-sdk.version>4.5.0</ali-sms-sdk.version>-->
         <knife4j-ui.version>2.0.8</knife4j-ui.version>
 
     </properties>
@@ -95,12 +95,6 @@
             <version>2.0.9</version>
         </dependency>
 
-        <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
-            <version>1.1.0.Final</version>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
@@ -112,6 +106,7 @@
                 </exclusion>
             </exclusions>
         </dependency>
+
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>

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

@@ -78,11 +78,13 @@ public class ModelBaseController {
     @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,
+                                   @ApiParam(value = "归属省编码数组EQ: ddas232, 2e1ssda, 3232") @RequestParam(value = "ownerCompanyCodes", required = false) List<String> ownerCompanyCodes,
+                                   @ApiParam(value = "归属分类编码数组") @RequestParam(value = "modelGroupCodes", required = false) List<String> modelGroupCodes,
                                    @ApiParam(value = "当前页") @RequestParam(value = "currentPage", required = false) Integer currentPage,
                                    @ApiParam(value = "每页数量") @RequestParam(value = "pageSize", required = false) Integer pageSize) {
 
         PageHelper.startPage(currentPage, pageSize);
-        List<Model> modelList = modelService.getModelList(objId, modelCode);
+        List<Model> modelList = modelService.getModelList(objId, modelCode, ownerCompanyCodes, modelGroupCodes);
         PageInfo<Model> pageInfo = new PageInfo<>(modelList);
 
         return ResponseVO.ok(pageInfo);

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

@@ -53,7 +53,7 @@ public interface ModelService {
      * @param
      * @return
      */
-    List<Model> getModelList(String objId, String modelCode);
+    List<Model> getModelList(String objId, String modelCode, List<String> ownerCompanyCodes, List<String> modelGroupCodes);
 
     /**
      * 获取模型列表

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

@@ -3,20 +3,16 @@ 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.CodeEnum;
 import com.pms.ocp.common.utils.ExcelUtils;
 import com.pms.ocp.mapper.ModelMapper;
 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.util.CollectionUtils;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
@@ -133,7 +129,7 @@ public class ModelServiceImpl extends ServiceImpl<ModelMapper, Model> implements
      * @return
      */
     @Override
-    public List<Model> getModelList(String objId, String modelCode) {
+    public List<Model> getModelList(String objId, String modelCode, List<String> ownerCompanyCodes, List<String> modelGroupCodes) {
         QueryWrapper<Model> queryWrapper = new QueryWrapper();
 
         if (StringUtils.isNotEmpty(objId)) {
@@ -144,6 +140,34 @@ public class ModelServiceImpl extends ServiceImpl<ModelMapper, Model> implements
             queryWrapper.lambda().eq(Model::getModelCode, modelCode);
         }
 
+        if (ownerCompanyCodes != null && !ownerCompanyCodes.isEmpty()) {
+            List<Model> modelList = new ArrayList<>();
+            for (String ownerCompanyCode : ownerCompanyCodes){
+                queryWrapper.lambda().eq(Model::getOwnerCompanyCode, ownerCompanyCode);
+                List<Model> modelList1;
+                modelList1 = modelMapper.selectList(queryWrapper);
+                modelList.addAll(modelList1);
+                queryWrapper.lambda().clear();
+            }
+            return modelList;
+        }
+
+        if (modelGroupCodes != null && !modelGroupCodes.isEmpty()) {
+            List<Model> modelList = new ArrayList<>();
+            for (String modelGroupCode : modelGroupCodes){
+                queryWrapper.lambda().eq(Model::getModelGroupCode, modelGroupCode);
+                List<Model> modelList1;
+                modelList1 = modelMapper.selectList(queryWrapper);
+                modelList.addAll(modelList1);
+                queryWrapper.lambda().clear();
+            }
+            return modelList;
+        }
+
+        if (StringUtils.isNotEmpty(modelCode)) {
+            queryWrapper.lambda().eq(Model::getModelCode, modelCode);
+        }
+
         return modelMapper.selectList(queryWrapper);
     }