Merge remote-tracking branch 'origin/master'

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

@@ -43,11 +43,8 @@ public class OcpApiTreeController {
     @PostMapping("/instertree")
     @ApiOperation("服务树分类--新增")
     public ResponseVO inseter(@RequestBody OcpApiGroup ocpApiGroup){
-        boolean flag = service.insertTree(ocpApiGroup);
-        if (flag){
-            return ResponseVO.ok();
-        }
-        return ResponseVO.error("您的服务编码重复,请重新输入");
+        OcpApiGroup ocpApiGroup1 = service.insertTree(ocpApiGroup);
+            return ResponseVO.ok(ocpApiGroup1);
 
     }
 
@@ -58,7 +55,6 @@ public class OcpApiTreeController {
         return ResponseVO.ok(onePages);
     }
 
-
     @PostMapping("/updatatree")
     @ApiOperation("服务树分类--修改")
     public ResponseVO updataTree(@RequestBody OcpApiGroup ocpApiGroup){

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

@@ -84,7 +84,8 @@ public class TenantBasicManagementController {
 
     @ApiOperation("应用树层级")
     @GetMapping("/tenantBaseTreeOther")
-    public ResponseVO<List<GroupDto>> tenantBaseTreeOther(@RequestParam(required = false) String tenantGroupCode, @RequestParam(required = false) String tenantGroupCompanyCode) {
+    public ResponseVO<List<GroupDto>> tenantBaseTreeOther(@RequestParam(required = false) String tenantGroupCode, @RequestParam(required = false) String tenantGroupCompanyCode
+    ) {
         List<GroupDto> ocpApiGroups = tenantBasicManagementService.tenantBaseTreeOther(tenantGroupCode, tenantGroupCompanyCode);
         return ResponseVO.ok(ocpApiGroups);
     }

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

@@ -32,7 +32,7 @@ public interface OcpApiTreeMapper extends BaseMapper<OcpApiGroup> {
     List<OcpApiGroup> selectThreeApiGroupsList(Long apiGroupPromotionType, String apiGroupCode);
 
 
-  List<OcpApiGroup> selectLists(Long apiGroupPromotionType, String apiGroupCode,String apiGroupLevel);
+  List<OcpApiGroup> selectLists(Long apiGroupPromotionType, String apiGroupCode);
 
 //code重复问题
   List<OcpApiGroup> selectGroupCode();

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

@@ -53,6 +53,18 @@ public class PageGroupDto extends PageParam {
     @ApiModelProperty("分层树层级 1中台层 2中心层 3 服务组层 4服务层 ")
     private String apiGroupLevel;
 
+
+    @ApiModelProperty("模糊查询字段")
+    private String keyword;
+
+    public String getKeyword() {
+        return keyword;
+    }
+
+    public void setKeyword(String keyword) {
+        this.keyword = keyword;
+    }
+
     public String getObjId() {
         return objId;
     }

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

@@ -131,7 +131,104 @@ public class TenanBaseDto extends OcpTenantGroup {
         return classIfy;
     }
 
-    public void setClassIfy(String classIfy) {
+    public String getTenantGroupName() {
+        return tenantGroupName;
+    }
+
+    public void setTenantGroupName(String tenantGroupName) {
+        this.tenantGroupName = tenantGroupName;
+    }
+
+    public String getTenantGroupCompanyCode() {
+        return tenantGroupCompanyCode;
+    }
+
+    public void setTenantGroupCompanyCode(String tenantGroupCompanyCode) {
+        this.tenantGroupCompanyCode = tenantGroupCompanyCode;
+    }
+
+    public String getTenantGroupPcode() {
+        return tenantGroupPcode;
+    }
+
+    public void setTenantGroupPcode(String tenantGroupPcode) {
+        this.tenantGroupPcode = tenantGroupPcode;
+    }
+
+    public String getTenantType() {
+        return tenantType;
+    }
+
+    public void setTenantType(String tenantType) {
+        this.tenantType = tenantType;
+    }
+
+    public String getTenantGroupVersion() {
+        return tenantGroupVersion;
+    }
+
+    public void setTenantGroupVersion(String tenantGroupVersion) {
+        this.tenantGroupVersion = tenantGroupVersion;
+    }
+
+    public Integer getTenantGroupOrderNo() {
+        return tenantGroupOrderNo;
+    }
+
+    public void setTenantGroupOrderNo(Integer tenantGroupOrderNo) {
+        this.tenantGroupOrderNo = tenantGroupOrderNo;
+    }
+
+    public String getTenantGroupUserId() {
+        return tenantGroupUserId;
+    }
+
+    public void setTenantGroupUserId(String tenantGroupUserId) {
+        this.tenantGroupUserId = tenantGroupUserId;
+    }
+
+    public String getTenantGroupUserName() {
+        return tenantGroupUserName;
+    }
+
+    public void setTenantGroupUserName(String tenantGroupUserName) {
+        this.tenantGroupUserName = tenantGroupUserName;
+    }
+
+    public Timestamp getTenantGroupCtime() {
+        return tenantGroupCtime;
+    }
+
+    public void setTenantGroupCtime(Timestamp tenantGroupCtime) {
+        this.tenantGroupCtime = tenantGroupCtime;
+    }
+
+    public Timestamp getTenantGroupMtime() {
+        return tenantGroupMtime;
+    }
+
+    public void setTenantGroupMtime(Timestamp tenantGroupMtime) {
+        this.tenantGroupMtime = tenantGroupMtime;
+    }
+
+    public Short getIsDelete() {
+        return isDelete;
+    }
+
+    public void setIsDelete(Short isDelete) {
+        this.isDelete = isDelete;
+    }
+
+    public String getTenantGroupLevel() {
+        return tenantGroupLevel;
+    }
+
+    public void setTenantGroupLevel(String tenantGroupLevel) {
+        this.tenantGroupLevel = tenantGroupLevel;
+    }
+
+    public OcpTenantGroup setClassIfy(String classIfy) {
         this.classIfy = classIfy;
+        return null;
     }
 }

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

@@ -59,60 +59,6 @@ public class OcpApiAudit {
   @ApiModelProperty("当前版本")
   private long applyVersion;
 
-  @ApiModelProperty("上一版本")
-  @Excel(name = "上一版本",orderNum = "7")
-  private long preApiVersion;
-
-  @ApiModelProperty("服务接口中文名称")
-  @Excel(name = "服务名称",orderNum = "2")
-  private String apiName;
-
-  @ApiModelProperty("服务分类代码")
-  private String apiGroupCode;
-
-  @ApiModelProperty("推广类型0:统建；1:自建")
-  private long apiPromotion;
-
-  @ApiModelProperty("服务请求体")
-  @Excel(name = "请求参数",orderNum = "8")
-  private String apiReq;
-
-  @ApiModelProperty("服务返回体")
-  @Excel(name = "返回参数",orderNum = "9")
-
-  private String apiResp;
-
-  @ApiModelProperty("服务地址")
-  private String apiUrl;
-
-  @ApiModelProperty("服务创建时间")
-  private Timestamp apiCtime;
-
-  @ApiModelProperty("服务修改时间")
-  private Timestamp apiMtime;
-
-  @ApiModelProperty("创建者用户ID")
-  private String apiUserId;
-
-  @ApiModelProperty("建设单位")
-  private String apiUnit;
-
-  @ApiModelProperty("服务所属公司")
-  private String ownerCompanyCode;
-
-  @ApiModelProperty("服务所属公司")
-  private String ownerCompanyName;
-
-  @ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区")
-  private long apiZone;
-
-  @ApiModelProperty("'所属层级 1:应用层;2:平台层;3:网络层;4:感知层;")
-  private long apiLayer;
-
-  @ApiModelProperty("服务版本（最新版本）")
-  @Excel(name = "当前版本",orderNum = "6")
-  private long apiVersion;
-
   public String getObjId() {
     return objId;
   }
@@ -216,132 +162,4 @@ public class OcpApiAudit {
   public void setApplyVersion(long applyVersion) {
     this.applyVersion = applyVersion;
   }
-
-  public long getPreApiVersion() {
-    return preApiVersion;
-  }
-
-  public void setPreApiVersion(long preApiVersion) {
-    this.preApiVersion = preApiVersion;
-  }
-
-  public String getApiName() {
-    return apiName;
-  }
-
-  public void setApiName(String apiName) {
-    this.apiName = apiName;
-  }
-
-  public String getApiGroupCode() {
-    return apiGroupCode;
-  }
-
-  public void setApiGroupCode(String apiGroupCode) {
-    this.apiGroupCode = apiGroupCode;
-  }
-
-  public long getApiPromotion() {
-    return apiPromotion;
-  }
-
-  public void setApiPromotion(long apiPromotion) {
-    this.apiPromotion = apiPromotion;
-  }
-
-  public String getApiReq() {
-    return apiReq;
-  }
-
-  public void setApiReq(String apiReq) {
-    this.apiReq = apiReq;
-  }
-
-  public String getApiResp() {
-    return apiResp;
-  }
-
-  public void setApiResp(String apiResp) {
-    this.apiResp = apiResp;
-  }
-
-  public String getApiUrl() {
-    return apiUrl;
-  }
-
-  public void setApiUrl(String apiUrl) {
-    this.apiUrl = apiUrl;
-  }
-
-  public Timestamp getApiCtime() {
-    return apiCtime;
-  }
-
-  public void setApiCtime(Timestamp apiCtime) {
-    this.apiCtime = apiCtime;
-  }
-
-  public Timestamp getApiMtime() {
-    return apiMtime;
-  }
-
-  public void setApiMtime(Timestamp apiMtime) {
-    this.apiMtime = apiMtime;
-  }
-
-  public String getApiUserId() {
-    return apiUserId;
-  }
-
-  public void setApiUserId(String apiUserId) {
-    this.apiUserId = apiUserId;
-  }
-
-  public String getApiUnit() {
-    return apiUnit;
-  }
-
-  public void setApiUnit(String apiUnit) {
-    this.apiUnit = apiUnit;
-  }
-
-  public String getOwnerCompanyCode() {
-    return ownerCompanyCode;
-  }
-
-  public void setOwnerCompanyCode(String ownerCompanyCode) {
-    this.ownerCompanyCode = ownerCompanyCode;
-  }
-
-  public String getOwnerCompanyName() {
-    return ownerCompanyName;
-  }
-
-  public void setOwnerCompanyName(String ownerCompanyName) {
-    this.ownerCompanyName = ownerCompanyName;
-  }
-
-  public long getApiZone() {
-    return apiZone;
-  }
-
-  public void setApiZone(long apiZone) {
-    this.apiZone = apiZone;
-  }
-
-  public long getApiLayer() {
-    return apiLayer;
-  }
-
-  public void setApiLayer(long apiLayer) {
-    this.apiLayer = apiLayer;
-  }
-
-  public long getApiVersion() {
-    return apiVersion;
-  }
-
-  public void setApiVersion(long apiVersion) {
-    this.apiVersion = apiVersion;
-  }
 }

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

@@ -73,109 +73,78 @@ public class OcpApiBase {
   @ApiModelProperty("服务版本（最新版本）")
   private String apiVersion;
 
-    public long getApiZone() {
-        return apiZone;
-    }
+  @ApiModelProperty("服务所属中心编码所属中心")
+  private String apiCenterCode;
 
-    public void setApiZone(long apiZone) {
-        this.apiZone = apiZone;
-    }
+  @ApiModelProperty("服务简述")
+  private String apiDescription;
 
-    public long getApiLayer() {
-        return apiLayer;
-    }
+  @ApiModelProperty("创建者姓名")
+  private String apiUserName;
 
-    public void setApiLayer(long apiLayer) {
-        this.apiLayer = apiLayer;
+    public String getObjId() {
+        return objId;
     }
 
-//    public long getApiVersion() {
-//        return apiVersion;
-//    }
-//
-//    public void setApiVersion(long apiVersion) {
-//        this.apiVersion = apiVersion;
-//    }
-
-    public String getApiVersion() {
-        return apiVersion;
+    public void setObjId(String objId) {
+        this.objId = objId;
     }
 
-    public void setApiVersion(String apiVersion) {
-        this.apiVersion = apiVersion;
+    public String getApiCode() {
+        return apiCode;
     }
 
-    public String getObjId() {
-    return objId;
-  }
-
-  public void setObjId(String objId) {
-    this.objId = objId;
-  }
-
-
-  public String getApiCode() {
-    return apiCode;
-  }
-
-  public void setApiCode(String apiCode) {
-    this.apiCode = apiCode;
-  }
-
-
-  public String getApiName() {
-    return apiName;
-  }
-
-  public void setApiName(String apiName) {
-    this.apiName = apiName;
-  }
-
-
-  public String getApiGroupCode() {
-    return apiGroupCode;
-  }
-
-  public void setApiGroupCode(String apiGroupCode) {
-    this.apiGroupCode = apiGroupCode;
-  }
-
+    public void setApiCode(String apiCode) {
+        this.apiCode = apiCode;
+    }
 
-  public long getApiPromotion() {
-    return apiPromotion;
-  }
+    public String getApiName() {
+        return apiName;
+    }
 
-  public void setApiPromotion(long apiPromotion) {
-    this.apiPromotion = apiPromotion;
-  }
+    public void setApiName(String apiName) {
+        this.apiName = apiName;
+    }
 
+    public String getApiGroupCode() {
+        return apiGroupCode;
+    }
 
-  public String getApiReq() {
-    return apiReq;
-  }
+    public void setApiGroupCode(String apiGroupCode) {
+        this.apiGroupCode = apiGroupCode;
+    }
 
-  public void setApiReq(String apiReq) {
-    this.apiReq = apiReq;
-  }
+    public long getApiPromotion() {
+        return apiPromotion;
+    }
 
+    public void setApiPromotion(long apiPromotion) {
+        this.apiPromotion = apiPromotion;
+    }
 
-  public String getApiResp() {
-    return apiResp;
-  }
+    public String getApiReq() {
+        return apiReq;
+    }
 
-  public void setApiResp(String apiResp) {
-    this.apiResp = apiResp;
-  }
+    public void setApiReq(String apiReq) {
+        this.apiReq = apiReq;
+    }
 
+    public String getApiResp() {
+        return apiResp;
+    }
 
-  public String getApiUrl() {
-    return apiUrl;
-  }
+    public void setApiResp(String apiResp) {
+        this.apiResp = apiResp;
+    }
 
-  public void setApiUrl(String apiUrl) {
-    this.apiUrl = apiUrl;
-  }
+    public String getApiUrl() {
+        return apiUrl;
+    }
 
+    public void setApiUrl(String apiUrl) {
+        this.apiUrl = apiUrl;
+    }
 
     public Timestamp getApiCtime() {
         return apiCtime;
@@ -194,47 +163,82 @@ public class OcpApiBase {
     }
 
     public String getApiUserId() {
-    return apiUserId;
-  }
+        return apiUserId;
+    }
+
+    public void setApiUserId(String apiUserId) {
+        this.apiUserId = apiUserId;
+    }
+
+    public String getApiUnit() {
+        return apiUnit;
+    }
+
+    public void setApiUnit(String apiUnit) {
+        this.apiUnit = apiUnit;
+    }
+
+    public String getOwnerCompanyCode() {
+        return ownerCompanyCode;
+    }
+
+    public void setOwnerCompanyCode(String ownerCompanyCode) {
+        this.ownerCompanyCode = ownerCompanyCode;
+    }
+
+    public long getIsDelete() {
+        return isDelete;
+    }
 
-  public void setApiUserId(String apiUserId) {
-    this.apiUserId = apiUserId;
-  }
+    public void setIsDelete(long isDelete) {
+        this.isDelete = isDelete;
+    }
 
+    public long getApiZone() {
+        return apiZone;
+    }
 
-  public String getApiUnit() {
-    return apiUnit;
-  }
+    public void setApiZone(long apiZone) {
+        this.apiZone = apiZone;
+    }
 
-  public void setApiUnit(String apiUnit) {
-    this.apiUnit = apiUnit;
-  }
+    public long getApiLayer() {
+        return apiLayer;
+    }
 
+    public void setApiLayer(long apiLayer) {
+        this.apiLayer = apiLayer;
+    }
 
-  public String getOwnerCompanyCode() {
-    return ownerCompanyCode;
-  }
+    public String getApiVersion() {
+        return apiVersion;
+    }
 
-  public void setOwnerCompanyCode(String ownerCompanyCode) {
-    this.ownerCompanyCode = ownerCompanyCode;
-  }
+    public void setApiVersion(String apiVersion) {
+        this.apiVersion = apiVersion;
+    }
 
+    public String getApiCenterCode() {
+        return apiCenterCode;
+    }
 
-//  public String getOwnerCompanyName() {
-//    return ownerCompanyName;
-//  }
-//
-//  public void setOwnerCompanyName(String ownerCompanyName) {
-//    this.ownerCompanyName = ownerCompanyName;
-//  }
+    public void setApiCenterCode(String apiCenterCode) {
+        this.apiCenterCode = apiCenterCode;
+    }
 
+    public String getApiDescription() {
+        return apiDescription;
+    }
 
-  public long getIsDelete() {
-    return isDelete;
-  }
+    public void setApiDescription(String apiDescription) {
+        this.apiDescription = apiDescription;
+    }
 
-  public void setIsDelete(long isDelete) {
-    this.isDelete = isDelete;
-  }
+    public String getApiUserName() {
+        return apiUserName;
+    }
 
+    public void setApiUserName(String apiUserName) {
+        this.apiUserName = apiUserName;
+    }
 }

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

@@ -37,107 +37,59 @@ public class OcpApiModelRel {
   @ApiModelProperty("是否已删除 0-否1-是")
   private long isDelete;
 
-  @ApiModelProperty("服务接口中文名称")
-  private String apiName;
+  public String getObjId() {
+    return objId;
+  }
 
-  @ApiModelProperty("服务分类代码")
-  private String apiGroupCode;
+  public void setObjId(String objId) {
+    this.objId = objId;
+  }
 
-  @ApiModelProperty("推广类型0:统建；1:自建")
-  private long apiPromotion;
+  public String getModelCode() {
+    return modelCode;
+  }
 
-  @ApiModelProperty("服务请求体")
-  private String apiReq;
+  public void setModelCode(String modelCode) {
+    this.modelCode = modelCode;
+  }
 
-  @ApiModelProperty("服务返回体")
-  private String apiResp;
+  public String getModelDepCompanyCode() {
+    return modelDepCompanyCode;
+  }
 
-  @ApiModelProperty("服务地址")
-  private String apiUrl;
+  public void setModelDepCompanyCode(String modelDepCompanyCode) {
+    this.modelDepCompanyCode = modelDepCompanyCode;
+  }
 
-  @ApiModelProperty("服务创建时间")
-  private Timestamp apiCtime;
+  public String getApiCode() {
+    return apiCode;
+  }
 
-  @ApiModelProperty("服务修改时间")
-  private Timestamp apiMtime;
+  public void setApiCode(String apiCode) {
+    this.apiCode = apiCode;
+  }
 
-  @ApiModelProperty("创建者用户ID")
-  private String apiUserId;
+  public String getApiDepCompanyCode() {
+    return apiDepCompanyCode;
+  }
 
-  @ApiModelProperty("建设单位")
-  private String apiUnit;
+  public void setApiDepCompanyCode(String apiDepCompanyCode) {
+    this.apiDepCompanyCode = apiDepCompanyCode;
+  }
 
-  @ApiModelProperty("服务所属公司")
-  private String ownerCompanyCode;
+  public Timestamp getRelationCtime() {
+    return relationCtime;
+  }
 
-  @ApiModelProperty("服务所属公司")
-  private String ownerCompanyName;
-
-  @ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区")
-  private long apiZone;
-
-  @ApiModelProperty("'所属层级 1:应用层;2:平台层;3:网络层;4:感知层;")
-  private long apiLayer;
-
-  @ApiModelProperty("服务版本（最新版本）")
-  private long apiVersion;
-
-  @ApiModelProperty("应用编码")
-  private String tenantCode;
-
-  @ApiModelProperty("应用名称")
-  private String tenantName;
-
-  @ApiModelProperty("应用分类代码")
-  private String tenantGroupCode;
-
-  @ApiModelProperty("应用IP")
-  private String tenantIp;
-
-  @ApiModelProperty("应用url")
-  private String tenantUrl;
-
-  @ApiModelProperty("所属专业")
-  private String professionalKind;
-
-  @ApiModelProperty("创建者用户ID")
-  private String tenantUserId;
-
-  @ApiModelProperty("排序")
-  private String tenantOrderNo;
-
-  @ApiModelProperty("创建时间")
-  private String tenantCtime;
-
-  @ApiModelProperty("最后更新时间")
-  private String tenantMtime;
-
-  @ApiModelProperty("部署名称")
-  private String deploymentName;
-
-  @ApiModelProperty("描述")
-  private String tenantDescription;
-
-  @ApiModelProperty("应用状态0设计 1运行态")
-  private String tenantState;
-
-  @ApiModelProperty("模型名称")
-  private String modelName;
-
-  @ApiModelProperty("建设单位")
-  private String tenantUnit;
-
-  @ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区")
-  private String tenantZone;
-
-  @ApiModelProperty("所属层级 1:应用层;2:平台层;3:网络层;4:感知层")
-  private String tenantLayer;
-
-  @ApiModelProperty("应用版本（当前版本）")
-  private String tenantVersion;
-
-  @ApiModelProperty("应用版本（当前版本）")
-  private String tenanttVersion;
+  public void setRelationCtime(Timestamp relationCtime) {
+    this.relationCtime = relationCtime;
+  }
 
+  public long getIsDelete() {
+    return isDelete;
+  }
 
+  public void setIsDelete(long isDelete) {
+    this.isDelete = isDelete;
+  }
 }

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

@@ -40,52 +40,6 @@ public class OcpApiSubs {
   @ApiModelProperty("是否删除0-否，1-是")
   private long isDelete;
 
-//  @ApiModelProperty("服务接口中文名称")
-//  private String apiName;
-//
-//  @ApiModelProperty("服务分类代码")
-//  private String apiGroupCode;
-
-//  @ApiModelProperty("推广类型0:统建；1:自建")
-//  private long apiPromotion;
-
-//  @ApiModelProperty("服务请求体")
-//  private String apiReq;
-//
-//  @ApiModelProperty("服务返回体")
-//  private String apiResp;
-//
-//  @ApiModelProperty("服务地址")
-//  private String apiUrl;
-//
-//  @ApiModelProperty("服务创建时间")
-//  private Timestamp apiCtime;
-//
-//  @ApiModelProperty("服务修改时间")
-//  private Timestamp apiMtime;
-//
-//  @ApiModelProperty("创建者用户ID")
-//  private String apiUserId;
-//
-//  @ApiModelProperty("建设单位")
-//  private String apiUnit;
-//
-//  @ApiModelProperty("服务所属公司")
-//  private String ownerCompanyCode;
-//
-//  @ApiModelProperty("服务所属公司")
-//  private String ownerCompanyName;
-//
-//  @ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区")
-//  private long apiZone;
-//
-//  @ApiModelProperty("'所属层级 1:应用层;2:平台层;3:网络层;4:感知层;")
-//  private long apiLayer;
-//
-//  @ApiModelProperty("服务版本（最新版本）")
-//  private long apiVersion;
-
-
   public String getObjId() {
     return objId;
   }
@@ -142,123 +96,11 @@ public class OcpApiSubs {
     this.subsCompanyCode = subsCompanyCode;
   }
 
-//  public String getApiName() {
-//    return apiName;
-//  }
-//
-//  public void setApiName(String apiName) {
-//    this.apiName = apiName;
-//  }
-//
-//  public String getApiGroupCode() {
-//    return apiGroupCode;
-//  }
-//
-//  public void setApiGroupCode(String apiGroupCode) {
-//    this.apiGroupCode = apiGroupCode;
-//  }
-
-//  public long getApiPromotion() {
-//    return apiPromotion;
-//  }
-//
-//  public void setApiPromotion(long apiPromotion) {
-//    this.apiPromotion = apiPromotion;
-//  }
-
-//  public String getApiReq() {
-//    return apiReq;
-//  }
-//
-//  public void setApiReq(String apiReq) {
-//    this.apiReq = apiReq;
-//  }
-//
-//  public String getApiResp() {
-//    return apiResp;
-//  }
-//
-//  public void setApiResp(String apiResp) {
-//    this.apiResp = apiResp;
-//  }
-//
-//  public String getApiUrl() {
-//    return apiUrl;
-//  }
-//
-//  public void setApiUrl(String apiUrl) {
-//    this.apiUrl = apiUrl;
-//  }
-//
-//  public Timestamp getApiCtime() {
-//    return apiCtime;
-//  }
-//
-//  public void setApiCtime(Timestamp apiCtime) {
-//    this.apiCtime = apiCtime;
-//  }
-//
-//  public Timestamp getApiMtime() {
-//    return apiMtime;
-//  }
-//
-//  public void setApiMtime(Timestamp apiMtime) {
-//    this.apiMtime = apiMtime;
-//  }
-//
-//  public String getApiUserId() {
-//    return apiUserId;
-//  }
-//
-//  public void setApiUserId(String apiUserId) {
-//    this.apiUserId = apiUserId;
-//  }
-//
-//  public String getApiUnit() {
-//    return apiUnit;
-//  }
+  public long getIsDelete() {
+    return isDelete;
+  }
 
-//  public void setApiUnit(String apiUnit) {
-//    this.apiUnit = apiUnit;
-//  }
-//
-//  public String getOwnerCompanyCode() {
-//    return ownerCompanyCode;
-//  }
-//
-//  public void setOwnerCompanyCode(String ownerCompanyCode) {
-//    this.ownerCompanyCode = ownerCompanyCode;
-//  }
-//
-//  public String getOwnerCompanyName() {
-//    return ownerCompanyName;
-//  }
-//
-//  public void setOwnerCompanyName(String ownerCompanyName) {
-//    this.ownerCompanyName = ownerCompanyName;
-//  }
-//
-//  public long getApiZone() {
-//    return apiZone;
-//  }
-//
-//  public void setApiZone(long apiZone) {
-//    this.apiZone = apiZone;
-//  }
-//
-//  public long getApiLayer() {
-//    return apiLayer;
-//  }
-//
-//  public void setApiLayer(long apiLayer) {
-//    this.apiLayer = apiLayer;
-//  }
-//
-//  public long getApiVersion() {
-//    return apiVersion;
-//  }
-//
-//  public void setApiVersion(long apiVersion) {
-//    this.apiVersion = apiVersion;
-//  }
+  public void setIsDelete(long isDelete) {
+    this.isDelete = isDelete;
+  }
 }

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

@@ -43,101 +43,75 @@ public class OcpApiTenantRel {
   @ApiModelProperty("关系创建用户")
   private String apiTenantRelUserName;
 
-  @ApiModelProperty("是否已删除0未删除，1已删除")
-  private long isDelete;
-
-//  @ApiModelProperty("服务接口中文名称")
-//  private String apiName;
-//
-//  @ApiModelProperty("服务分类代码")
-//  private String apiGroupCode;
-//
-//  @ApiModelProperty("推广类型0:统建；1:自建")
-//  private long apiPromotion;
-//
-//  @ApiModelProperty("服务请求体")
-//  private String apiReq;
-//
-//  @ApiModelProperty("服务返回体")
-//  private String apiResp;
-//
-//  @ApiModelProperty("服务地址")
-//  private String apiUrl;
-//
-//  @ApiModelProperty("服务创建时间")
-//  private Timestamp apiCtime;
-//
-//  @ApiModelProperty("服务修改时间")
-//  private Timestamp apiMtime;
-//
-//  @ApiModelProperty("创建者用户ID")
-//  private String apiUserId;
-//
-//  @ApiModelProperty("建设单位")
-//  private String apiUnit;
-//
-//  @ApiModelProperty("服务所属公司")
-//  private String ownerCompanyCode;
-//
-//  @ApiModelProperty("服务所属公司")
-//  private String ownerCompanyName;
-//
-//  @ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区")
-//  private long apiZone;
-//
-//  @ApiModelProperty("'所属层级 1:应用层;2:平台层;3:网络层;4:感知层;")
-//  private long apiLayer;
-//
-//  @ApiModelProperty("服务版本（最新版本）")
-//  private long apiVersion;
-//
-//  @ApiModelProperty("应用名称")
-//  private String tenantName;
-//
-//  @ApiModelProperty("应用分类代码")
-//  private String tenantGroupCode;
-//
-//  @ApiModelProperty("应用IP")
-//  private String tenantIp;
-//
-//  @ApiModelProperty("应用url")
-//  private String tenantUrl;
-//
-//  @ApiModelProperty("所属专业")
-//  private String professionalKind;
-//
-//  @ApiModelProperty("创建者用户ID")
-//  private String tenantUserId;
-//
-//  @ApiModelProperty("排序")
-//  private String tenantOrderNo;
-//
-//  @ApiModelProperty("创建时间")
-//  private String tenantCtime;
-//
-//  @ApiModelProperty("最后更新时间")
-//  private String tenantMtime;
-//
-//  @ApiModelProperty("部署名称")
-//  private String deploymentName;
-//
-//  @ApiModelProperty("描述")
-//  private String tenantDescription;
-//
-//  @ApiModelProperty("应用状态0设计 1运行态")
-//  private String tenantState;
-//
-//  @ApiModelProperty("建设单位")
-//  private String tenantUnit;
-//
-//  @ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区")
-//  private String tenantZone;
-//
-//  @ApiModelProperty("所属层级 1:应用层;2:平台层;3:网络层;4:感知层")
-//  private String tenantLayer;
-//
-//  @ApiModelProperty("应用版本（当前版本）")
-//  private String tenantVersion;
+  public String getObjId() {
+    return objId;
+  }
 
+  public void setObjId(String objId) {
+    this.objId = objId;
+  }
 
+  public String getTenantCode() {
+    return tenantCode;
+  }
+
+  public void setTenantCode(String tenantCode) {
+    this.tenantCode = tenantCode;
+  }
+
+  public String getApiCode() {
+    return apiCode;
+  }
+
+  public void setApiCode(String apiCode) {
+    this.apiCode = apiCode;
+  }
+
+  public String getApiDepCompanyCode() {
+    return apiDepCompanyCode;
+  }
+
+  public void setApiDepCompanyCode(String apiDepCompanyCode) {
+    this.apiDepCompanyCode = apiDepCompanyCode;
+  }
+
+  public String getTenantDepCompanyCode() {
+    return tenantDepCompanyCode;
+  }
+
+  public void setTenantDepCompanyCode(String tenantDepCompanyCode) {
+    this.tenantDepCompanyCode = tenantDepCompanyCode;
+  }
+
+  public Timestamp getApiTenantRelCtime() {
+    return apiTenantRelCtime;
+  }
+
+  public void setApiTenantRelCtime(Timestamp apiTenantRelCtime) {
+    this.apiTenantRelCtime = apiTenantRelCtime;
+  }
+
+  public Timestamp getApiTenantRelMtime() {
+    return apiTenantRelMtime;
+  }
+
+  public void setApiTenantRelMtime(Timestamp apiTenantRelMtime) {
+    this.apiTenantRelMtime = apiTenantRelMtime;
+  }
+
+  public String getApiTenantRelUserId() {
+    return apiTenantRelUserId;
+  }
+
+  public void setApiTenantRelUserId(String apiTenantRelUserId) {
+    this.apiTenantRelUserId = apiTenantRelUserId;
+  }
+
+  public String getApiTenantRelUserName() {
+    return apiTenantRelUserName;
+  }
+
+  public void setApiTenantRelUserName(String apiTenantRelUserName) {
+    this.apiTenantRelUserName = apiTenantRelUserName;
+  }
 }

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

 package com.pms.ocp.model.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
@@ -106,7 +107,11 @@ public class OcpTenantGroup implements Serializable {
     @ApiModelProperty("应用树层级 1:应用分组层  2:应用层")
     private String tenantGroupLevel;
 
+    //上级分类名称
 
+    @ApiModelProperty("上级分类名称")
+    @TableField(exist = false)
+    private String classIfy;
 
     public static long getSerialVersionUID() {
         return serialVersionUID;

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

@@ -71,220 +71,69 @@ public class OcpTenantSubs implements Serializable {
     private Short isDelete;
 
 
-    /**
-     * 应用名称
-     */
-    @ApiModelProperty("应用名称")
-    private String tenantName;
-
-
-    /**
-     * 应用分类代码
-     */
-    @ApiModelProperty("应用分类代码")
-    private String tenantGroupCode;
-
-    /**
-     * 应用ip
-     */
-    @ApiModelProperty("应用ip")
-    private String tenantIp;
-
-    /**
-     * 应用url
-     */
-    @ApiModelProperty("应用url")
-    private String tenantUrl;
-
-    /**
-     * 所属专业
-     */
-    @ApiModelProperty("所属专业")
-    private String professionalKind;
-
-    /**
-     * 创建者用户ID
-     */
-    @ApiModelProperty("创建者用户ID")
-    private String tenantUserId;
-
-    /**
-     * 排序
-     */
-    @ApiModelProperty("排序")
-    private Integer tenantOrderNo;
-
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty("创建时间")
-    private Timestamp tenantCtime;
-
-    /**
-     * 最后更新时间
-     */
-    @ApiModelProperty("最后更新时间")
-    private Timestamp tenantMtime;
-
-    /**
-     * 部署名称
-     */
-    @ApiModelProperty("部署名称")
-    private String deploymentName;
-
-    /**
-     * 描述
-     */
-    @ApiModelProperty("描述")
-    private String tenantDescription;
-
-    /**
-     * 应用状态0:设计态；1:运行态
-     */
-    @ApiModelProperty("应用状态0:设计态；1:运行态")
-    private Short tenantState;
-//    /**
-//     * 推广类型0:统建；1:自建
-//     */
-//    @ApiModelProperty("推广类型0:统建；1:自建")
-//    private long tenantPromotion;
-    /**
-     * 建设单位
-     */
-    @ApiModelProperty("建设单位")
-    private String tenantUnit;
-
-    /**
-     * 所属公司编码
-     */
-    @ApiModelProperty("所属公司编码")
-    private String ownerCompanyCode;
-
-    /**
-     * 所属公司名称
-     */
-    @ApiModelProperty("所属公司名称")
-    private String ownerCompanyName;
-
-    /**
-     * 所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区
-     */
-    @ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区")
-    private Short tenantZone;
-
-    /**
-     * 所属层级 1:应用层;2:平台层;3:网络层;4:感知层;
-     */
-    @ApiModelProperty("所属层级 1:应用层;2:平台层;3:网络层;4:感知层;")
-    private Short tenantLayer;
-
-    /**
-     * 应用版本（当前版本）
-     */
-    @ApiModelProperty("应用版本（当前版本）")
-    private String tenantVersion;
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 关系ID
-     */
     public String getObjId() {
         return objId;
     }
 
-    /**
-     * 关系ID
-     */
     public void setObjId(String objId) {
         this.objId = objId;
     }
 
-    /**
-     * 服务编码
-     */
     public String getTenantCode() {
         return tenantCode;
     }
 
-    /**
-     * 服务编码
-     */
     public void setTenantCode(String tenantCode) {
         this.tenantCode = tenantCode;
     }
 
-    /**
-     * 订阅公司编码
-     */
     public String getSubsCompanyCode() {
         return subsCompanyCode;
     }
 
-    /**
-     * 订阅公司编码
-     */
     public void setSubsCompanyCode(String subsCompanyCode) {
         this.subsCompanyCode = subsCompanyCode;
     }
 
-    /**
-     * 服务订阅创建时间
-     */
-    public Date getSubsLogTenantCtime() {
+    public Timestamp getSubsLogTenantCtime() {
         return subsLogTenantCtime;
     }
 
-    /**
-     * 服务订阅创建时间
-     */
     public void setSubsLogTenantCtime(Timestamp subsLogTenantCtime) {
         this.subsLogTenantCtime = subsLogTenantCtime;
     }
 
-    /**
-     * 服务订阅修改时间
-     */
-    public Date getSubsLogTenantMtime() {
+    public Timestamp getSubsLogTenantMtime() {
         return subsLogTenantMtime;
     }
 
-    /**
-     * 服务订阅修改时间
-     */
     public void setSubsLogTenantMtime(Timestamp subsLogTenantMtime) {
         this.subsLogTenantMtime = subsLogTenantMtime;
     }
 
-    /**
-     * 服务订阅创建用户ID
-     */
     public String getSubsLogTenantUserId() {
         return subsLogTenantUserId;
     }
 
-    /**
-     * 服务订阅创建用户ID
-     */
     public void setSubsLogTenantUserId(String subsLogTenantUserId) {
         this.subsLogTenantUserId = subsLogTenantUserId;
     }
 
-    /**
-     * 服务订阅添加时间
-     */
-    public Date getSubsLogTenantAtime() {
+    public Timestamp getSubsLogTenantAtime() {
         return subsLogTenantAtime;
     }
 
-    /**
-     * 服务订阅添加时间
-     */
     public void setSubsLogTenantAtime(Timestamp subsLogTenantAtime) {
         this.subsLogTenantAtime = subsLogTenantAtime;
     }
 
+    public Short getIsDelete() {
+        return isDelete;
+    }
 
+    public void setIsDelete(Short isDelete) {
+        this.isDelete = isDelete;
+    }
 
     @Override
     public boolean equals(Object that) {
@@ -337,7 +186,6 @@ public class OcpTenantSubs implements Serializable {
         sb.append(", subsLogTenantUserId=").append(subsLogTenantUserId);
         sb.append(", subsLogTenantAtime=").append(subsLogTenantAtime);
         sb.append(", isDelete=").append(isDelete);
-        sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();
     }

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

@@ -19,7 +19,7 @@ public interface OcpApiTreeService extends IService<OcpApiGroup> {
     /**
      * 新增服务分类
      */
-    boolean insertTree(OcpApiGroup ocpApiGroup);
+    OcpApiGroup insertTree(OcpApiGroup ocpApiGroup);
 
 
       /*

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

@@ -8,9 +8,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.pms.ocp.common.utils.RandomStringUtils;
 import com.pms.ocp.mapper.OcpApiBaseMapper;
 import com.pms.ocp.mapper.OcpApiTreeMapper;
+import com.pms.ocp.model.QueryResponseResult;
 import com.pms.ocp.model.dto.*;
 import com.pms.ocp.model.entity.OcpApiGroup;
 
+import com.pms.ocp.model.entity.OcpTenantGroup;
 import com.pms.ocp.service.OcpApiTreeService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -25,7 +27,7 @@ import java.util.stream.Stream;
 
 @Service
 @Slf4j
-public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper,OcpApiGroup> implements OcpApiTreeService {
+public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper, OcpApiGroup> implements OcpApiTreeService {
 
 
     @Autowired
@@ -41,19 +43,19 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper,OcpApiGr
      */
 
     @Override
-    public List<OcpApiGroup> getByGroup(Long apiGroupPromotionType,String apiGroupCode) {
-
-            if (!("".equals(apiGroupPromotionType)) && StringUtils.isBlank(apiGroupCode)){
-                List<OcpApiGroup> ocpApiGroups = mapper.selectTwoApiGroups(apiGroupPromotionType);
-                return ocpApiGroups;
-            } else if(!("".equals(apiGroupPromotionType)) && !(StringUtils.isBlank(apiGroupCode))){
-                List<OcpApiGroup> ocpApiGroups = mapper.selectThreeApiGroupsList(apiGroupPromotionType, apiGroupCode);
-                return ocpApiGroups;
-            }
-
-            return null;
+    public List<OcpApiGroup> getByGroup(Long apiGroupPromotionType, String apiGroupCode) {
+
+        if (!("".equals(apiGroupPromotionType)) && StringUtils.isBlank(apiGroupCode)) {
+            List<OcpApiGroup> ocpApiGroups = mapper.selectTwoApiGroups(apiGroupPromotionType);
+            return ocpApiGroups;
+        } else if (!("".equals(apiGroupPromotionType)) && !(StringUtils.isBlank(apiGroupCode))) {
+            List<OcpApiGroup> ocpApiGroups = mapper.selectThreeApiGroupsList(apiGroupPromotionType, apiGroupCode);
+            return ocpApiGroups;
         }
 
+        return null;
+    }
+
 
     /**
      * 新增服务分类
@@ -61,35 +63,35 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper,OcpApiGr
      * @param
      */
     @Override
-    public boolean insertTree(OcpApiGroup ocpApiGroup) {
+    public OcpApiGroup insertTree(OcpApiGroup ocpApiGroup) {
         Timestamp timestamp = new Timestamp(System.currentTimeMillis());
         String code = RandomStringUtils.getRandomString(6);
         boolean flag = true;
         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);
+        Stream<OcpApiGroup> ocpApiGroupStream = ocpApiGroups.stream().filter(item -> item.getApiGroupCode().equals(ocpApiGroup.getApiGroupPcode()));
+        Stream<OcpApiGroup> apiGroupStream1 = ocpApiGroupStream.filter(ocp -> ocp.getApiGroupName().equals(ocpApiGroup.getApiGroupName()));
+        OcpApiGroup ocpApi = new OcpApiGroup();
+        if (!(StringUtils.isBlank(apiGroupStream1.toString()))) {
+
             ocpApi.setApiGroupPromotionType(ocpApiGroup.getApiGroupPromotionType());
+            BeanUtils.copyProperties(ocpApiGroup, ocpApi);
             ocpApi.setObjId("");
             ocpApi.setApiGroupMtime(timestamp);
             ocpApi.setApiGroupCtime(timestamp);
             ocpApi.setApiGroupPcode(ocpApiGroup.getApiGroupCode());
             ocpApi.setApiGroupCode(code);
-            if(ocpApiGroup.getApiGroupLevel().equals("Middleground")){
+            ocpApi.setApiGroupPromotionType(ocpApiGroup.getApiGroupPromotionType());
+            if ("Middleground".equals(ocpApiGroup.getApiGroupLevel())) {
                 ocpApiGroup.setApiGroupLevel("sys_center");
             }
-            if(ocpApiGroup.getApiGroupLevel().equals("sys_center")){
+            if ("sys_center".equals(ocpApiGroup.getApiGroupLevel())) {
                 ocpApiGroup.setApiGroupLevel("api_group");
             }
-
             mapper.insert(ocpApi);
-
-        }else {
-            return false;
+        } else {
+            return ocpApi;
         }
-        return flag;
+        return ocpApi;
 
     }
 
@@ -123,18 +125,21 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper,OcpApiGr
      * @param ocpApiGroup
      */
     @Override
-        public boolean deleteOcpTree(OcpApiGroup ocpApiGroup) {
+    public boolean deleteOcpTree(OcpApiGroup ocpApiGroup) {
         boolean flag = true;
+        LambdaQueryWrapper<OcpApiGroup> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(OcpApiGroup::getApiGroupCode, ocpApiGroup.getApiGroupCode());
         String objId = ocpApiGroup.getObjId();
-        OcpApiGroup ocpApiGroup1 = mapper.selectById(objId);
-        List<OcpApiGroup> ocpApiGroups = mapper.selectList(null);
-        for (OcpApiGroup apiGroup : ocpApiGroups) {
-            if ((ocpApiGroup1.getApiGroupCode()).equals(apiGroup.getApiGroupPcode())){
-                    flag = false;
-                    break;
-                }
+        if (StringUtils.isBlank(ocpApiGroup.getApiGroupCode())) {
+            flag = false;
+        } else {
+
+            LambdaQueryWrapper<OcpApiGroup> eq = queryWrapper.eq(OcpApiGroup::getApiGroupPcode, ocpApiGroup.getApiGroupCode());
+            if (StringUtils.isBlank(eq.toString())) {
+                flag = false;
+            }
         }
-        if (flag){
+        if (flag) {
             mapper.deleteById(objId);
         }
         return flag;
@@ -149,17 +154,27 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper,OcpApiGr
      */
     @Override
     public Page<OcpApiGroup> getOnePages(PageGroupDto pageGroupDto) {
-
         Page pageInfo = new Page(pageGroupDto.getPageNum(), pageGroupDto.getPageSize());
-        if (StringUtils.isBlank(pageGroupDto.getApiGroupCode())){
-            LambdaQueryWrapper<OcpApiGroup> lambdaQueryWrapper = new 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());
-            pageInfo.setRecords(ocpApiGroups);
-            pageInfo =  mapper.selectPage(pageInfo, null);
+        LambdaQueryWrapper<OcpApiGroup> qw = new LambdaQueryWrapper<>();
+        if (!("".equals(pageGroupDto.getKeyword()))) {
+            if (StringUtils.isBlank(pageGroupDto.getApiGroupLevel())) {
+
+                qw.eq(OcpApiGroup::getApiGroupPromotionType, pageGroupDto.getApiGroupPromotionType());
+               mapper.selectPage(pageInfo, qw);
+
+            } else if ("Middleground".equals(pageGroupDto.getApiGroupLevel()) || "sys_center".equals(pageGroupDto.getApiGroupLevel()) || "api_group".equals(pageGroupDto.getApiGroupLevel())) {
+                List<OcpApiGroup> ocpApiGroups = mapper.selectLists(pageGroupDto.getApiGroupPromotionType(), pageGroupDto.getApiGroupCode());
+                pageInfo.setRecords(ocpApiGroups);
+                pageInfo.setTotal(ocpApiGroups.size());
+            }
+        } else {
+            LambdaQueryWrapper<OcpApiGroup> ocpTenantGroupLambdaQueryWrapper = qw.and(c -> c.like(OcpApiGroup::getApiGroupName, pageGroupDto.getKeyword()))
+                    .or().like(OcpApiGroup::getApiGroupUserName, pageGroupDto.getKeyword())
+                    .or().like(OcpApiGroup::getApiGroupPcode, pageGroupDto.getKeyword());
+            mapper.selectPage(pageInfo, ocpTenantGroupLambdaQueryWrapper);
         }
         return pageInfo;
     }
 }
+
+

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.pms.ocp.mapper.OcpTenantAuditMapper;
 import com.pms.ocp.mapper.OcpTenantExtentMapper;
 import com.pms.ocp.mapper.OcpTenantGroupMapper;
 import com.pms.ocp.mapper.TenantBasicManagementMapper;
@@ -44,6 +45,8 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
     private OcpTenantGroupService ocpTenantGroupService;
     @Autowired
     private OcpTenantGroupMapper ocpTenantGroupMapper;
+    @Autowired
+    private OcpTenantAuditMapper ocpTenantAuditMapper;
 
     List<String> tenantGroup = new ArrayList<>();
 
@@ -86,11 +89,15 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
         List<OcpTenantExtent> ocpTenantExtents = ocpTenantExtentMapper.selectList(lambdaQueryWrapper);
         for (OcpTenantExtent ocpTenantExtent : ocpTenantExtents) {
             String tenantCode = ocpTenantExtent.getTenantCode();
-            if (ocpTenantExtent.getTenantState() == 0) {
-                return ResponseVO.error("数据为空");
+            if (ocpTenantExtent.getTenantState() == null) {
+                return ResponseVO.error("数据错误,状态为空");
             } else if (ocpTenantExtent.getTenantState() == 1) {
                 return ResponseVO.error(tenantCode + "已发布,请勿重复操作");
-            } else {
+            }
+//            else if (ocpTenantExtent.getTenantState() == 2) {
+//                return ResponseVO.error(tenantCode + "已下线,无法发布");
+//            }
+            else {
                 ocpTenantExtent.setTenantState((short) 1);
                 ocpTenantExtentMapper.updateById(ocpTenantExtent);
             }
@@ -143,22 +150,28 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
 
         String[] split = tenantCodes.split(",");
         List<String> list = Arrays.asList(split);
-        LambdaQueryWrapper<OcpTenantExtent> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.in(OcpTenantExtent::getTenantCode, list);
-        List<OcpTenantExtent> ocpTenantExtents = ocpTenantExtentMapper.selectList(lambdaQueryWrapper);
+
+//        LambdaQueryWrapper<OcpTenantExtent> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+//        lambdaQueryWrapper.in(OcpTenantExtent::getTenantCode, list);
+//        List<OcpTenantExtent> ocpTenantExtents = ocpTenantExtentMapper.selectList(lambdaQueryWrapper);
+
+        LambdaQueryWrapper<OcpTenantAudit> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.in(OcpTenantAudit::getTenantCode, list);
+        List<OcpTenantAudit> ocpTenantExtents = ocpTenantAuditMapper.selectList(lambdaQueryWrapper);
+
         if (ocpTenantExtents.size() == 0) {
-            return ResponseVO.error("数据为空");
+            return ResponseVO.error("系统错误,数据为空");
         }
-        for (OcpTenantExtent ocpTenantExtent : ocpTenantExtents) {
+        for (OcpTenantAudit ocpTenantExtent : ocpTenantExtents) {
             String tenantCode = ocpTenantExtent.getTenantCode();
-            if (ocpTenantExtent.getTenantState() == null) {
+            if (ocpTenantExtent.getOperStatus() == null) {
                 return ResponseVO.error("系统错误,状态为空");
-            } else if (ocpTenantExtent.getTenantState() == 2) {
+            } else if (ocpTenantExtent.getOperStatus() == 2) {
 
                 return ResponseVO.error(tenantCode + "已下线,请勿重复下线");
             } else {
-                ocpTenantExtent.setTenantState((short) 2);
-                ocpTenantExtentMapper.updateById(ocpTenantExtent);
+                ocpTenantExtent.setOperStatus((short) 2);
+                ocpTenantAuditMapper.updateById(ocpTenantExtent);
             }
 
         }

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

@@ -86,8 +86,7 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, OcpTenantGroup>
         if (tenanBaseDto.getTenantGroupLevel().equals("sys_center")){
             group.setTenantGroupLevel("api_group");
         }
-
-
+        group.setClassIfy(tenanBaseDto.getTenantGroupCompanyCode());
 
         //判断是否含有相同的分类名称
         if (falg) {