Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java
#	src/main/java/com/pms/ocp/model/entity/OcpApiGroup.java
#	src/main/java/com/pms/ocp/model/entity/OcpTenantGroup.java

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/common/constants/CodeEnum.java

@@ -39,7 +39,7 @@ public enum CodeEnum {
     /**
      * 数据异常
      */
-    NO_DATA("555", "数据库数据异常", false),
+    NO_DATA("200", "数据库无数据", false),
     UP_DATA_FAIL("401005", "更新失败", false),
     INSERT_FAIL("401006", "插入数据失败", false),
     DELETE_FAIL("401007", "修改失败", false);

src/main/java/com/pms/ocp/common/utils/TreeUtils.java

@@ -61,7 +61,6 @@ public class TreeUtils {
             }
             result.add(node);
         }
-
         return result;
     }
 

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);
@@ -100,6 +102,7 @@ public class ModelBaseController {
         return ResponseVO.ok(modelService.deleteModel(objId, modelCode));
     }
 
+
     /**
      * 模型-修改
      *

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

@@ -11,6 +11,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -40,20 +41,20 @@ public class OcpTenantController {
     }
     @GetMapping("/tenantselect")
     @ApiModelProperty("应用树分类--查询")
-    private Page<OcpTenantGroup> getselect(String tenantGroupCode,String tenantGroupCompanyCode,int currentPage,int pageSize,String keyword){
-        Page<OcpTenantGroup> tree= tenantService.getselects(tenantGroupCode,tenantGroupCompanyCode,currentPage,pageSize,keyword);
-        return tree;
+    private ResponseVO<Page<OcpTenantGroup>> getselect(String tenantGroupCode,String tenantGroupCompanyCode,int currentPage,int pageSize,String keyword,String lev ){
+        Page<OcpTenantGroup> tree= tenantService.getselects(tenantGroupCode,tenantGroupCompanyCode,currentPage,pageSize,keyword,lev);
+        return ResponseVO.ok(tree);
     }
 
     @PostMapping("/tenantinster")
     @ApiModelProperty("新增应用")
-
     public ResponseVO tenantInster(@RequestBody TenanBaseDto TenanBaseDto){
-      boolean falg =   tenantService.getTenanInster(TenanBaseDto);
-      if (falg){
-          return ResponseVO.ok("新建成功！");
+        OcpTenantGroup tenanInster = tenantService.getTenanInster(TenanBaseDto);
+        if ("".equals(tenanInster)){
+            return ResponseVO.error("应用添加失败！");
         }
-      return ResponseVO.error("应用code已经存在！");
+          return ResponseVO.ok(tenanInster);
+
     }
 
     @PostMapping("/tenantupdata")

src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java

@@ -32,8 +32,11 @@ public interface OcpApiTreeMapper extends BaseMapper<OcpApiGroup> {
     List<OcpApiGroup> selectThreeApiGroupsList(Long apiGroupPromotionType, String apiGroupCode);
 
 
-  List<OcpApiGroup> selectLists(Long apiGroupPromotionType, String apiGroupCode,Long apiGroupLevel);
+  List<OcpApiGroup> selectLists(Long apiGroupPromotionType, String apiGroupCode,String apiGroupLevel);
 
 //code重复问题
   List<OcpApiGroup> selectGroupCode();
+
+  //根据code查询整条数据
+  OcpApiGroup selectCode(String code);
 }

src/main/java/com/pms/ocp/mapper/TenantMapper.java

 package com.pms.ocp.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.pms.ocp.model.dto.TenanBaseDto;
 import com.pms.ocp.model.entity.OcpTenantGroup;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
@@ -29,10 +32,11 @@ public interface TenantMapper extends BaseMapper<OcpTenantGroup> {
     List<OcpTenantGroup> selectGroups(String tenantGroupCompanyCode);
 
 
-    //模糊查询
-    List<OcpTenantGroup> queryLike(String keyword);
+    //服务树--查询
+    List<OcpTenantGroup> selectTenantGroupsList(String tenantGroupCode,String tenantGroupCompanyCode);
 
 
+    List<OcpTenantGroup> selectGroupsList(String tenantGroupCompanyCode,String tenantGroupName);
 
 
 }

src/main/java/com/pms/ocp/model/dto/PageGroupDto.java

@@ -51,7 +51,7 @@ public class PageGroupDto extends PageParam {
     private long isDelete;
 
     @ApiModelProperty("分层树层级 1中台层 2中心层 3 服务组层 4服务层 ")
-    private long apiGroupLevel;
+    private String apiGroupLevel;
 
     public String getObjId() {
         return objId;
@@ -157,11 +157,11 @@ public class PageGroupDto extends PageParam {
         this.isDelete = isDelete;
     }
 
-    public long getApiGroupLevel() {
+    public String getApiGroupLevel() {
         return apiGroupLevel;
     }
 
-    public void setApiGroupLevel(long apiGroupLevel) {
+    public void setApiGroupLevel(String apiGroupLevel) {
         this.apiGroupLevel = apiGroupLevel;
     }
 }

src/main/java/com/pms/ocp/model/dto/TenanBaseDto.java

@@ -2,11 +2,13 @@ package com.pms.ocp.model.dto;
 
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.pms.ocp.model.entity.OcpTenantGroup;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.sql.Timestamp;
 
@@ -15,6 +17,7 @@ import java.sql.Timestamp;
  */
 @ApiModel(value = "新增应用封装对象")
 @Data
