Merge remote-tracking branch 'origin/master'

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

 package com.pms.ocp.controller;
 
 
+import com.pms.ocp.model.dto.OcpTenantDto;
 import com.pms.ocp.model.dto.OcpTenantGroupIocnDto;
 import com.pms.ocp.model.entity.OcpTenantBase;
 import com.pms.ocp.model.vo.ResponseVO;
@@ -17,6 +18,12 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
+
+
+/**
+ * @author zhaochengming
+ *
+ */
 @Slf4j
 @RequestMapping("/tenant-group/v1")
 @RestController
@@ -32,7 +39,7 @@ public class OcpTenantGroupIocnController {
 
 
 
-    /**
+    /**@author:zhaochengming
      * 我的应用--服务列表
      * @return
      */
@@ -43,7 +50,7 @@ public class OcpTenantGroupIocnController {
         return ResponseVO.ok(ocpgroup);
     }
 
-    /**
+    /**@author:zhaochengming
      * 我的应用--应用删除
      * @return
      */
@@ -59,5 +66,17 @@ public class OcpTenantGroupIocnController {
 
     }
 
+    /**
+     * @author:zhaochengming
+     * @param objId
+     * @return
+     */
+    @GetMapping("/details")
+    @ApiModelProperty("我的应用--应用详情")
+    private ResponseVO selectDetails(String objId) {
+        OcpTenantDto ocpTenantDto = ocpTenantBaseService.selectDetails(objId);
+        return ResponseVO.ok(ocpTenantDto);
+        }
+
+    }
 
-}

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

@@ -7,4 +7,8 @@ import com.pms.ocp.model.entity.OcpTenantIocn;
  * @author Administrator
  */
 public interface OcpTenantIocnMapper extends BaseMapper<OcpTenantIocn> {
+
+
+
+    OcpTenantIocn selectCode(String tenantCode);
 }

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

+package com.pms.ocp.model.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.sql.Timestamp;
+
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "应用详情dto")
+public class OcpTenantDto {
+
+
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty("主键ID")
+    private String objId;
+
+    @ApiModelProperty("服务代码")
+    private String apiCode;
+
+    @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("是否删除0-否1-是")
+    private long isDelete;
+
+    @ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区")
+    private long apiZone;
+
+    @ApiModelProperty("'所属层级 1:应用层;2:平台层;3:网络层;4:感知层;")
+    private long apiLayer;
+
+    @ApiModelProperty("服务版本（最新版本）")
+    private String apiVersion;
+
+    @ApiModelProperty("服务所属中心编码所属中心")
+    private String apiCenterCode;
+
+    @ApiModelProperty("服务简述")
+    private String apiDescription;
+
+    @ApiModelProperty("创建者姓名")
+    private String apiUserName;
+
+
+    @ApiModelProperty(value = "图标种类——tenant:应用图标,api:服务图标")
+    private String iocnType;
+
+    /**
+     * 编码值
+     */
+    @ApiModelProperty(value = "编码值")
+    private String codeNo;
+
+    /**
+     * 应用调用的服务数量图标数据
+     */
+    @ApiModelProperty(value = "应用调用的服务数量图标数据")
+    private Object iocn;
+
+    /**
+     * 所属公司可能会根据公司分区
+     */
+    @ApiModelProperty(value = "所属公司可能会根据公司分区")
+    private String companyCode;
+
+
+    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 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 long getIsDelete() {
+        return isDelete;
+    }
+
+    public void setIsDelete(long isDelete) {
+        this.isDelete = isDelete;
+    }
+
+    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 String getApiVersion() {
+        return apiVersion;
+    }
+
+    public void setApiVersion(String apiVersion) {
+        this.apiVersion = apiVersion;
+    }
+
+    public String getApiCenterCode() {
+        return apiCenterCode;
+    }
+
+    public void setApiCenterCode(String apiCenterCode) {
+        this.apiCenterCode = apiCenterCode;
+    }
+
+    public String getApiDescription() {
+        return apiDescription;
+    }
+
+    public void setApiDescription(String apiDescription) {
+        this.apiDescription = apiDescription;
+    }
+
+    public String getApiUserName() {
+        return apiUserName;
+    }
+
+    public void setApiUserName(String apiUserName) {
+        this.apiUserName = apiUserName;
+    }
+
+    public String getIocnType() {
+        return iocnType;
+    }
+
+    public void setIocnType(String iocnType) {
+        this.iocnType = iocnType;
+    }
+
+    public String getCodeNo() {
+        return codeNo;
+    }
+
+    public void setCodeNo(String codeNo) {
+        this.codeNo = codeNo;
+    }
+
+    public Object getIocn() {
+        return iocn;
+    }
+
+    public void setIocn(Object iocn) {
+        this.iocn = iocn;
+    }
+
+    public String getCompanyCode() {
+        return companyCode;
+    }
+
+    public void setCompanyCode(String companyCode) {
+        this.companyCode = companyCode;
+    }
+}

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

 package com.pms.ocp.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.pms.ocp.model.dto.OcpTenantDto;
 import com.pms.ocp.model.entity.OcpTenantBase;
 
 public interface OcpTenantBaseService extends IService<OcpTenantBase> {
@@ -12,4 +13,11 @@ public interface OcpTenantBaseService extends IService<OcpTenantBase> {
      * @return
      */
     boolean delectApply(String objId);
+
+    /**
+     * 我的应用--应用详情
+     * @param objId
+     * @return
+     */
+    OcpTenantDto selectDetails(String objId);
 }

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

@@ -3,7 +3,10 @@ package com.pms.ocp.service.impl;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.pms.ocp.mapper.OcpTenantBaseMapper;
+import com.pms.ocp.mapper.OcpTenantIocnMapper;
+import com.pms.ocp.model.dto.OcpTenantDto;
 import com.pms.ocp.model.entity.OcpTenantBase;
+import com.pms.ocp.model.entity.OcpTenantIocn;
 import com.pms.ocp.service.OcpTenantBaseService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,6 +19,10 @@ public class OcpTenantBaseServiceImpl extends ServiceImpl<OcpTenantBaseMapper, O
     @Autowired
     private OcpTenantBaseMapper ocpTenantBaseMapper;
 
+    @Autowired
+    private OcpTenantIocnMapper ocpTenantIocnMapper;
+
+
     /**
      * 我的应用 -- 应用删除
      *
@@ -26,7 +33,7 @@ public class OcpTenantBaseServiceImpl extends ServiceImpl<OcpTenantBaseMapper, O
     public boolean delectApply(String objId) {
 
 
-        if (StringUtils.isNotBlank(objId)){
+        if (StringUtils.isNotBlank(objId)) {
             return false;
         }
         OcpTenantBase ocpTenantBase = ocpTenantBaseMapper.selectById(objId);
@@ -35,4 +42,26 @@ public class OcpTenantBaseServiceImpl extends ServiceImpl<OcpTenantBaseMapper, O
 
         return true;
     }
+
+    /**
+     * 我的应用--应用详情
+     *
+     * @param objId
+     * @return
+     */
+    @Override
+    public OcpTenantDto selectDetails(String objId) {
+
+        OcpTenantDto ocpTenantDto = new OcpTenantDto();
+        OcpTenantBase ocpTenantBase = ocpTenantBaseMapper.selectById(objId);
+        BeanUtils.copyProperties(ocpTenantBase,ocpTenantDto);
+        String tenantCode = ocpTenantBase.getTenantCode();
+
+        if (StringUtils.isBlank(tenantCode)){
+            OcpTenantIocn ocpTenantIocn = ocpTenantIocnMapper.selectCode(tenantCode);
+            BeanUtils.copyProperties(ocpTenantIocn,ocpTenantDto);
+        }
+
+        return ocpTenantDto;
+    }
 }

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

