Merge remote-tracking branch 'origin/master'

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

@@ -91,7 +91,6 @@ public class ExcelUtils {
         }
         Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(fileName, fileName, ExcelType.XSSF), pojoClass, list);
         response.setCharacterEncoding("UTF-8");
-
         response.setHeader("content-Type", "application/vnd.ms-excel");
         response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName, "UTF-8") + ".xls");
         ServletOutputStream out = response.getOutputStream();

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

@@ -4,11 +4,7 @@ import com.github.pagehelper.PageInfo;
 import com.pms.ocp.common.utils.ExcelUtils;
 import com.pms.ocp.common.utils.FileExport;
 import com.pms.ocp.common.utils.FileUtil;
-
-import com.pms.ocp.model.QueryResponseResult;
 import com.pms.ocp.model.dto.ApiBaseDto;
-import com.pms.ocp.model.dto.ApiTreeGroupDto;
-import com.pms.ocp.model.dto.OcpApiBaseDto;
 import com.pms.ocp.model.entity.OcpApiBase;
 import com.pms.ocp.model.entity.OcpApiGroup;
 import com.pms.ocp.model.vo.OcpApiBaseVo;
@@ -20,10 +16,10 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.omg.PortableInterceptor.Interceptor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.sql.Timestamp;
@@ -149,7 +145,6 @@ public class ApiBasicManagementController {
     @ApiOperation("下载模块")
     @GetMapping("/downloadExcel")
     public void downloadExcel(HttpServletResponse response, HttpServletRequest request) {
-
         String[] excelHeader = {"序号", "服务编码", "服务中文名称", "所属集群", "所属命名空间", "接口URL", "状态", "注册时间", "建设单位"};
         List<Object> list = new ArrayList<>();
         FileExport.exportExcel(excelHeader, list, "XXX模板", response, request);
@@ -163,10 +158,12 @@ public class ApiBasicManagementController {
     }
 
     @ApiOperation("服务订阅")
-    @PostMapping("/login")
+    @GetMapping("/login")
     public ResponseVO ApiLogin(@RequestParam(required = false) String apiPromotion,
                                @RequestParam(required = false) String apiCodes) {
-        if (StringUtils.isEmpty(apiPromotion) || apiPromotion.equals("0")) {
+        if (StringUtils.isEmpty(apiPromotion)) {
+            return ResponseVO.error("不能为空");
+        } else if (apiPromotion.equals("0")) {
             return ResponseVO.error("统招");
         } else {
             apiBasicManagementService.apiLogin(apiCodes);
@@ -176,12 +173,14 @@ public class ApiBasicManagementController {
     }
 
     @ApiOperation("服务发布")
-    @PostMapping("/issue")
+    @GetMapping("/issue")
     public ResponseVO ApiIssue(@RequestParam(required = false) String apiPromotion,
                                @RequestParam(required = false) String apiCodes) {
-        if (StringUtils.isEmpty(apiPromotion) || apiPromotion.equals("0")) {
+        if (StringUtils.isEmpty(apiPromotion)) {
+            return ResponseVO.error("不能为空");
+        } else if (apiPromotion.equals("0")) {
             return ResponseVO.error("统招");
-        } else {
+        }else {
             return apiBasicManagementService.apiIssue(apiCodes);
 
         }
@@ -204,9 +203,10 @@ public class ApiBasicManagementController {
     @ApiOperation("服务分类层级")
     @GetMapping("/apiBaseTreeOther")
     public ResponseVO<List<OcpApiGroup>> apiBaseTreeOther(String apiGroupCompanyCode, String apiGroupCode, Integer apiGroupPromotionType) {
-        List<OcpApiGroup> apiTreeGroupDtos = apiBasicManagementService.apiBaseTreeOther(apiGroupCompanyCode,apiGroupCode,apiGroupPromotionType);
+        List<OcpApiGroup> apiTreeGroupDtos = apiBasicManagementService.apiBaseTreeOther(apiGroupCompanyCode, apiGroupCode, apiGroupPromotionType);
         return ResponseVO.ok(apiTreeGroupDtos);
     }
+
     @ApiOperation("服务树列表")
     @GetMapping("/apiBaseTreeList")
     public ResponseVO<List<OcpApiBase>> apiBaseTreeList(String apiGroupCompanyCode, String apiGroupCode) {

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

 package com.pms.ocp.controller;
 
+
 import com.github.pagehelper.PageInfo;
 import com.pms.ocp.model.dto.*;
 
@@ -13,6 +14,7 @@ import io.swagger.annotations.Api;
 
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -91,6 +93,9 @@ public class TenantBasicManagementController {
     @GetMapping("/tenantBaseTree")
     public ResponseVO<List<OcpTenantBase>> tenantBaseTree(@RequestParam(required = false) String tenantGroupCode,
                                                           @RequestParam(required = false) String tenantGroupCompanyCode) {
+        if (StringUtils.isEmpty(tenantGroupCode)) {
+            return ResponseVO.error("code为空");
+        }
         List<OcpTenantBase> ocpTenantBases = tenantBasicManagementService.tenantBaseTree(tenantGroupCode, tenantGroupCompanyCode);
         return ResponseVO.ok(ocpTenantBases);
     }
@@ -100,11 +105,11 @@ public class TenantBasicManagementController {
     public ResponseVO<PageInfo<OcpTenantBaseDto>> tenantListQuery(HttpServletRequest request, TenantDto tenantDto) {
         return tenantBasicManagementService.getBaseByGroupCode(tenantDto);
     }
+
     @ApiOperation("注册查询信息")
     @GetMapping("/select/register")
-    public ResponseVO<OcpTenantGroup> selectRegister(@RequestParam(required = false) String tenantGroupCode,
-                                                     @RequestParam(required = false) String tenantGroupCompanyCode){
-        OcpTenantGroup ocpTenantGroup= tenantBasicManagementService.selectRegister(tenantGroupCode,tenantGroupCompanyCode);
+    public ResponseVO<OcpTenantGroup> selectRegister(@RequestParam(required = false) String tenantGroupCode, @RequestParam(required = false) String tenantGroupCompanyCode) {
+        OcpTenantGroup ocpTenantGroup = tenantBasicManagementService.selectRegister(tenantGroupCode, tenantGroupCompanyCode);
         return ResponseVO.ok(ocpTenantGroup);
     }
 }

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

@@ -21,4 +21,6 @@ public interface TenantBasicManagementMapper extends BaseMapper<OcpTenantBase> {
     List<GroupDto> select(String tenantGroupCode);
 
     List<OcpTenantBaseDto> queryOcpTenantBaseDto(String tenantGroupCode, String keyword, String tenantUnit, Timestamp startTime, Timestamp endTime, String tenantCode, Integer pageSize, Integer pageNum);
+
+
 }

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

@@ -58,8 +58,8 @@ public class OcpApiBase {
   @ApiModelProperty("服务所属公司")
   private String ownerCompanyCode;
 
-  @ApiModelProperty("服务所属公司")
-  private String ownerCompanyName;
+//  @ApiModelProperty("服务所属公司")
+//  private String ownerCompanyName;
 
   @ApiModelProperty("是否删除0-否1-是")
   private long isDelete;
@@ -71,7 +71,7 @@ public class OcpApiBase {
   private long apiLayer;
 
   @ApiModelProperty("服务版本（最新版本）")
-  private long apiVersion;
+  private String apiVersion;
 
     public long getApiZone() {
         return apiZone;
@@ -89,11 +89,19 @@ public class OcpApiBase {
         this.apiLayer = apiLayer;
     }
 
-    public long getApiVersion() {
+//    public long getApiVersion() {
+//        return apiVersion;
+//    }
+//
+//    public void setApiVersion(long apiVersion) {
+//        this.apiVersion = apiVersion;
+//    }
+
+    public String getApiVersion() {
         return apiVersion;
     }
 
-    public void setApiVersion(long apiVersion) {
+    public void setApiVersion(String apiVersion) {
         this.apiVersion = apiVersion;
     }
 
@@ -212,13 +220,13 @@ public class OcpApiBase {
   }
 
 
-  public String getOwnerCompanyName() {
-    return ownerCompanyName;
-  }
-
-  public void setOwnerCompanyName(String ownerCompanyName) {
-    this.ownerCompanyName = ownerCompanyName;
-  }
+//  public String getOwnerCompanyName() {
+//    return ownerCompanyName;
+//  }
+//
+//  public void setOwnerCompanyName(String ownerCompanyName) {
+//    this.ownerCompanyName = ownerCompanyName;
+//  }
 
 
   public long getIsDelete() {

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

@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
+
 import java.sql.Timestamp;
 
 @Data
@@ -21,27 +22,28 @@ public class OcpApiExtent {
     @ApiModelProperty("服务编码")
     private String apiCode;
 
-  @ApiModelProperty("系统名称")
-  private String sysName;
+//  @ApiModelProperty("系统名称")
+//  private String sysName;
 
-  @ApiModelProperty("模块")
-  private String partName;
-  @ApiModelProperty("服务群")
-  private String serviceGroup;
+    //  @ApiModelProperty("模块")
+//  private String partName;
+//  @ApiModelProperty("服务群")
+//  private String serviceGroup;
     @ApiModelProperty("服务")
     private String serviceName;
     @ApiModelProperty("所属集群")
     private String clusterName;
     @ApiModelProperty("所属命名空间")
     private String spaceName;
-  @ApiModelProperty("服务描述")
-  private String serviceDescription;
+//  @ApiModelProperty("服务描述")
+//  private String serviceDescription;
+
     @ApiModelProperty("部署信息")
     private String deployment;
+
     @ApiModelProperty("服务状态0未发布1已发布")
     private String apiState;
 
-
     @ApiModelProperty("属性添加时间")
     private Timestamp apiCtime;
 
@@ -54,30 +56,29 @@ public class OcpApiExtent {
     @ApiModelProperty("是否已删除 0-否 1-是")
     private long isDelete;
 
-
-  public String getSysName() {
-    return sysName;
-  }
-
-  public void setSysName(String sysName) {
-    this.sysName = sysName;
-  }
-
-  public String getPartName() {
-    return partName;
-  }
-
-  public void setPartName(String partName) {
-    this.partName = partName;
-  }
-
-  public String getServiceGroup() {
-    return serviceGroup;
-  }
-
-  public void setServiceGroup(String serviceGroup) {
-    this.serviceGroup = serviceGroup;
-  }
+//  public String getSysName() {
+//    return sysName;
+//  }
+//
+//  public void setSysName(String sysName) {
+//    this.sysName = sysName;
+//  }
+//
+//  public String getPartName() {
+//    return partName;
+//  }
+//
+//  public void setPartName(String partName) {
+//    this.partName = partName;
+//  }
+//
+//  public String getServiceGroup() {
+//    return serviceGroup;
+//  }
+
+//  public void setServiceGroup(String serviceGroup) {
+//    this.serviceGroup = serviceGroup;
+//  }
 
     public String getServiceName() {
         return serviceName;
@@ -95,21 +96,28 @@ public class OcpApiExtent {
         this.clusterName = clusterName;
     }
 
-  public String get所属命名空间() {
+    public String getSpaceName() {
         return spaceName;
     }
 
-  public void set所属命名空间(String 所属命名空间) {
+    public void setSpaceName(String spaceName) {
         this.spaceName = spaceName;
     }
+    //  public String get所属命名空间() {
+//    return spaceName;
+//  }
+//
+//  public void set所属命名空间(String 所属命名空间) {
+//    this.spaceName = spaceName;
+//  }
 
-  public String getServiceDescription() {
-    return serviceDescription;
-  }
+//  public String getServiceDescription() {
+//    return serviceDescription;
+//  }
 
-  public void setServiceDescription(String serviceDescription) {
-    this.serviceDescription = serviceDescription;
-  }
+//  public void setServiceDescription(String serviceDescription) {
+//    this.serviceDescription = serviceDescription;
+//  }
 
     public String getDeployment() {
         return deployment;
@@ -159,7 +167,6 @@ public class OcpApiExtent {
         this.objId = objId;
     }
 
-
     public String getApiCode() {
         return apiCode;
     }
@@ -168,8 +175,6 @@ public class OcpApiExtent {
         this.apiCode = apiCode;
     }
 
-
-
     public long getIsDelete() {
         return isDelete;
     }

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

@@ -60,7 +60,6 @@ public class OcpApiGroup {
   @ApiModelProperty("分层树层级 1中台层 2中心层 3 服务组层 4服务层 ")
   private String apiGroupLevel;
 
-
   public String getApiGroupLevel() {
     return apiGroupLevel;
   }

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

@@ -40,50 +40,50 @@ 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;
+//  @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() {
@@ -142,123 +142,123 @@ 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 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 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/OcpApiTenantRel.java

@@ -46,98 +46,98 @@ public class OcpApiTenantRel {
   @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;
+//  @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;
 
 
 }

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

@@ -91,20 +91,20 @@ public class OcpTenantBase implements Serializable {
     /**
      * 部署名称
      */
-    @ApiModelProperty("部署名称")
-    private String deploymentName;
+//    @ApiModelProperty("部署名称")
+//    private String deploymentName;
 
     /**
      * 描述
      */
     @ApiModelProperty("描述")
     private String tenantDescription;
-
-    /**
-     * 应用状态0:设计态；1:运行态
-     */
-    @ApiModelProperty("应用状态0:设计态；1:运行态")
-    private Short tenantState;
+//
+//    /**
+//     * 应用状态0:设计态；1:运行态
+//     */
+//    @ApiModelProperty("应用状态0:设计态；1:运行态")
+//    private Short tenantState;
 //    /**
 //     * 推广类型0:统建；1:自建
 //     */
@@ -122,11 +122,11 @@ public class OcpTenantBase implements Serializable {
     @ApiModelProperty("所属公司编码")
     private String ownerCompanyCode;
 
-    /**
-     * 所属公司名称
-     */
-    @ApiModelProperty("所属公司名称")
-    private String ownerCompanyName;
+//    /**
+//     * 所属公司名称
+//     */
+//    @ApiModelProperty("所属公司名称")
+//    private String ownerCompanyName;
 
     /**
      * 是否删除0:否;1:是
@@ -308,19 +308,19 @@ public class OcpTenantBase implements Serializable {
         this.tenantMtime = tenantMtime;
     }
 
-    /**
-     * 部署名称
-     */
-    public String getDeploymentName() {
-        return deploymentName;
-    }
-
-    /**
-     * 部署名称
-     */
-    public void setDeploymentName(String deploymentName) {
-        this.deploymentName = deploymentName;
-    }
+//    /**
+//     * 部署名称
+//     */
+//    public String getDeploymentName() {
+//        return deploymentName;
+//    }
+//
+//    /**
+//     * 部署名称
+//     */
+//    public void setDeploymentName(String deploymentName) {
+//        this.deploymentName = deploymentName;
+//    }
 
     /**
      * 描述
@@ -336,19 +336,19 @@ public class OcpTenantBase implements Serializable {
         this.tenantDescription = tenantDescription;
     }
 
-    /**
-     * 应用状态0:设计态；1:运行态
-     */
-    public Short getTenantState() {
-        return tenantState;
-    }
-
-    /**
-     * 应用状态0:设计态；1:运行态
-     */
-    public void setTenantState(Short tenantState) {
-        this.tenantState = tenantState;
-    }
+//    /**
+//     * 应用状态0:设计态；1:运行态
+//     */
+//    public Short getTenantState() {
+//        return tenantState;
+//    }
+//
+//    /**
+//     * 应用状态0:设计态；1:运行态
+//     */
+//    public void setTenantState(Short tenantState) {
+//        this.tenantState = tenantState;
+//    }
 
     /**
      * 建设单位
@@ -377,20 +377,20 @@ public class OcpTenantBase implements Serializable {
     public void setOwnerCompanyCode(String ownerCompanyCode) {
         this.ownerCompanyCode = ownerCompanyCode;
     }
-
-    /**
-     * 所属公司名称
-     */
-    public String getOwnerCompanyName() {
-        return ownerCompanyName;
-    }
-
-    /**
-     * 所属公司名称
-     */
-    public void setOwnerCompanyName(String ownerCompanyName) {
-        this.ownerCompanyName = ownerCompanyName;
-    }
+//
+//    /**
+//     * 所属公司名称
+//     */
+//    public String getOwnerCompanyName() {
+//        return ownerCompanyName;
+//    }
+//
+//    /**
+//     * 所属公司名称
+//     */
+//    public void setOwnerCompanyName(String ownerCompanyName) {
+//        this.ownerCompanyName = ownerCompanyName;
+//    }
 
     /**
      * 是否删除0:否;1:是

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;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
-
 import java.io.Serializable;
 import java.sql.Timestamp;
 import java.util.Date;
-import java.util.List;
+
 
 /**
  * 应用分类表
@@ -109,17 +107,6 @@ public class OcpTenantGroup implements Serializable {
     private String tenantGroupLevel;
 
 
-    @TableField(exist = false)
-    @ApiModelProperty("模糊查询字段")
-    private String keyword;
-
-    public String getKeyword() {
-        return keyword;
-    }
-
-    public void setKeyword(String keyword) {
-        this.keyword = keyword;
-    }
 
     public static long getSerialVersionUID() {
         return serialVersionUID;
@@ -309,6 +296,20 @@ public class OcpTenantGroup implements Serializable {
         this.isDelete = isDelete;
     }
 
+//    /**
+//     * 应用树层级 1:应用分组层  2:应用层
+//     */
+//    public Short getTenantGroupLevel() {
+//        return tenantGroupLevel;
+//    }
+//
+//    /**
+//     * 应用树层级 1:应用分组层  2:应用层
+//     */
+//    public void setTenantGroupLevel(Short tenantGroupLevel) {
+//        this.tenantGroupLevel = tenantGroupLevel;
+//    }
+
     public String getTenantGroupLevel() {
         return tenantGroupLevel;
     }
@@ -317,11 +318,6 @@ public class OcpTenantGroup implements Serializable {
         this.tenantGroupLevel = tenantGroupLevel;
     }
 
-    /**
-     * 应用树层级 1:应用分组层  2:应用层
-     */
-
-
     @Override
     public boolean equals(Object that) {
         if (this == that) {

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

@@ -5,7 +5,6 @@ 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;
@@ -20,7 +19,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.sql.Timestamp;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Stream;
 
@@ -79,8 +77,15 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper,OcpApiGr
             ocpApi.setApiGroupCtime(timestamp);
             ocpApi.setApiGroupPcode(ocpApiGroup.getApiGroupCode());
             ocpApi.setApiGroupCode(code);
+            if(ocpApiGroup.getApiGroupLevel().equals("Middleground")){
+                ocpApiGroup.setApiGroupLevel("sys_center");
+            }
+            if(ocpApiGroup.getApiGroupLevel().equals("sys_center")){
+                ocpApiGroup.setApiGroupLevel("api_group");
+            }
+
             mapper.insert(ocpApi);
-            ocpApiGroup.setApiGroupLevel(ocpApiGroup.getApiGroupLevel() + 1);
+
         }else {
             return false;
         }
@@ -96,6 +101,7 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper,OcpApiGr
      */
     @Override
     public boolean updataOcpTree(OcpApiGroup ocpApiGroup) {
+        Timestamp timestamp = new Timestamp(System.currentTimeMillis());
         boolean falg = true;
         List<OcpApiGroup> ocpApiGroups = mapper.selectList(null);
         for (OcpApiGroup apiGroup : ocpApiGroups) {
@@ -105,6 +111,7 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper,OcpApiGr
                 break;
             }
         }
+        ocpApiGroup.setApiGroupMtime(timestamp);
         mapper.updateById(ocpApiGroup);
         return falg;
     }

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

 package com.pms.ocp.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -11,10 +11,8 @@ import com.pms.ocp.mapper.TenantBasicManagementMapper;
 import com.pms.ocp.model.dto.GroupDto;
 import com.pms.ocp.model.dto.OcpTenantBaseDto;
 import com.pms.ocp.model.dto.TenantDto;
-import com.pms.ocp.model.dto.WholeLinkParamDto;
 import com.pms.ocp.model.entity.*;
-import com.pms.ocp.model.vo.CompanyTenantVo;
-import com.pms.ocp.model.vo.CompanyVo;
+
 import com.pms.ocp.model.vo.ResponseVO;
 import com.pms.ocp.model.vo.TenantGroupVo;
 import com.pms.ocp.service.*;
@@ -22,6 +20,7 @@ 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.transaction.annotation.Transactional;
 
 import java.sql.Timestamp;
 import java.time.LocalDateTime;
@@ -31,6 +30,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 @Service
+
 public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicManagementMapper, OcpTenantBase> implements TenantBasicManagementService {
     @Autowired
     private TenantBasicManagementMapper tenantBasicManagementMapper;
@@ -85,8 +85,11 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
         lambdaQueryWrapper.in(OcpTenantExtent::getTenantCode, list);
         List<OcpTenantExtent> ocpTenantExtents = ocpTenantExtentMapper.selectList(lambdaQueryWrapper);
         for (OcpTenantExtent ocpTenantExtent : ocpTenantExtents) {
-            if (ocpTenantExtent.getTenantState() == 1) {
-                return ResponseVO.error("已发布");
+            String tenantCode = ocpTenantExtent.getTenantCode();
+            if (ocpTenantExtent.getTenantState() == 0) {
+                return ResponseVO.error("数据为空");
+            } else if (ocpTenantExtent.getTenantState() == 1) {
+                return ResponseVO.error(tenantCode + "已发布,请勿重复操作");
             } else {
                 ocpTenantExtent.setTenantState((short) 1);
                 ocpTenantExtentMapper.updateById(ocpTenantExtent);
@@ -113,7 +116,11 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
         for (String s : tenantCode) {
             OcpTenantSubs ocpTenantSubs = new OcpTenantSubs();
             ocpTenantSubs.setTenantCode(s);
+            if (StringUtils.isNotEmpty(companyCode)) {
                 ocpTenantSubs.setSubsCompanyCode(companyCode);
+            } else {
+                ocpTenantSubs.setSubsCompanyCode("1");
+            }
             ocpTenantSubs.setSubsLogTenantAtime(Timestamp.valueOf(LocalDateTime.now()));
             ocpTenantSubs.setSubsLogTenantCtime(Timestamp.valueOf(LocalDateTime.now()));
             ocpTenantSubs.setSubsLogTenantMtime(Timestamp.valueOf(LocalDateTime.now()));
@@ -139,17 +146,16 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
         LambdaQueryWrapper<OcpTenantExtent> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.in(OcpTenantExtent::getTenantCode, list);
         List<OcpTenantExtent> ocpTenantExtents = ocpTenantExtentMapper.selectList(lambdaQueryWrapper);
-
+        if (ocpTenantExtents.size() == 0) {
+            return ResponseVO.error("数据为空");
+        }
         for (OcpTenantExtent ocpTenantExtent : ocpTenantExtents) {
-//            if (ocpTenantExtent == null) {
-//                return ResponseVO.error("未知错误");
-//
-
+            String tenantCode = ocpTenantExtent.getTenantCode();
             if (ocpTenantExtent.getTenantState() == null) {
-
                 return ResponseVO.error("系统错误,状态为空");
             } else if (ocpTenantExtent.getTenantState() == 2) {
-                return ResponseVO.error("有一个应用已下线,请勿重复下线");
+
+                return ResponseVO.error(tenantCode + "已下线,请勿重复下线");
             } else {
                 ocpTenantExtent.setTenantState((short) 2);
                 ocpTenantExtentMapper.updateById(ocpTenantExtent);
@@ -166,7 +172,7 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
      */
     @Override
     public ResponseVO applyRegister(OcpTenantBaseDto ocpTenantBaseDto) {
-        //OcpTenantBase
+//        OcpTenantBase
         String tenantGroupName = ocpTenantBaseDto.getTenantGroupName();//应用分类名称
         LambdaQueryWrapper<OcpTenantGroup> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(OcpTenantGroup::getTenantGroupName, tenantGroupName);
@@ -174,7 +180,24 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
         if (one == null) {
             return ResponseVO.error("该应用分类不存在");
         }
-        //获取应用分类编码
+//
+        String tenantCode = ocpTenantBaseDto.getTenantCode();
+//        LambdaQueryWrapper<OcpTenantBase> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+//        lambdaQueryWrapper.eq(OcpTenantBase::getTenantCode, tenantCode);
+//        List<OcpTenantBase> ocpTenantBases = tenantBasicManagementMapper.selectList(lambdaQueryWrapper);
+//        if (ocpTenantBases.size() != 1) {
+//            return ResponseVO.error("应用代码应该唯一");
+//        }
+//        for (OcpTenantBase ocpTenantBase : ocpTenantBases) {
+//            System.out.println(ocpTenantBase);
+//            BeanUtils.copyProperties(ocpTenantBaseDto, ocpTenantBase);
+//            this.update(lambdaQueryWrapper);
+//        }
+        String apiCodes = ocpTenantBaseDto.getApiCodes();
+        if (StringUtils.isEmpty(apiCodes)) {
+            return ResponseVO.error("服务编码为空");
+        }
+//        //获取应用分类编码
         String tenantGroupCode = one.getTenantGroupCode();
 
         OcpTenantBase ocpTenantBase = new OcpTenantBase();
@@ -183,32 +206,29 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
         //OcpTenantBase
         tenantBasicManagementMapper.insert(ocpTenantBase);
 
-        //ocp_tenant_extent
+//        //ocp_tenant_extent
         OcpTenantExtent ocpTenantExtent = new OcpTenantExtent();
         BeanUtils.copyProperties(ocpTenantBaseDto, ocpTenantExtent);
         ocpTenantExtent.setDepCompanyCode(null);
         ocpTenantExtentMapper.insert(ocpTenantExtent);
 
         //ocp_api_tenant_rel
-        String apiCodes = ocpTenantBaseDto.getApiCodes();
-        if (StringUtils.isEmpty(apiCodes)) {
-            return ResponseVO.error("服务编码为空");
-        } else {
+
         OcpApiTenantRel ocpApiTenantRel = new OcpApiTenantRel();
         String[] split = apiCodes.split(",");
         List<String> apiCode = Arrays.asList(split);
-            String tenantCode = ocpTenantBaseDto.getTenantCode();
+
         for (String s : apiCode) {
             ocpApiTenantRel.setApiCode(s);
-                ocpApiTenantRel.setTenantDepCompanyCode(null);
-                ocpApiTenantRel.setApiDepCompanyCode(null);
+            ocpApiTenantRel.setTenantDepCompanyCode("078002018");
+            ocpApiTenantRel.setApiDepCompanyCode("078002018");
             ocpApiTenantRel.setTenantCode(tenantCode);
             ocpApiTenantRel.setApiTenantRelCtime(Timestamp.valueOf(LocalDateTime.now()));
             ocpApiTenantRel.setApiTenantRelMtime(Timestamp.valueOf(LocalDateTime.now()));
             //保存到数据库
             ocpApiTenantRelService.save(ocpApiTenantRel);
         }
-        }
+
         return ResponseVO.ok();
     }
 
@@ -259,9 +279,11 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
     @Override
     public List<OcpTenantBase> tenantBaseTree(String tenantGroupCode, String tenantGroupCompanyCode) {
         LambdaQueryWrapper<OcpTenantBase> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.eq(OcpTenantBase::getOwnerCompanyCode, tenantGroupCompanyCode);
-        lambdaQueryWrapper.eq(OcpTenantBase::getTenantCode, tenantGroupCode);
+        lambdaQueryWrapper.eq(StringUtils.isNotEmpty(tenantGroupCompanyCode), OcpTenantBase::getOwnerCompanyCode, tenantGroupCompanyCode);
+        lambdaQueryWrapper.eq(StringUtils.isNotEmpty(tenantGroupCode), OcpTenantBase::getTenantGroupCode, tenantGroupCode);
+
         List<OcpTenantBase> ocpTenantBases = tenantBasicManagementMapper.selectList(lambdaQueryWrapper);
+
         return ocpTenantBases;
     }
 
@@ -274,7 +296,6 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
      */
     @Override
     public OcpTenantGroup selectRegister(String tenantGroupCode, String tenantGroupCompanyCode) {
-
         OcpTenantGroup ocpTenantGroup = ocpTenantGroupMapper.selectRegister(tenantGroupCode, tenantGroupCompanyCode);
         return ocpTenantGroup;
     }
@@ -293,7 +314,6 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
                 setGroupIdValue(tenantGroupCompanyCode, cod);
                 tenantGroup.add(cod);
             }
-            ;
         }
 
     }

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

 package com.pms.ocp.service.impl;
 
 
+import cn.afterturn.easypoi.cache.manager.IFileLoader;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.pms.ocp.common.utils.RandomStringUtils;
 import com.pms.ocp.mapper.TenantBasicManagementMapper;
 import com.pms.ocp.mapper.TenantMapper;
 import com.pms.ocp.model.dto.*;
+import com.pms.ocp.model.entity.ModelAudit;
 import com.pms.ocp.model.entity.OcpTenantGroup;
 import com.pms.ocp.service.TenantService;
 import org.apache.commons.lang3.StringUtils;
@@ -61,7 +64,6 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, OcpTenantGroup>
     public OcpTenantGroup getTenanInster(TenanBaseDto tenanBaseDto) {
         boolean falg = true;
 
-
         OcpTenantGroup group = new OcpTenantGroup();
         String tenantGroupCode = tenanBaseDto.getTenantGroupCode();
         List<OcpTenantGroup> ocpTenantGroups = tenantMapper.selectList(null);
@@ -77,36 +79,23 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, OcpTenantGroup>
         group.setTenantGroupCtime(timestamp);
         group.setTenantGroupMtime(timestamp);
         group.setTenantGroupVersion("1.0");
-        int i = (Integer.parseInt(tenanBaseDto.getTenantGroupLevel()) + 1);
-
-        group.setTenantGroupLevel(String.valueOf(i));
-
-        for (OcpTenantGroup tenantGroup : ocpTenantGroups) {
-            if (tenantGroup.getTenantGroupCode().equals(tenantGroupCode)) {
-                falg = false;
-                break;
+        group.setTenantGroupCode(randomString);
+        if (tenanBaseDto.getTenantGroupLevel().equals("Middleground")){
+            group.setTenantGroupLevel("sys_center");
         }
+        if (tenanBaseDto.getTenantGroupLevel().equals("sys_center")){
+            group.setTenantGroupLevel("api_group");
         }
 
+
+
         //判断是否含有相同的分类名称
-        List<OcpTenantGroup> ocpTenantGroupList = tenantMapper.selectGroupsList(tenanBaseDto.getTenantGroupCompanyCode(), tenanBaseDto.getTenantGroupName());
-        if (StringUtils.isBlank(ocpTenantGroupList.toString())) {
-            falg = false;
-        } else {
-            for (OcpTenantGroup tenantGroup : ocpTenantGroupList) {
-                if (tenanBaseDto.getTenantGroupName().equals(tenantGroup.getTenantGroupName())) {
-                    falg = false;
-                    break;
-                }
-            }
-        }
         if (falg) {
             tenanBaseDto.setClassIfy(tenanBaseDto.getTenantGroupCode());
-            group.setTenantGroupCode(randomString);
             tenantMapper.insert(group);
-            group = tenantMapper.selectById(tenanBaseDto.getObjId());
         }
 
+
         return group;
     }
 
@@ -146,19 +135,14 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, OcpTenantGroup>
         String objId = ocpTenantGroup.getObjId();
         OcpTenantGroup ocpTenantGroup1 = tenantMapper.selectById(objId);
         boolean flag = true;
-        List<OcpTenantGroup> ocpTenantGroupList = tenantMapper.selectList(null);
-        if (StringUtils.isBlank(ocpTenantGroup1.getTenantGroupPcode())) {
-            for (OcpTenantGroup tenantGroup : ocpTenantGroupList) {
-                String tenantGroupPcode = tenantGroup.getTenantGroupPcode();
-                if ((ocpTenantGroup.getTenantGroupCode().equals(tenantGroupPcode))) {
+        LambdaQueryWrapper<OcpTenantGroup> wrapper = new LambdaQueryWrapper<>();
+        LambdaQueryWrapper<OcpTenantGroup> lambdaQueryWrapper = wrapper.eq(OcpTenantGroup::getTenantGroupPcode, ocpTenantGroup1.getTenantGroupCode());
+        if (!(StringUtils.isBlank(lambdaQueryWrapper.toString()))){
+             tenantMapper.deleteById(objId);
+         }else {
              flag = false;
-                    break;
-                }
-            }
          }
 
-        tenantMapper.deleteById(objId);
-
         return flag;
     }
 
@@ -172,15 +156,12 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, OcpTenantGroup>
     @Override
     public Page<OcpTenantGroup> getselects(String tenantGroupCode, String tenantGroupCompanyCode, int currentPage, int pageSize, String keyword,String lev) {
         LambdaQueryWrapper<OcpTenantGroup> qw = new LambdaQueryWrapper<>();
-
         Page<OcpTenantGroup> page = new Page<>(currentPage, pageSize);
         if (StringUtils.isBlank(keyword)) {
-         if(lev.equals("1")) {
-             // List<OcpTenantGroup> ocpTenantGroupList = tenantMapper.selectTenantGroup(tenantGroupCompanyCode);
+         if("".equals(lev) || "1".equals(lev)) {
              LambdaQueryWrapper<OcpTenantGroup> eq = qw.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode);
-//             page.setRecords(ocpTenantGroupList);
               tenantMapper.selectPage(page, eq);
-         }else if (lev.equals("2") || lev.equals("3")) {
+         }else if ("2".equals(lev) || "3".equals(lev)) {
                 LambdaQueryWrapper<OcpTenantGroup> eq = qw.or(wq -> wq.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode)).eq(OcpTenantGroup::getTenantGroupPcode, tenantGroupCode);
                 tenantMapper.selectPage(page, eq);
             }

src/main/resources/application-local.yml

@@ -2,11 +2,11 @@ spring:
   datasource:
     driver-class-name: org.postgresql.Driver
     username: postgres
-    password: root
+    password: 1234
     type: com.zaxxer.hikari.HikariDataSource
 #    jdbc-url: jdbc:postgresql://192.168.43.20:33072/pms3?currentSchema=public&stringtype=unspecified&TimeZone=Asia/Shanghai&useAffectedRows=true
 #    jdbc-url: jdbc:postgresql://172.20.10.9:33072/pms3?currentSchema=public&stringtype=unspecified&TimeZone=Asia/Shanghai&useAffectedRows=true
-    url: jdbc:postgresql://localhost:5432/model?currentSchema=operating_platform&stringtype=unspecified&TimeZone=Asia/Shanghai&useAffectedRows=true
+    url: jdbc:postgresql://localhost:5432/pms_accept?currentSchema=operating_platform&stringtype=unspecified&TimeZone=Asia/Shanghai&useAffectedRows=true
 
 knife4j:
   enable: true

src/main/resources/mapper/ApiBasicManagementMapper.xml

@@ -28,7 +28,9 @@
 
     </select>
     <select id="queryOcpApiBaseDto" resultMap="oabMap">
-        select oab.obj_id,oab.api_code,oae.api_code,oab.api_name,oae.cluster_name,
+        select
+        oab.obj_id,
+        oab.api_code,oae.api_code,oab.api_name,oae.cluster_name,
         oae.space_name,oab.api_url,oae.api_state ,oab.api_unit ,oab.api_ctime from ocp_api_base oab
         join ocp_api_extent oae ON oae.api_code = oab.api_code
         <where>

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 = 'api_group' and api_group_pcode = '';
+       SELECT * FROM ocp_api_group WHERE api_group_promotion_type = #{apiGroupPromotionType};
     </select>
 <!--二级-->
     <select id="selectThreeApiGroupsList" resultType="com.pms.ocp.model.entity.OcpApiGroup">

src/main/resources/mapper/OcpGroup.xml

@@ -12,7 +12,7 @@
         <result property="deploymentName" column="deployment_name"/>
         <result property="tenantZone" column="tenant_zone"/>
         <result property="tenantCtime" column="tenant_ctime"/>
-        <result property="tenantUnit" column="tenant_unit"/>
+        <result property="tenantUnit" column="tenant_unit" jdbcType="VARCHAR"/>
     </resultMap>
 
 
@@ -37,7 +37,7 @@
     <select id="selectPageLists" resultMap="ctbMap">
         select
         otb.obj_id,otb.tenant_code,otb.tenant_name,otg.tenant_group_name,otb.tenant_url,ote.cluster_name,ote.space_name,
-        ote.deployment_name,otb.tenant_zone,otb.tenant_ctime,otb.tenant_unit
+        otb.tenant_zone,otb.tenant_ctime,otb.tenant_unit
         from ocp_tenant_base otb
         join ocp_tenant_extent ote on otb.tenant_code=ote.tenant_code
         join ocp_tenant_group otg on otb.tenant_group_code =otg.tenant_group_code
@@ -50,19 +50,15 @@
             </foreach>
         </if>
         <if test="tenantUnit !=null and tenantUnit!=''">
-            and otb.tenant_unit = #{apiUnit}
+         and otb.tenant_unit = #{tenantUnit}
         </if>
 
-        <!--        <if test="tenantGroupCode !=null and tenantGroupCode!=''">-->
-        <!--            and otb.tenant_group_code = #{tenantGroupCode}-->
-        <!--        </if>-->
-
-        <if test="startTime !=null  ">
+        <if test="startCTime !=null  ">
             <![CDATA[
                 and otb.tenant_ctime >= #{startCTime}
                 ]]>
         </if>
-        <if test="endTime !=null  ">
+        <if test="endCTime !=null  ">
             <![CDATA[
             and otb.tenant_ctime <= #{endCTime}
             ]]>
@@ -70,9 +66,9 @@
         <if test="keyword !=null and keyword != '' ">
             and otb.tenant_name like CONCAT('%', #{keyword}::text,'%')
         </if>
-        <if test="keyword !=null and keyword != '' ">
-            and otb.tenant_code like CONCAT('%', #{keyword}::text,'%')
-        </if>
+<!--        <if test="keyword !=null and keyword != '' ">-->
+<!--            and otb.tenant_code like CONCAT('%', #{keyword}::text,'%')-->
+<!--        </if>-->
     </select>
     <select id="selectRegister" resultType="com.pms.ocp.model.entity.OcpTenantGroup">
         select * from ocp_tenant_group where is_delete = 0

src/main/resources/mapper/OcpTenantGroup.xml

@@ -13,7 +13,7 @@
 
 <!--三级目录-->
     <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' ORDER BY tenant_group_ctime DESC;
+      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="selectTenantGroupsList" resultType="com.pms.ocp.model.entity.OcpTenantGroup">
@@ -25,7 +25,7 @@
 
 
     <select id="selectGroups" resultType="com.pms.ocp.model.entity.OcpTenantGroup">
-        SELECT * FROM ocp_tenant_group WHERE  tenant_group_company_code = #{tenantGroupCompanyCode} and tenant_group_level = '1' ;
+        SELECT * FROM ocp_tenant_group WHERE  tenant_group_company_code = #{tenantGroupCompanyCode} and tenant_group_level = 'Middleground' ;
     </select>
 
 <!--    根据创建公司和分类名称获取集合-->

src/main/resources/mapper/TenantBasicManagementMapper.xml

@@ -65,6 +65,4 @@
 
 
 
-
-
 </mapper>
\ No newline at end of file