+@EqualsAndHashCode(callSuper=false)
 public class TenanBaseDto extends OcpTenantGroup {
 
 
@@ -23,122 +26,112 @@ public class TenanBaseDto extends OcpTenantGroup {
     private String objId;
 
     /**
-     * 应用名称
+     * 应用分类编码
      */
-    @ApiModelProperty("应用名称")
-    private String tenantName;
+    @ApiModelProperty("应用分类编码")
+    private String tenantGroupCode;
 
     /**
-     * 应用代码
+     * 应用分类名称
      */
-    @ApiModelProperty("应用代码")
-    private String tenantCode;
+    @ApiModelProperty("应用分类名称")
+    private String tenantGroupName;
 
     /**
-     * 应用分类代码
+     * 分类创建公司
      */
-    @ApiModelProperty("应用分类代码")
-    private String tenantGroupCode;
+    @ApiModelProperty("分类创建公司")
+    private String tenantGroupCompanyCode;
 
     /**
-     * 应用ip
+     * 上级code
      */
-    @ApiModelProperty("应用ip")
-    private String tenantIp;
+    @ApiModelProperty("上级code")
+    private String tenantGroupPcode;
 
     /**
-     * 应用url
+     * 应用类别设备级、生态级等
      */
-    @ApiModelProperty("应用url")
-    private String tenantUrl;
+    @ApiModelProperty("应用类别设备级、生态级等")
+    private String tenantType;
 
     /**
-     * 所属专业
+     * 分类版本
      */
-    @ApiModelProperty("所属专业")
-    private String professionalKind;
+    @ApiModelProperty("分类版本")
+    private String tenantGroupVersion;
 
     /**
-     * 创建者用户ID
+     * 显示顺序
      */
-    @ApiModelProperty("创建者用户ID")
-    private String tenantUserId;
+    @ApiModelProperty("显示顺序")
+    private Integer tenantGroupOrderNo;
 
     /**
-     * 排序
+     * 提交人id
      */
-    @ApiModelProperty("排序")
-    private Integer tenantOrderNo;
+    @ApiModelProperty("提交人id")
+    private String tenantGroupUserId;
 
     /**
-     * 创建时间
+     * 提交人姓名
      */
-    @ApiModelProperty("创建时间")
-    private Timestamp tenantCtime;
+    @ApiModelProperty("提交人姓名")
+    private String tenantGroupUserName;
 
     /**
-     * 最后更新时间
+     * 创建时间
      */
-    @ApiModelProperty("最后更新时间")
-    private Timestamp tenantMtime;
+    @ApiModelProperty("创建时间")
+    private Timestamp tenantGroupCtime;
 
     /**
-     * 部署名称
+     * 修改时间
      */
-    @ApiModelProperty("部署名称")
-    private String deploymentName;
+    @ApiModelProperty("修改时间")
+    private Timestamp tenantGroupMtime;
 
     /**
-     * 描述
+     * 是否删除
      */
-    @ApiModelProperty("描述")
-    private String tenantDescription;
+    @ApiModelProperty("是否删除")
+    private Short isDelete;
 
     /**
-     * 应用状态0:设计态；1:运行态
+     * 应用树层级 1:应用分组层  2:应用层
      */
-    @ApiModelProperty("应用状态0:设计态；1:运行态")
-    private Short tenantState;
+    @ApiModelProperty("应用树层级 1:应用分组层  2:应用层")
+    private String tenantGroupLevel;
 
-    /**
-     * 建设单位
-     */
-    @ApiModelProperty("建设单位")
-    private String tenantUnit;
 
-    /**
-     * 所属公司编码
-     */
-    @ApiModelProperty("所属公司编码")
-    private String ownerCompanyCode;
 
-    /**
-     * 所属公司名称
-     */
-    @ApiModelProperty("所属公司名称")
-    private String ownerCompanyName;
+    //上级分类名称
 
-    /**
-     * 是否删除0:否;1:是
-     */
-    @ApiModelProperty("是否删除0:否;1:是")
-    private Short isDelete;
+    @ApiModelProperty("上级分类名称")
+    @TableField(exist = false)
+    private String classIfy;
 
-    /**
-     * 所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区
-     */
-    @ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区")
-    private Short tenantZone;
+    public String getObjId() {
+        return objId;
+    }
 
-    /**
-     * 所属层级 1:应用层;2:平台层;3:网络层;4:感知层;
-     */
-    @ApiModelProperty("所属层级 1:应用层;2:平台层;3:网络层;4:感知层;")
-    private Short tenantLayer;
+    public void setObjId(String objId) {
+        this.objId = objId;
+    }
 
-    /**
-     * 应用版本（当前版本）
-     */
-    @ApiModelProperty("应用版本（当前版本）")
-    private String tenantVersion;
+    public String getTenantGroupCode() {
+        return tenantGroupCode;
+    }
+
+    public void setTenantGroupCode(String tenantGroupCode) {
+        this.tenantGroupCode = tenantGroupCode;
+    }
+
+    public String getClassIfy() {
+        return classIfy;
+    }
+
+    public void setClassIfy(String classIfy) {
+        this.classIfy = classIfy;
+    }
 }

src/main/java/com/pms/ocp/model/entity/OcpApiAudit.java

@@ -17,60 +17,54 @@ public class OcpApiAudit {
 
   @TableId(type = IdType.ASSIGN_ID)
   @ApiModelProperty("主键ID")
-  @Excel(name = "主键ID",orderNum = "1")
+  @Excel(name = "编号",orderNum = "1")
   private String objId;
 
   @ApiModelProperty("服务编码")
-  @Excel(name = "服务编码",orderNum = "2")
   private String apiCode;
 
   @ApiModelProperty("操作状态0:新增,1:迭代；2，下线")
-  @Excel(name = "操作状态",orderNum = "3")
+  @Excel(name = "类型",orderNum = "3")
   private long operStatus;
 
   @ApiModelProperty("操作对象0:服务，1:入参，2:出参")
-  @Excel(name = "操作对象",orderNum = "4")
   private long operTarget;
 
   @ApiModelProperty("类型0:人工操作,1:流程管控,3:总部下发")
-  @Excel(name = "操作对象",orderNum = "4")
   private long auditType;
 
   @ApiModelProperty("备注简述")
-  @Excel(name = "备注简述",orderNum = "5")
   private String auditMessage;
 
   @ApiModelProperty("事记内容")
-  @Excel(name = "事记内容",orderNum = "6")
+  @Excel(name = "变更内容",orderNum = "4")
   private String auditJson;
 
   @ApiModelProperty("提交人id")
-  @Excel(name = "提交人id",orderNum = "7")
   private String auditUserId;
 
   @ApiModelProperty("提交人姓名")
-  @Excel(name = "提交人姓名",orderNum = "8")
+  @Excel(name = "变更人",orderNum = "5")
   private String auditUserName;
 
   @ApiModelProperty("创建时间")
-  @Excel(name = "创建时间",orderNum = "9")
+  @Excel(name = "创建时间",orderNum = "6")
   private Timestamp auditCtime;
 
   @ApiModelProperty("修改时间")
-  @Excel(name = "修改时间",orderNum = "10")
   private Timestamp auditMtime;
 
   @ApiModelProperty("是否删除0-否1-是")
-  @Excel(name = "是否删除",orderNum = "11")
   private long isDelete;
   @ApiModelProperty("当前版本")
-  @Excel(name = "当前版本",orderNum = "12")
   private long applyVersion;
+
   @ApiModelProperty("上一版本")
-  @Excel(name = "上一版本",orderNum = "13")
+  @Excel(name = "上一版本",orderNum = "7")
   private long preApiVersion;
 
   @ApiModelProperty("服务接口中文名称")
+  @Excel(name = "服务名称",orderNum = "2")
   private String apiName;
 
   @ApiModelProperty("服务分类代码")
@@ -80,9 +74,12 @@ public class OcpApiAudit {
   private long apiPromotion;
 
   @ApiModelProperty("服务请求体")
+  @Excel(name = "请求参数",orderNum = "8")
   private String apiReq;
 
   @ApiModelProperty("服务返回体")
+  @Excel(name = "返回参数",orderNum = "9")
+
   private String apiResp;
 
   @ApiModelProperty("服务地址")
@@ -113,6 +110,7 @@ public class OcpApiAudit {
   private long apiLayer;
 
   @ApiModelProperty("服务版本（最新版本）")
+  @Excel(name = "当前版本",orderNum = "6")
   private long apiVersion;
 
   public String getObjId() {

src/main/java/com/pms/ocp/model/entity/OcpTenantAudit.java

@@ -83,7 +83,7 @@ public class OcpTenantAudit implements Serializable {
      */
     @ApiModelProperty("创建时间")
     @Excel(name = "创建时间",orderNum = "9")
-    private Date auditCtime;
+    private Timestamp auditCtime;
 
     /**
      * 应用版本(当前版本)
@@ -238,14 +238,10 @@ public class OcpTenantAudit implements Serializable {
         return auditCtime;
     }
 
-    public void setAuditCtime(Date auditCtime) {
+    public void setAuditCtime(Timestamp auditCtime) {
         this.auditCtime = auditCtime;
     }
 
-    public String getApplyVersion() {
-        return applyVersion;
-    }
-
     public void setApplyVersion(String applyVersion) {
         this.applyVersion = applyVersion;
     }

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/OcpApiTreeService.java

@@ -3,8 +3,6 @@ package com.pms.ocp.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.pms.ocp.model.dto.ApiTreeGroupDto;
-import com.pms.ocp.model.dto.OcpApiGroupDtos;
 import com.pms.ocp.model.dto.PageGroupDto;
 import com.pms.ocp.model.entity.OcpApiGroup;
 

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

@@ -23,7 +23,7 @@ public interface TenantService  extends IService<OcpTenantGroup> {
      * @param
      * @return
      */
-    boolean getTenanInster(TenanBaseDto TenanBaseDto);
+    OcpTenantGroup getTenanInster(TenanBaseDto TenanBaseDto);
 
     /**
      * 修改应用
@@ -48,6 +48,6 @@ public interface TenantService  extends IService<OcpTenantGroup> {
      * @param tenantGroupCompanyCode
      * @return
      */
-    Page<OcpTenantGroup> getselects(String tenantGroupCode,String tenantGroupCompanyCode,int currentPage,int pageSize,String text);
+    Page<OcpTenantGroup> getselects(String tenantGroupCode,String tenantGroupCompanyCode,int currentPage,int pageSize,String text,String lev);
 
 }

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

@@ -125,7 +125,7 @@ public class ModelClassifyServiceImpl implements ModelClassifyService {
         if (!result) {
             return ResponseVO.error(CodeEnum.INSERT_FAIL);
         }
-        return ResponseVO.ok();
+        return ResponseVO.ok(list);
     }
 
     /**

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);
     }
 

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import com.github.pagehelper.PageInfo;
 import com.pms.ocp.common.utils.RandomStringUtils;
 import com.pms.ocp.mapper.OcpApiBaseMapper;
 import com.pms.ocp.mapper.OcpApiTreeMapper;
@@ -21,6 +22,7 @@ import org.springframework.stereotype.Service;
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Stream;
 
 
 @Service
@@ -43,10 +45,6 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper,OcpApiGr
     @Override
     public List<OcpApiGroup> getByGroup(Long apiGroupPromotionType,String apiGroupCode) {
 
-//        if (StringUtils.isBlank(apiGroupPromotionType) && StringUtils.isBlank(apiGroupCode)) {
-            // List<OcpApiGroup> ocpApiGroups = mapper.selectApiGroups();
-            // return ocpApiGroups;
-//       }else
             if (!("".equals(apiGroupPromotionType)) && StringUtils.isBlank(apiGroupCode)){
                 List<OcpApiGroup> ocpApiGroups = mapper.selectTwoApiGroups(apiGroupPromotionType);
                 return ocpApiGroups;
@@ -69,12 +67,23 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper,OcpApiGr
         Timestamp timestamp = new Timestamp(System.currentTimeMillis());
         String code = RandomStringUtils.getRandomString(6);
         boolean flag = true;
-               ocpApiGroup.setObjId("");
-               ocpApiGroup.setApiGroupMtime(timestamp);
-               ocpApiGroup.setApiGroupCtime(timestamp);
-               ocpApiGroup.setApiGroupPcode(ocpApiGroup.getApiGroupCode());
-               ocpApiGroup.setApiGroupCode(code);
-               mapper.insert(ocpApiGroup);
+        List<OcpApiGroup> ocpApiGroups = mapper.selectList(null);
+       Stream<OcpApiGroup> ocpApiGroupStream = ocpApiGroups.stream().filter(item -> item.getApiGroupCode().equals(ocpApiGroup.getApiGroupPcode()));
+        Stream<OcpApiGroup> apiGroupStream1 =  ocpApiGroupStream.filter(ocp -> ocp.getApiGroupName().equals(ocpApiGroup.getApiGroupName()));
+        if (!(apiGroupStream1.isParallel())){
+            OcpApiGroup ocpApi = new OcpApiGroup();
+            BeanUtils.copyProperties(ocpApiGroup,ocpApi);
+            ocpApi.setApiGroupPromotionType(ocpApiGroup.getApiGroupPromotionType());
+            ocpApi.setObjId("");
+            ocpApi.setApiGroupMtime(timestamp);
+            ocpApi.setApiGroupCtime(timestamp);
+            ocpApi.setApiGroupPcode(ocpApiGroup.getApiGroupCode());
+            ocpApi.setApiGroupCode(code);
+            mapper.insert(ocpApi);
+            ocpApiGroup.setApiGroupLevel(ocpApiGroup.getApiGroupLevel() + 1);
+        }else {
+            return false;
+        }
         return flag;
 
     }
@@ -112,16 +121,15 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper,OcpApiGr
         String objId = ocpApiGroup.getObjId();
         OcpApiGroup ocpApiGroup1 = mapper.selectById(objId);
         List<OcpApiGroup> ocpApiGroups = mapper.selectList(null);
-        if (StringUtils.isBlank(ocpApiGroup1.getApiGroupPcode())) {
         for (OcpApiGroup apiGroup : ocpApiGroups) {
             if ((ocpApiGroup1.getApiGroupCode()).equals(apiGroup.getApiGroupPcode())){
                     flag = false;
                     break;
                 }
         }
-
-        }
+        if (flag){
             mapper.deleteById(objId);
+        }
         return flag;
     }
 
@@ -135,18 +143,15 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper,OcpApiGr
     @Override
     public Page<OcpApiGroup> getOnePages(PageGroupDto pageGroupDto) {
 
-        Page pageInfo = new Page(pageGroupDto.getPageSize(), pageGroupDto.getPageNum());
+        Page pageInfo = new Page(pageGroupDto.getPageNum(), pageGroupDto.getPageSize());
         if (StringUtils.isBlank(pageGroupDto.getApiGroupCode())){
-            List<OcpApiGroup> ocpApiGroups = mapper.selectTwoApiGroups(pageGroupDto.getApiGroupPromotionType());
-            pageInfo.setRecords(ocpApiGroups);
             LambdaQueryWrapper<OcpApiGroup> lambdaQueryWrapper = new LambdaQueryWrapper();
-            lambdaQueryWrapper.eq(OcpApiGroup::getApiGroupPromotionType,pageGroupDto.getApiGroupPromotionType());
-            mapper.selectPage(pageInfo,lambdaQueryWrapper);
+             lambdaQueryWrapper.eq(OcpApiGroup::getApiGroupPromotionType, pageGroupDto.getApiGroupPromotionType());
+           pageInfo =  mapper.selectPage(pageInfo,lambdaQueryWrapper);
         }else if (!(StringUtils.isBlank(pageGroupDto.getApiGroupCode()))){
             List<OcpApiGroup> ocpApiGroups = mapper.selectLists(pageGroupDto.getApiGroupPromotionType(),pageGroupDto.getApiGroupCode(),pageGroupDto.getApiGroupLevel());
-            LambdaQueryWrapper<OcpApiGroup> lwq = new LambdaQueryWrapper<>();
             pageInfo.setRecords(ocpApiGroups);
-            mapper.selectPage(pageInfo, lwq);
+            pageInfo =  mapper.selectPage(pageInfo, null);
         }
         return pageInfo;
     }

src/main/resources/mapper/OcpApiTreeMapper.xml

@@ -7,7 +7,7 @@
     </select>
 <!--    一级树-->
     <select id="selectTwoApiGroups" resultType="com.pms.ocp.model.entity.OcpApiGroup">
-       SELECT * FROM ocp_api_group WHERE api_group_promotion_type = #{apiGroupPromotionType} and api_group_level = '1';
+       SELECT * FROM ocp_api_group WHERE api_group_promotion_type = #{apiGroupPromotionType} and api_group_level = 'api_group' and api_group_pcode = '';
     </select>
 <!--二级-->
     <select id="selectThreeApiGroupsList" resultType="com.pms.ocp.model.entity.OcpApiGroup">
@@ -25,4 +25,10 @@
     </select>
 
 
+<!--    根据code查询整条数据-->
+    <select id="selectCode" resultType="com.pms.ocp.model.entity.OcpApiGroup">
+     SELECT * FROM ocp_api_group where api_group_code = #{apiGroupCode};
+    </select>
+
+
 </mapper>
\ No newline at end of file

src/main/resources/mapper/OcpTenantGroup.xml

@@ -8,17 +8,19 @@
     </select>
 <!--   二级目录树-->
     <select id="twoTenantGroups" resultType="com.pms.ocp.model.entity.OcpTenantGroup">
-      SELECT * FROM ocp_tenant_group WHERE  tenant_group_company_code = #{tenantGroupCompanyCode} ;
+      SELECT * FROM ocp_tenant_group WHERE  tenant_group_company_code = #{tenantGroupCompanyCode};
     </select>
 
 <!--三级目录-->
     <select id="selectTenantGroups" resultType="com.pms.ocp.model.entity.OcpTenantGroup">
-      SELECT * FROM ocp_tenant_group WHERE tenant_group_pcode = #{tenantGroupCode} AND  tenant_group_company_code = #{tenantGroupCompanyCode} and tenant_group_level = '2';
+      SELECT * FROM ocp_tenant_group WHERE tenant_group_pcode = #{tenantGroupCode} AND  tenant_group_company_code = #{tenantGroupCompanyCode} and tenant_group_level = '2' ORDER BY tenant_group_ctime DESC;
     </select>
 
-
+    <select id="selectTenantGroupsList" resultType="com.pms.ocp.model.entity.OcpTenantGroup">
+      SELECT * FROM ocp_tenant_group WHERE tenant_group_pcode = #{tenantGroupCode} AND  tenant_group_company_code = #{tenantGroupCompanyCode}  ORDER BY tenant_group_ctime DESC;
+    </select>
     <select id="selectTenantGroup" resultType="com.pms.ocp.model.entity.OcpTenantGroup">
-      SELECT * FROM ocp_tenant_group WHERE  tenant_group_company_code = #{tenantGroupCompanyCode};
+      SELECT * FROM ocp_tenant_group WHERE  tenant_group_company_code = #{tenantGroupCompanyCode} ORDER BY tenant_group_ctime DESC;
     </select>
 
 
@@ -26,51 +28,13 @@
         SELECT * FROM ocp_tenant_group WHERE  tenant_group_company_code = #{tenantGroupCompanyCode} and tenant_group_level = '1' ;
     </select>
 
-<!--    模糊查询-->
-    <select id="queryLike" resultType="com.pms.ocp.model.entity.OcpTenantGroup">
-        select  * from ocp_tenant_group
-        <where>
-        <if test="keyword !=null and keyword != '' ">
-            and tenant_group_code like CONCAT('%', #{keyword}::text,'%')
-        </if>
-        <if test="keyword !=null and keyword != '' ">
-            and tenant_group_name  like CONCAT('%', #{keyword}::text,'%')
-        </if>
-        <if test="keyword !=null and keyword != '' ">
-            and tenant_group_company_code like CONCAT('%', #{keyword}::text,'%')
-        </if>
-        <if test="keyword !=null and keyword != '' ">
-            and tenant_group_pcode like CONCAT('%', #{keyword}::text,'%')
-        </if>
-        <if test="keyword !=null and keyword != '' ">
-            and tenant_type like CONCAT('%', #{keyword}::text,'%')
-        </if>
-        <if test="keyword !=null and keyword != '' ">
-            and tenant_group_version like CONCAT('%', #{keyword}::text,'%')
-        </if>
-        <if test="keyword !=null and keyword != '' ">
-            and tenant_group_order_no like CONCAT('%', #{keyword}::text,'%')
-        </if>
-        <if test="keyword !=null and keyword != '' ">
-            and tenant_group_user_id like CONCAT('%', #{keyword}::text,'%')
-        </if>
-        <if test="keyword !=null and keyword != '' ">
-            and tenant_group_user_name like CONCAT('%', #{keyword}::text,'%')
-        </if>
-        <if test="keyword !=null and keyword != '' ">
-            and tenant_group_ctime like CONCAT('%', #{keyword}::text,'%')
-        </if>
-        <if test="keyword !=null and keyword != '' ">
-            and  tenant_group_mtime like CONCAT('%', #{keyword}::text,'%')
-        </if>
-        <if test="keyword !=null and keyword != '' ">
-            and is_delete like CONCAT('%', #{keyword}::text,'%')
-        </if>
-        <if test="keyword !=null and keyword != '' ">
-            and tenant_group_level like CONCAT('%', #{keyword}::text,'%')
-        </if>
-        </where>
+<!--    根据创建公司和分类名称获取集合-->
+    <select id="selectGroupsList" resultType="com.pms.ocp.model.entity.OcpTenantGroup">
+        SELECT * FROM ocp_tenant_group WHERE  tenant_group_company_code = #{tenantGroupCompanyCode} and tenant_group_name = #{tenantGroupName};
     </select>
 
 
+
+
+
 </mapper>