@@ -17,7 +17,10 @@ import org.springframework.stereotype.Service;
 import java.util.ArrayList;
 import java.util.List;
 
-
+/**
+ * @author:zhaochengming
+ *
+ */
 @Service
 public class OcpTenantIocnServiceImpl extends ServiceImpl<OcpTenantIocnMapper, OcpTenantIocn> implements OcpTenantIocnService {
 

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

@@ -77,15 +77,10 @@ public class PmsApiManagementServiceImpl extends ServiceImpl<PmsApiManagementMap
         List<OcpApiTenantRel> apitenant = pmsApiManagementMapper.getApitenant(oat);
             for (OcpApiModelRel ocpApiModelRel : apiModel) {
                 for (OcpApiTenantRel ocpApiTenantRel : apitenant) {
-                    if (ocpApiModelRel.getApiCode().equals(ocpApiModelRel.getApiCode())
-                            || ocpApiTenantRel.getApiCode().equals(ocpApiTenantRel.getApiCode())){
+                    if (ocpApiModelRel.getApiCode().equals(pmsApiMangageApi.getApiCode())||ocpApiTenantRel.getApiCode().equals(pmsApiMangageApi.getApiCode())){
                         return ResponseResult.SUCCESS(false);
-                    }else {
-                        //删除
-                        pmsApiManagementMapper.deleteApi(pmsApiMangageApi);
                     }
                 }
-
             }
         pmsApiManagementMapper.deleteApi(pmsApiMangageApi);
         return ResponseResult.SUCCESS(true);

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

@@ -175,12 +175,13 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, OcpTenantGroup>
         Page<OcpTenantGroup> page = new Page<>(currentPage, pageSize);
 
         if (StringUtils.isBlank(keyword)) {
-            if (StringUtils.isBlank(lev) || "1".equals(lev) ) {
+            if (StringUtils.isBlank(lev) || "1".equals(lev)) {
                 LambdaQueryWrapper<OcpTenantGroup> eq = qw.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode);
                 tenantMapper.selectPage(page, eq);
             } 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);
+                LambdaQueryWrapper<OcpTenantGroup> eq = qw.or(wq -> wq.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode))
+                        .eq(OcpTenantGroup::getTenantGroupPcode, tenantGroupCode);
+                tenantMapper.selectPage(page, eq);
             }
         } else if (!(StringUtils.isBlank(keyword))) {
             LambdaQueryWrapper<OcpTenantGroup> ocpTenantGroupLambdaQueryWrapper = qw.and(c -> c.like(OcpTenantGroup::getTenantGroupCompanyCode, keyword))

src/main/resources/mapper/OcpTenantBaseMapper.xml

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

src/main/resources/mapper/OcpTenantIocnMapper.xml

+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.pms.ocp.mapper.OcpTenantIocnMapper" >
+
+
+    <select id="selectCode" resultType="com.pms.ocp.model.entity.OcpTenantIocn">
+        select *  from  ocp_tenant_iocn  WHERE code_no = #{tenanCode};
+    </select>
+
+</mapper>
\ No newline at end of file